From 8d661b6bf8e2adc1a73fb2489f0689cdfaa52a66 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri@schoolwerth.com>
Date: Tue, 3 May 2016 21:55:55 +0400
Subject: [PATCH 001/916] Clarify and change a drawing fix for wxMSW ListCtrl
 with wxLC_VRULES

Since 9eaba6927648cf2989a3fddf4a5e2deea1d62708 a fix was added for leaving
behind trailing pixels when resizing a column in a ListCtrl that uses
wxLC_VRULES. This fix is only needed for ComCtl32.dll versions prior to
6.0. Make the fix conditional and explain the (rare) conditions under
which the problem still occurs.

Also see #747.
---
 src/msw/listctrl.cpp | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index b699719fcc..b590ebce93 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -3098,16 +3098,42 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
 
         if (GetItemRect(itemCount - 1, itemRect))
         {
-            // this is a fix for bug 673394: erase the pixels which we would
-            // otherwise leave on the screen
-            static const int gap = 2;
-            dc.SetPen(*wxTRANSPARENT_PEN);
-            dc.SetBrush(wxBrush(GetBackgroundColour()));
-            dc.DrawRectangle(0, firstItemRect.GetY() - gap,
-                             clientSize.GetWidth(), gap);
+            /*
+            This is a fix for ticket #747: erase the pixels which we would
+            otherwise leave on the screen.
 
-            dc.SetPen(pen);
-            dc.SetBrush(*wxTRANSPARENT_BRUSH);
+            The drawing of the rectangle as a fix to erase trailing pixels
+            when resizing a column is only needed for ComCtl32 prior to
+            6.0, i.e. when not using a manifest in which case 5.82 is
+            used. And even then it only happens when "Show window contents
+            while dragging" is enabled under Windows, resulting in live
+            updates when resizing columns. Note that even with that setting
+            on, at least under Windows 7 and 10 no live updating is done when
+            using ComCtl32 5.82.
+
+            Revision b66c3a67519caa9debfd76e6d74954eaebfa56d9 made this fix
+            almost redundant, except that when you do NOT handle
+            EVT_LIST_COL_DRAGGING (or do and skip the event) the trailing
+            pixels still appear. In case of wanting to reproduce the problem
+            in the listctrl sample: comment out handling oF
+            EVT_LIST_COL_DRAGGING and also set useDrawFix to false and gap to
+            2 (not 0).
+            */
+
+            static const bool useDrawFix = wxApp::GetComCtl32Version() < 600;
+
+            static const int gap = useDrawFix ? 2 : 0;
+
+            if (useDrawFix)
+            {
+                dc.SetPen(*wxTRANSPARENT_PEN);
+                dc.SetBrush(wxBrush(GetBackgroundColour()));
+                dc.DrawRectangle(0, firstItemRect.GetY() - gap,
+                                 clientSize.GetWidth(), gap);
+
+                dc.SetPen(pen);
+                dc.SetBrush(*wxTRANSPARENT_BRUSH);
+            }
 
             const int numCols = GetColumnCount();
             wxVector<int> indexArray(numCols);

From 761f05c6494562f9941cdd84614cd587709ad338 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri@schoolwerth.com>
Date: Wed, 4 May 2016 02:47:56 +0400
Subject: [PATCH 002/916] Improve wxMSW ListCtrl drawing of horizontal rules

Appending an item in the listctrl sample results in two horizontal lines
drawn next to each other while they should be overlapping. Fix by drawing
only the bottom line of each item instead of skipping the first one
(should have been the top visible item since
6443de026310552cacd68a6d0318e73d14929680) and drawing the last one in the
list (should have been bottom visible item).
---
 src/msw/listctrl.cpp | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index b590ebce93..4355256ce2 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -3071,22 +3071,13 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
     if (drawHRules)
     {
         const long top = GetTopItem();
-        for ( int i = top; i < top + GetCountPerPage() + 1; i++ )
+        const long bottom = wxMin(top + GetCountPerPage(), itemCount - 1);
+        for ( long i = top; i <= bottom; i++ )
         {
             if (GetItemRect(i, itemRect))
             {
-                int cy = itemRect.GetTop();
-                if (i != 0) // Don't draw the first one
-                {
-                    dc.DrawLine(0, cy, clientSize.x, cy);
-                }
-                // Draw last line
-                if (i == itemCount - 1)
-                {
-                    cy = itemRect.GetBottom();
-                    dc.DrawLine(0, cy, clientSize.x, cy);
-                    break;
-                }
+                const int cy = itemRect.GetBottom();
+                dc.DrawLine(0, cy, clientSize.x, cy);
             }
         }
     }

From d382107ea240010de96e5780b017738f89ac3439 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri@schoolwerth.com>
Date: Wed, 4 May 2016 03:13:43 +0400
Subject: [PATCH 003/916] Slightly improve wxMSW ListCtrl drawing of vertical
 rules

Draw the vertical rules with Y coordinates related to the top and bottom
visible item which makes more sense than using the first and last item.
---
 src/msw/listctrl.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 4355256ce2..59f70aa200 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -3066,12 +3066,20 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
     wxSize clientSize = GetClientSize();
-    wxRect itemRect;
+
+    const int countPerPage = GetCountPerPage();
+    if (countPerPage < 0)
+    {
+        // Can be -1 in which case it's useless to try to draw rules.
+        return;
+    }
+
+    const long top = GetTopItem();
+    const long bottom = wxMin(top + countPerPage, itemCount - 1);
 
     if (drawHRules)
     {
-        const long top = GetTopItem();
-        const long bottom = wxMin(top + GetCountPerPage(), itemCount - 1);
+        wxRect itemRect;
         for ( long i = top; i <= bottom; i++ )
         {
             if (GetItemRect(i, itemRect))
@@ -3084,10 +3092,10 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
 
     if (drawVRules)
     {
-        wxRect firstItemRect;
-        GetItemRect(0, firstItemRect);
+        wxRect topItemRect, bottomItemRect;
+        GetItemRect(top, topItemRect);
 
-        if (GetItemRect(itemCount - 1, itemRect))
+        if (GetItemRect(bottom, bottomItemRect))
         {
             /*
             This is a fix for ticket #747: erase the pixels which we would
@@ -3119,7 +3127,7 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
             {
                 dc.SetPen(*wxTRANSPARENT_PEN);
                 dc.SetBrush(wxBrush(GetBackgroundColour()));
-                dc.DrawRectangle(0, firstItemRect.GetY() - gap,
+                dc.DrawRectangle(0, topItemRect.GetY() - gap,
                                  clientSize.GetWidth(), gap);
 
                 dc.SetPen(pen);
@@ -3136,13 +3144,13 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
                 return;
             }
 
-            int x = itemRect.GetX();
+            int x = bottomItemRect.GetX();
             for (int col = 0; col < numCols; col++)
             {
                 int colWidth = GetColumnWidth(indexArray[col]);
                 x += colWidth ;
-                dc.DrawLine(x-1, firstItemRect.GetY() - gap,
-                            x-1, itemRect.GetBottom());
+                dc.DrawLine(x-1, topItemRect.GetY() - gap,
+                            x-1, bottomItemRect.GetBottom());
             }
         }
     }

From 374db28747a90bdced3ad05005e5d5ef406cbc18 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri@schoolwerth.com>
Date: Wed, 4 May 2016 11:19:21 +0400
Subject: [PATCH 004/916] Fix wxMSW ListCtrl drawing of horizontal rules for
 new items

When adding a new item to a wxMSW ListCtrl that uses horizontal rules the
painting is horizontally clipped to the left of the control and the
rightmost column and the rule doesn't extend beyond that as it does when
doing a full repaint. Fix by refreshing the part to the right of the
rightmost column.

This also reverts 02c8973a575d14a66898533293ab58dd30447616 which became
unnecessary now.

Also see #17158.
---
 src/msw/listctrl.cpp | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 59f70aa200..3f38b4713b 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -709,15 +709,7 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
     else if ( width == wxLIST_AUTOSIZE_USEHEADER)
         width = LVSCW_AUTOSIZE_USEHEADER;
 
-    if ( !ListView_SetColumnWidth(GetHwnd(), col, width) )
-        return false;
-
-    // Failure to explicitly refresh the control with horizontal rules results
-    // in corrupted rules display.
-    if ( HasFlag(wxLC_HRULES) )
-        Refresh();
-
-    return true;
+    return ListView_SetColumnWidth(GetHwnd(), col, width) != 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -3077,6 +3069,9 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
     const long top = GetTopItem();
     const long bottom = wxMin(top + countPerPage, itemCount - 1);
 
+    wxRect clipRect;
+    dc.GetClippingBox(clipRect);
+
     if (drawHRules)
     {
         wxRect itemRect;
@@ -3085,9 +3080,24 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
             if (GetItemRect(i, itemRect))
             {
                 const int cy = itemRect.GetBottom();
-                dc.DrawLine(0, cy, clientSize.x, cy);
+                dc.DrawLine(clipRect.x, cy, clipRect.GetRight() + 1, cy);
             }
         }
+
+        /*
+        The drawing can be clipped horizontally to the rightmost column. This
+        happens when an item is added (and visible) and results in a
+        horizontal rule being clipped instead of drawn across the entire list
+        control. In that case we request for the part to the right of the
+        rightmost column to be drawn as well.
+        */
+        if ( clipRect.GetRight()  != clientSize.GetWidth() - 1
+            && clipRect.width)
+        {
+            RefreshRect(wxRect(clipRect.GetRight(), clipRect.y,
+                clientSize.x - clipRect.width, clipRect.height),
+                false /* erase background? */);
+        }
     }
 
     if (drawVRules)

From acf53800fca55a50f39659c5d92111134593aa27 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Dec 2017 17:50:18 +0100
Subject: [PATCH 005/916] Extract reusable part of the MFC sample in a header

Allow reusing this functionality from outside the library, it can he
useful if an MFC window needs to be embedded into a wx application (or
vice versa).

Also use a better wxEntryStart() overload as a side effect, this should,
in particular, fix the problem with command line arguments processing in
mixed MFC/wx applications pointed out in a comment in the sample
previously.
---
 include/wx/msw/mfc.h    | 137 ++++++++++++++++++++++++++++++++++++++++
 samples/mfc/mfctest.cpp | 109 +++-----------------------------
 samples/mfc/mfctest.h   |  46 ++++++--------
 3 files changed, 166 insertions(+), 126 deletions(-)
 create mode 100644 include/wx/msw/mfc.h

diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h
new file mode 100644
index 0000000000..49974bb9ea
--- /dev/null
+++ b/include/wx/msw/mfc.h
@@ -0,0 +1,137 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/mfc.h
+// Purpose:     Helpers for applications using both wxWidgets and MFC
+// Author:      Julian Smart, Vadim Zeitlin
+// Created:     2017-12-01 (mostly extracted from samples/mfc)
+// Copyright:   (c) 2017 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_MFC_H_
+#define _WX_MSW_MFC_H_
+
+#ifndef __AFXWIN_H__
+    #error "MFC headers must be included before including this file."
+#endif
+
+#include "wx/app.h"
+#include "wx/evtloop.h"
+#include "wx/window.h"
+#include "wx/msw/winundef.h"
+
+// ----------------------------------------------------------------------------
+// MFC window class wrapping a window created by wxWidgets
+// ----------------------------------------------------------------------------
+
+class wxMFCWnd : public CWnd
+{
+public:
+    explicit wxMFCWnd(wxWindow* w)
+    {
+        Attach(w->GetHWND());
+    }
+
+    ~wxMFCWnd()
+    {
+        // Prevent MFC from destroying the wxWindow.
+        Detach();
+    }
+};
+
+// ----------------------------------------------------------------------------
+// MFC application class forwarding everything to wxApp
+// ----------------------------------------------------------------------------
+
+class wxMFCWinApp : public CWinApp
+{
+public:
+    BOOL InitInstance() wxOVERRIDE
+    {
+        if ( !CWinApp::InitInstance() )
+            return FALSE;
+
+        if ( !wxEntryStart(m_hInstance) )
+            return FALSE;
+
+        if ( !wxTheApp || !wxTheApp->CallOnInit() )
+            return FALSE;
+
+        if ( !InitMainWnd() )
+            return FALSE;
+
+        return TRUE;
+    }
+
+    int ExitInstance() wxOVERRIDE
+    {
+        delete m_pMainWnd;
+
+        if ( wxTheApp )
+            wxTheApp->OnExit();
+
+        wxEntryCleanup();
+
+        return CWinApp::ExitInstance();
+    }
+
+    // Override this to provide wxWidgets message loop compatibility
+    BOOL PreTranslateMessage(MSG *msg) wxOVERRIDE
+    {
+        wxEventLoop * const
+            evtLoop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());
+        if ( evtLoop && evtLoop->PreProcessMessage(msg) )
+            return TRUE;
+
+        return CWinApp::PreTranslateMessage(msg);
+    }
+
+    BOOL OnIdle(LONG lCount) wxOVERRIDE
+    {
+        BOOL moreIdle = CWinApp::OnIdle(lCount);
+
+        if ( wxTheApp && wxTheApp->ProcessIdle() )
+            moreIdle = TRUE;
+
+        return moreIdle;
+    }
+
+protected:
+    // This virtual method can be overridden to create the main window using
+    // MFC code. The default implementation relies on wxApp::OnInit() creating
+    // a top level window which is then wrapped in an MFC window and used as
+    // the main window.
+    virtual BOOL InitMainWnd()
+    {
+        wxWindow* const w = wxTheApp->GetTopWindow();
+        if ( !w )
+            return FALSE;
+
+        // We need to initialize the main window to let the program continue
+        // running.
+        m_pMainWnd = new wxMFCWnd(w);
+
+        // And we need to let wxWidgets know that it should exit the
+        // application when this window is closed, as OnRun(), which does this
+        // by default, won't be called when using MFC main message loop.
+        wxTheApp->SetExitOnFrameDelete(true);
+
+        return TRUE;
+    }
+};
+
+// ----------------------------------------------------------------------------
+// wxWidgets application class to be used in MFC applications
+// ----------------------------------------------------------------------------
+
+class wxAppWithMFC : public wxApp
+{
+public:
+    void ExitMainLoop() wxOVERRIDE
+    {
+        // There is no wxEventLoop to exit, tell MFC to stop pumping messages
+        // instead.
+        ::PostQuitMessage(0);
+    }
+};
+
+#endif // _WX_MSW_MFC_H_
diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index 9263040ceb..1c00df1c9e 100644
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -17,8 +17,8 @@
 // created subsequently.
 //
 // (1) Make MyApp::OnInit not create a main window.
-// (2) Make MFC's InitInstance create a main window, and remove
-//     creation of CDummyWindow.
+// (2) Define a class deriving from wxMFCWinApp and override its InitMainWnd()
+//     to create the main window in MFC code.
 //
 // This can be accomplished by setting START_WITH_MFC_WINDOW to 1 below.
 
@@ -73,6 +73,8 @@
 #include "wx/nativewin.h"
 #include "wx/spinctrl.h"
 
+#include "wx/msw/mfc.h"
+
 #include "resource.h"
 
 #include "mfctest.h"
@@ -82,19 +84,15 @@
 // theApp:
 // Just creating this application object runs the whole application.
 //
-CTheApp theApp;
+SampleMFCWinApp theApp;
 
 // wxWidgets elements
 
-// Define a new application type
-class MyApp: public wxApp
+// Define a new application type inheriting from wxAppWithMFC
+class MyApp: public wxAppWithMFC
 {
 public:
-    virtual bool OnInit();
-
-    // we need to override this as the default behaviour only works when we're
-    // running wxWidgets main loop, not MFC one
-    virtual void ExitMainLoop();
+    virtual bool OnInit() wxOVERRIDE;
 
     wxFrame *CreateFrame();
 };
@@ -238,73 +236,6 @@ ON_COMMAND( IDM_TEST, OnTest )
 //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-BOOL CTheApp::InitInstance()
-{
-    if ( !CWinApp::InitInstance() )
-        return FALSE;
-
-    // TODO: cmd line parsing
-    WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
-    wxSetInstance(m_hInstance);
-    wxApp::m_nCmdShow = m_nCmdShow;
-    int argc = 0;
-    wxChar **argv = NULL;
-    wxEntryStart(argc, argv);
-    if ( !wxTheApp || !wxTheApp->CallOnInit() )
-        return FALSE;
-
-#if START_WITH_MFC_WINDOW
-    // Demonstrate creation of an initial MFC main window.
-    m_pMainWnd = new CMainWindow();
-    m_pMainWnd->ShowWindow( m_nCmdShow );
-    m_pMainWnd->UpdateWindow();
-#else
-    // Demonstrate creation of an initial wxWidgets main window.
-    // Wrap wxWidgets window in a dummy MFC window and
-    // make the main window.
-    if (wxTheApp && wxTheApp->GetTopWindow())
-    {
-        m_pMainWnd = new CDummyWindow((HWND) wxTheApp->GetTopWindow()->GetHWND());
-    }
-#endif
-
-    return TRUE;
-}
-
-int CTheApp::ExitInstance()
-{
-#if !START_WITH_MFC_WINDOW
-    delete m_pMainWnd;
-#endif
-
-    if ( wxTheApp )
-        wxTheApp->OnExit();
-    wxEntryCleanup();
-
-    return CWinApp::ExitInstance();
-}
-
-// Override this to provide wxWidgets message loop compatibility
-BOOL CTheApp::PreTranslateMessage(MSG *msg)
-{
-    wxEventLoop * const
-        evtLoop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());
-    if ( evtLoop && evtLoop->PreProcessMessage(msg) )
-        return TRUE;
-
-    return CWinApp::PreTranslateMessage(msg);
-}
-
-BOOL CTheApp::OnIdle(LONG lCount)
-{
-    BOOL moreIdle = CWinApp::OnIdle(lCount);
-
-    if ( wxTheApp && wxTheApp->ProcessIdle() )
-        moreIdle = TRUE;
-
-    return moreIdle;
-}
-
 /*********************************************************************
 * wxWidgets elements
 ********************************************************************/
@@ -315,22 +246,12 @@ bool MyApp::OnInit()
         return false;
 
 #if !START_WITH_MFC_WINDOW
-    // as we're not inside wxWidgets main loop, the default logic doesn't work
-    // in our case and we need to do this explicitly
-    SetExitOnFrameDelete(true);
-
     (void) CreateFrame();
 #endif
 
     return true;
 }
 
-void MyApp::ExitMainLoop()
-{
-    // instead of existing wxWidgets main loop, terminate the MFC one
-    ::PostQuitMessage(0);
-}
-
 wxFrame *MyApp::CreateFrame()
 {
     MyChild *subframe = new MyChild(NULL, wxT("Canvas Frame"), wxPoint(10, 10), wxSize(300, 300),
@@ -451,17 +372,3 @@ void MyChild::OnActivate(wxActivateEvent& event)
     if (event.GetActive() && canvas)
         canvas->SetFocus();
 }
-
-// Dummy MFC window for specifying a valid main window to MFC, using
-// a wxWidgets HWND.
-CDummyWindow::CDummyWindow(HWND hWnd)
-{
-    Attach(hWnd);
-}
-
-// Don't let the CWnd destructor delete the HWND
-CDummyWindow::~CDummyWindow()
-{
-    Detach();
-}
-
diff --git a/samples/mfc/mfctest.h b/samples/mfc/mfctest.h
index 2c49911339..b12036d913 100644
--- a/samples/mfc/mfctest.h
+++ b/samples/mfc/mfctest.h
@@ -9,11 +9,7 @@
 #ifndef __MFCTEST_H__
 #define __MFCTEST_H__
 
-/////////////////////////////////////////////////////////////////////////////
-
-// CMainWindow:
-// See hello.cpp for the code to the member functions and the message map.
-//
+// CMainWindow: just a normal MFC window class.
 class CMainWindow : public CFrameWnd
 {
 public:
@@ -31,30 +27,30 @@ private:
     class wxNativeContainerWindow* m_containerWX;
 };
 
-// A dummy CWnd pointing to a wxWindow's HWND
-class CDummyWindow: public CWnd
+#if START_WITH_MFC_WINDOW
+
+// There is no need to define an application class if the default behaviour of
+// using the wxWindow created in wxApp::OnInit() as main window is acceptable,
+// but if we want to create the initial window in MFC, we need this class in
+// order to override InitMainWnd() in it.
+class SampleMFCWinApp : public wxMFCWinApp
 {
-  public:
-    CDummyWindow(HWND hWnd);
-    ~CDummyWindow(void);
+protected:
+    BOOL InitMainWnd() wxOVERRIDE
+    {
+        // Demonstrate creation of an initial MFC main window.
+        m_pMainWnd = new CMainWindow();
+        m_pMainWnd->ShowWindow( m_nCmdShow );
+        m_pMainWnd->UpdateWindow();
+
+        return TRUE;
+    }
 };
 
-/////////////////////////////////////////////////////////////////////////////
+#else // !START_WITH_MFC_WINDOW
 
-// CTheApp:
-//
-class CTheApp : public CWinApp
-{
-public:
-    BOOL InitInstance();
-    int ExitInstance();
+typedef wxMFCWinApp SampleMFCWinApp;
 
-    // Override this to provide wxWidgets message loop
-    // compatibility
-    BOOL PreTranslateMessage(MSG *msg);
-    BOOL OnIdle(LONG lCount);
-};
-
-/////////////////////////////////////////////////////////////////////////////
+#endif // START_WITH_MFC_WINDOW/!START_WITH_MFC_WINDOW
 
 #endif // __MFCTEST_H__

From 9dd83933f3b870cbe939a49438d51586afa1659d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 6 Dec 2017 18:25:20 +0100
Subject: [PATCH 006/916] Remove redundant sections from wx/msw/winundef.h

Somehow we redefined GetFirstChild() and GetNextSibling() twice in a row
for the last ~18 years.
---
 include/wx/msw/winundef.h | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index b363e7e94e..b5722ff98d 100644
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -420,26 +420,6 @@
 
 // For ming and cygwin
 
-// GetFirstChild
-#ifdef GetFirstChild
-   #undef GetFirstChild
-   inline HWND GetFirstChild(HWND h)
-   {
-      return GetTopWindow(h);
-   }
-#endif
-
-
-// GetNextSibling
-#ifdef GetNextSibling
-   #undef GetNextSibling
-   inline HWND GetNextSibling(HWND h)
-   {
-     return GetWindow(h, GW_HWNDNEXT);
-   }
-#endif
-
-
 #ifdef Yield
     #undef Yield
 #endif

From 042d922e88da988875d043b837dc548eb4b930b0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 8 Dec 2017 16:40:42 +0100
Subject: [PATCH 007/916] Allow predefining wxUSE_UNICODE_WINDOWS_H in wxMSW
 builds

This can be used in order to use normal Unicode build of wxWidgets with
an application that needs to use ANSI versions of Win32 functions, e.g.
because it doesn't compile with UNICODE defined.
---
 include/wx/msw/winundef.h | 46 +++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index b5722ff98d..aedf4340d3 100644
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -15,6 +15,14 @@
 #define _WX_WINUNDEF_H_
  */
 
+#ifndef wxUSE_UNICODE_WINDOWS_H
+    #ifdef _UNICODE
+        #define wxUSE_UNICODE_WINDOWS_H 1
+    #else
+        #define wxUSE_UNICODE_WINDOWS_H 0
+    #endif
+#endif
+
 // ----------------------------------------------------------------------------
 // windows.h #defines the following identifiers which are also used in wxWin so
 // we replace these symbols with the corresponding inline functions and
@@ -34,7 +42,7 @@
                              HWND hwndParent,
                              DLGPROC pDlgProc)
     {
-        #ifdef _UNICODE
+        #if wxUSE_UNICODE_WINDOWS_H
             return CreateDialogW(hInstance, pTemplate, hwndParent, pDlgProc);
         #else
             return CreateDialogA(hInstance, pTemplate, hwndParent, pDlgProc);
@@ -62,7 +70,7 @@
                             DWORD family,
                             LPCTSTR facename)
     {
-        #ifdef _UNICODE
+        #if wxUSE_UNICODE_WINDOWS_H
             return CreateFontW(height, width, escapement, orientation,
                                weight, italic, underline, strikeout, charset,
                                outprecision, clipprecision, quality,
@@ -90,7 +98,7 @@
                              HINSTANCE hInstance,
                              LPVOID lpParam)
     {
-        #ifdef _UNICODE
+        #if wxUSE_UNICODE_WINDOWS_H
             return CreateWindowW(lpClassName, lpWndClass, dwStyle, x, y, w, h,
                                  hWndParent, hMenu, hInstance, lpParam);
         #else
@@ -107,7 +115,7 @@
 
     inline HMENU LoadMenu(HINSTANCE instance, LPCTSTR name)
     {
-        #ifdef _UNICODE
+        #if wxUSE_UNICODE_WINDOWS_H
             return LoadMenuW(instance, name);
         #else
             return LoadMenuA(instance, name);
@@ -122,7 +130,7 @@
 
     inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace)
     {
-        #ifdef _UNICODE
+        #if wxUSE_UNICODE_WINDOWS_H
             return FindTextW(lpfindreplace);
         #else
             return FindTextA(lpfindreplace);
@@ -136,7 +144,7 @@
    #undef GetCharWidth
    inline BOOL  GetCharWidth(HDC dc, UINT first, UINT last, LPINT buffer)
    {
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
       return GetCharWidthW(dc, first, last, buffer);
    #else
       return GetCharWidthA(dc, first, last, buffer);
@@ -148,7 +156,7 @@
 
 #ifdef FindWindow
    #undef FindWindow
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
    inline HWND FindWindow(LPCWSTR classname, LPCWSTR windowname)
    {
       return FindWindowW(classname, windowname);
@@ -165,7 +173,7 @@
 
 #ifdef PlaySound
    #undef PlaySound
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
    inline BOOL PlaySound(LPCWSTR pszSound, HMODULE hMod, DWORD fdwSound)
    {
       return PlaySoundW(pszSound, hMod, fdwSound);
@@ -182,7 +190,7 @@
 
 #ifdef GetClassName
    #undef GetClassName
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
    inline int GetClassName(HWND h, LPWSTR classname, int maxcount)
    {
       return GetClassNameW(h, classname, maxcount);
@@ -199,7 +207,7 @@
 
 #ifdef GetClassInfo
    #undef GetClassInfo
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
    inline BOOL GetClassInfo(HINSTANCE h, LPCWSTR name, LPWNDCLASSW winclass)
    {
       return GetClassInfoW(h, name, winclass);
@@ -216,7 +224,7 @@
 
 #ifdef LoadAccelerators
    #undef LoadAccelerators
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
    inline HACCEL LoadAccelerators(HINSTANCE h, LPCWSTR name)
    {
       return LoadAcceleratorsW(h, name);
@@ -233,7 +241,7 @@
 
 #ifdef DrawText
    #undef DrawText
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
    inline int DrawText(HDC h, LPCWSTR str, int count, LPRECT rect, UINT format)
    {
       return DrawTextW(h, str, count, rect, format);
@@ -252,7 +260,7 @@
 #ifdef StartDoc
    #undef StartDoc
 
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {
       return StartDocW(h, (DOCINFOW*) info);
@@ -271,7 +279,7 @@
    #undef GetObject
    inline int GetObject(HGDIOBJ h, int i, LPVOID buffer)
    {
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
       return GetObjectW(h, i, buffer);
    #else
       return GetObjectA(h, i, buffer);
@@ -285,7 +293,7 @@
    #undef GetMessage
    inline int GetMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax)
    {
-   #ifdef _UNICODE
+   #if wxUSE_UNICODE_WINDOWS_H
       return GetMessageW(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
    #else
       return GetMessageA(lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax);
@@ -298,7 +306,7 @@
     #undef LoadIcon
     inline HICON LoadIcon(HINSTANCE hInstance, LPCTSTR lpIconName)
     {
-        #ifdef _UNICODE
+        #if wxUSE_UNICODE_WINDOWS_H
             return LoadIconW(hInstance, lpIconName);
         #else // ANSI
             return LoadIconA(hInstance, lpIconName);
@@ -311,7 +319,7 @@
     #undef LoadBitmap
     inline HBITMAP LoadBitmap(HINSTANCE hInstance, LPCTSTR lpBitmapName)
     {
-        #ifdef _UNICODE
+        #if wxUSE_UNICODE_WINDOWS_H
             return LoadBitmapW(hInstance, lpBitmapName);
         #else // ANSI
             return LoadBitmapA(hInstance, lpBitmapName);
@@ -323,7 +331,7 @@
 
 #ifdef LoadLibrary
     #undef LoadLibrary
-    #ifdef _UNICODE
+    #if wxUSE_UNICODE_WINDOWS_H
     inline HINSTANCE LoadLibrary(LPCWSTR lpLibFileName)
     {
         return LoadLibraryW(lpLibFileName);
@@ -339,7 +347,7 @@
 // FindResource
 #ifdef FindResource
     #undef FindResource
-    #ifdef _UNICODE
+    #if wxUSE_UNICODE_WINDOWS_H
     inline HRSRC FindResource(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType)
     {
         return FindResourceW(hModule, lpName, lpType);

From 3960e630f18c39b4e4a1be62593c9cd4fa6c5e5d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 8 Dec 2017 16:42:34 +0100
Subject: [PATCH 008/916] Make it possible to use an existing base class for
 wxMFCWinApp

When porting an existing MFC codebase to wxWidgets, it may be useful to
continue using the existing CWinApp-derived application class, so allow
deriving wxMFCApp from it instead of always deriving it from CWinApp
itself.
---
 include/wx/msw/mfc.h | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h
index 49974bb9ea..894918f194 100644
--- a/include/wx/msw/mfc.h
+++ b/include/wx/msw/mfc.h
@@ -42,12 +42,17 @@ public:
 // MFC application class forwarding everything to wxApp
 // ----------------------------------------------------------------------------
 
-class wxMFCWinApp : public CWinApp
+// The template parameter here is an existing class deriving from CWinApp or,
+// if there is no such class, just CWinApp itself.
+template <typename T>
+class wxMFCApp : public T
 {
 public:
+    typedef T BaseApp;
+
     BOOL InitInstance() wxOVERRIDE
     {
-        if ( !CWinApp::InitInstance() )
+        if ( !BaseApp::InitInstance() )
             return FALSE;
 
         if ( !wxEntryStart(m_hInstance) )
@@ -71,7 +76,7 @@ public:
 
         wxEntryCleanup();
 
-        return CWinApp::ExitInstance();
+        return BaseApp::ExitInstance();
     }
 
     // Override this to provide wxWidgets message loop compatibility
@@ -82,12 +87,12 @@ public:
         if ( evtLoop && evtLoop->PreProcessMessage(msg) )
             return TRUE;
 
-        return CWinApp::PreTranslateMessage(msg);
+        return BaseApp::PreTranslateMessage(msg);
     }
 
     BOOL OnIdle(LONG lCount) wxOVERRIDE
     {
-        BOOL moreIdle = CWinApp::OnIdle(lCount);
+        BOOL moreIdle = BaseApp::OnIdle(lCount);
 
         if ( wxTheApp && wxTheApp->ProcessIdle() )
             moreIdle = TRUE;
@@ -119,6 +124,8 @@ protected:
     }
 };
 
+typedef wxMFCApp<CWinApp> wxMFCWinApp;
+
 // ----------------------------------------------------------------------------
 // wxWidgets application class to be used in MFC applications
 // ----------------------------------------------------------------------------

From 636219bd355bd64a5b1507e4d37e033fe50969f3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 11 Dec 2017 22:06:13 +0100
Subject: [PATCH 009/916] Always pre-process messages for wx windows in mixed
 wx/MFC apps

Still use the active event loop if there is one, just in case it
customizes messages pre-processing, but fall back on the standard
pre-processing code even if there is no active wx event loop and we're
only running the MFC one, as without doing this there are just too many
things that don't work (e.g. menu accelerators didn't work at all in
mixed wx/MFC applications previously).
---
 include/wx/msw/mfc.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h
index 894918f194..f3fc23e44d 100644
--- a/include/wx/msw/mfc.h
+++ b/include/wx/msw/mfc.h
@@ -79,12 +79,19 @@ public:
         return BaseApp::ExitInstance();
     }
 
-    // Override this to provide wxWidgets message loop compatibility
+    // Override this to provide messages pre-processing for wxWidgets windows.
     BOOL PreTranslateMessage(MSG *msg) wxOVERRIDE
     {
-        wxEventLoop * const
-            evtLoop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());
-        if ( evtLoop && evtLoop->PreProcessMessage(msg) )
+        // Use the current event loop if there is one, or just fall back to the
+        // standard one otherwise, but make sure we pre-process messages in any
+        // case as otherwise many things would break (e.g. keyboard
+        // accelerators).
+        wxGUIEventLoop*
+            evtLoop = static_cast<wxGUIEventLoop *>(wxEventLoop::GetActive());
+        wxGUIEventLoop evtLoopStd;
+        if ( !evtLoop )
+            evtLoop = &evtLoopStd;
+        if ( evtLoop->PreProcessMessage(msg) )
             return TRUE;
 
         return BaseApp::PreTranslateMessage(msg);

From 44c31d2700874ece57bcb7dcd3b7a56f1c5b820a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 11 Dec 2017 23:07:33 +0100
Subject: [PATCH 010/916] Destroy MFC main window when its wx counterpart is
 destroyed

This avoids using m_pMainWnd after its HWND becomes invalid, as this
resulted in assert failures from CWnd::WalkPreTranslateTree() called
with this HWND as its hWndStop argument from PreTranslateMessage() which
was used to pre-translate a WM_NULL message the application sometimes
received while closing down.
---
 include/wx/msw/mfc.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h
index f3fc23e44d..14b1a1d5d4 100644
--- a/include/wx/msw/mfc.h
+++ b/include/wx/msw/mfc.h
@@ -122,6 +122,11 @@ protected:
         // running.
         m_pMainWnd = new wxMFCWnd(w);
 
+        // We also need to reset m_pMainWnd when this window will be destroyed
+        // to prevent MFC from using an invalid HWND, which is probably not
+        // fatal but can result in at least asserts failures.
+        w->Bind(wxEVT_DESTROY, &wxMFCApp::OnMainWindowDestroyed, this);
+
         // And we need to let wxWidgets know that it should exit the
         // application when this window is closed, as OnRun(), which does this
         // by default, won't be called when using MFC main message loop.
@@ -129,6 +134,15 @@ protected:
 
         return TRUE;
     }
+
+private:
+    void OnMainWindowDestroyed(wxWindowDestroyEvent& event)
+    {
+        event.Skip();
+
+        delete m_pMainWnd;
+        m_pMainWnd = NULL;
+    }
 };
 
 typedef wxMFCApp<CWinApp> wxMFCWinApp;

From 6c7e5a92008e731ec555f5884dd3009373105e95 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 12 Dec 2017 18:46:29 +0100
Subject: [PATCH 011/916] Allow attaching a wxWindow to CWnd later in wxMFCWnd

When using two-step creation, as when loading from resources, for
example, it can be convenient to create wxMFCWnd as part of the (parent)
wxWindow object, but only attach it to the real HWND later, once it
becomes available.
---
 include/wx/msw/mfc.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h
index 14b1a1d5d4..8cab2ee37f 100644
--- a/include/wx/msw/mfc.h
+++ b/include/wx/msw/mfc.h
@@ -26,9 +26,20 @@
 class wxMFCWnd : public CWnd
 {
 public:
+    // If default ctor is used, Attach() must be called later.
+    wxMFCWnd()
+    {
+    }
+
+    // Combines default ctor and Attach().
     explicit wxMFCWnd(wxWindow* w)
     {
-        Attach(w->GetHWND());
+        Attach(w);
+    }
+
+    void Attach(wxWindow* w)
+    {
+        CWnd::Attach(w->GetHWND());
     }
 
     ~wxMFCWnd()

From 51ed404ca5ba76097e9f3dfc6f407456859dd7db Mon Sep 17 00:00:00 2001
From: Erik Sperling Johansen <erik@hugintech.com>
Date: Thu, 23 Mar 2017 23:48:09 +0800
Subject: [PATCH 012/916] Optimize sorting items in wxDataViewCtrl

Limit node sorting to a minimum, by making all sorts happen on demand
and utilizing already sorted child lists to do quicker insertions.
---
 src/generic/datavgen.cpp | 382 +++++++++++++++++++++++++++++----------
 1 file changed, 291 insertions(+), 91 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 9cc10f4e0e..f62622acaa 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -91,9 +91,6 @@ static const int EXPANDER_OFFSET = 1;
 // of the special values in this enum:
 enum
 {
-    // Sort when we're thawed later.
-    SortColumn_OnThaw = -3,
-
     // Don't sort at all.
     SortColumn_None = -2,
 
@@ -541,6 +538,8 @@ public:
         {
             m_branchData->open = !m_branchData->open;
             ChangeSubTreeCount(+sum);
+            // Sort the children if needed
+            Resort();
         }
     }
 
@@ -588,6 +587,7 @@ public:
     }
 
     void Resort();
+    void MoveUpdatedChild(wxDataViewTreeNode * childNode);
 
 private:
     wxDataViewMainWindow * const m_window;
@@ -602,7 +602,9 @@ private:
     {
         BranchNodeData()
             : open(false),
-              subTreeCount(0)
+              subTreeCount(0),
+              sortColumn(SortColumn_None),
+              sortAscending(false)
         {
         }
 
@@ -613,6 +615,12 @@ private:
         // Is the branch node currently open (expanded)?
         bool                 open;
 
+        // By which column are the children currently sorted
+        int                  sortColumn;
+
+        // Are the children currently sorted ascending or descending
+        bool                 sortAscending;
+
         // Total count of expanded (i.e. visible with the help of some
         // scrolling) items in the subtree, but excluding this node. I.e. it is
         // 0 for leaves and is the number of rows the subtree occupies for
@@ -660,19 +668,6 @@ public:
         UpdateDisplay();
     }
 
-    // Override the base class method to resort if needed, i.e. if
-    // SortPrepare() was called -- and ignored -- while we were frozen.
-    virtual void DoThaw() wxOVERRIDE
-    {
-        if ( m_sortColumn == SortColumn_OnThaw )
-        {
-            Resort();
-            m_sortColumn = SortColumn_None;
-        }
-
-        wxWindow::DoThaw();
-    }
-
     void SortPrepare()
     {
         wxDataViewModel* model = GetModel();
@@ -682,11 +677,7 @@ public:
         {
             if (model->HasDefaultCompare())
             {
-                // See below for the explanation of IsFrozen() test.
-                if ( IsFrozen() )
-                    m_sortColumn = SortColumn_OnThaw;
-                else
-                    m_sortColumn = SortColumn_Default;
+                m_sortColumn = SortColumn_Default;
             }
             else
                 m_sortColumn = SortColumn_None;
@@ -695,15 +686,6 @@ public:
             return;
         }
 
-        // Avoid sorting while the window is frozen, this allows to quickly add
-        // many items without resorting after each addition and only resort
-        // them all at once when the window is finally thawed, see above.
-        if ( IsFrozen() )
-        {
-            m_sortColumn = SortColumn_OnThaw;
-            return;
-        }
-
         m_sortColumn = col->GetModelColumn();
         m_sortAscending = col->IsSortOrderAscending();
     }
@@ -1637,39 +1619,207 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
     if (!m_branchData)
         m_branchData = new BranchNodeData;
 
-    m_branchData->children.Insert(node, index);
+    g_column = m_window->GetSortColumn();
+    g_model = m_window->GetModel();
+    g_asending = m_window->IsAscendingSort();
 
-    // TODO: insert into sorted array directly in O(log n) instead of resorting in O(n log n)
-    if ((g_column = m_window->GetSortColumn()) >= -1)
+    // Flag indicating whether we should retain existing sorted list when
+    // inserting the child node.
+    bool insertSorted = false;
+
+    if ( g_column == SortColumn_None )
     {
-        g_model = m_window->GetModel();
-        g_asending = m_window->IsAscendingSort();
+        // We should insert assuming an unsorted list. This will cause the
+        // child list to lose the current sort order, if any.
+        m_branchData->sortColumn = SortColumn_None;
+        m_branchData->sortAscending = true;
+    }
+    else if ( m_branchData->open )
+    {
+        // The child list will always be correctly sorted for open nodes.
+        // The sole exception is the root node, on the first child
+        // addition.
+        if ( ( m_parent == NULL ) && m_branchData->children.IsEmpty())
+        {
+            m_branchData->sortColumn = g_column;
+            m_branchData->sortAscending = g_asending;
+        }
+        else
+        {
+            wxASSERT(m_branchData->sortColumn == g_column);
+            wxASSERT(m_branchData->sortAscending == g_asending);
+        }
 
-        m_branchData->children.Sort(&wxGenericTreeModelNodeCmp);
+        // We retain the sorted child list
+        insertSorted = true;
+    }
+    else if ( m_branchData->children.IsEmpty() )
+    {
+        // We're inserting the first child of a closed node. We can choose
+        // whether to consider this empty child list sorted or unsorted.
+        // By choosing unsorted, we postpone comparisons until the parent
+        // node is opened in the view, which may be never.
+        m_branchData->sortColumn = SortColumn_None;
+        m_branchData->sortAscending = true;
+    }
+    else if ( (m_branchData->sortColumn == g_column) && (m_branchData->sortAscending == g_asending) )
+    {
+        // The children are already sorted by the correct criteria. This
+        // means the node has at some point in time been open. Even though
+        // the node is closed now, we insert sorted to avoid a later resort.
+        insertSorted = true;
+    }
+    else
+    {
+        // The children aren't sorted by the correct criteria, so we just
+        // insert unsorted.
+        m_branchData->sortColumn = SortColumn_None;
+        m_branchData->sortAscending = true;
+    }
+
+
+    if ( insertSorted )
+    {
+        if ( m_branchData->children.IsEmpty() )
+        {
+            m_branchData->children.Insert(node, 0);
+        }
+        else
+        {
+            // Insert directly into sorted array
+            int lo = 0, hi = m_branchData->children.size();
+            while ( lo < hi )
+            {
+                int mid = lo + (hi - lo) / 2;
+                int r = wxGenericTreeModelNodeCmp(&node, &m_branchData->children[mid]);
+                if ( r < 0 )
+                    hi = mid;
+                else if ( r > 0 )
+                    lo = mid + 1;
+                else
+                    lo = hi = mid;
+            }
+            m_branchData->children.Insert(node, lo);
+
+        }
+    }
+    else
+    {
+        m_branchData->children.Insert(node, index);
     }
 }
 
+
 void wxDataViewTreeNode::Resort()
 {
     if (!m_branchData)
         return;
 
-    if ((g_column = m_window->GetSortColumn()) >= -1)
-    {
-        wxDataViewTreeNodes& nodes = m_branchData->children;
+    // No reason to sort a closed node.
+    if ( !m_branchData->open )
+        return;
 
+    g_column = m_window->GetSortColumn();
+    if ( g_column != SortColumn_None )
+    {
         g_model = m_window->GetModel();
         g_asending = m_window->IsAscendingSort();
-        nodes.Sort(&wxGenericTreeModelNodeCmp);
-        int len = nodes.GetCount();
-        for (int i = 0; i < len; i++)
+        wxDataViewTreeNodes& nodes = m_branchData->children;
+
+        // Only sort the children if they aren't already sorted by the wanted criteria
+        if ( (g_column != m_branchData->sortColumn) || (g_asending != m_branchData->sortAscending) )
         {
-            if (nodes[i]->HasChildren())
+            nodes.Sort(&wxGenericTreeModelNodeCmp);
+            m_branchData->sortColumn = g_column;
+            m_branchData->sortAscending = g_asending;
+        }
+
+        // There may be open child nodes that also need a resort.
+        int len = nodes.GetCount();
+        for ( int i = 0; i < len; i++ )
+        {
+            if ( nodes[i]->HasChildren() )
                 nodes[i]->Resort();
         }
     }
 }
 
+
+void wxDataViewTreeNode::MoveUpdatedChild(wxDataViewTreeNode * childNode)
+{
+    // The childNode has changed, and may need to be moved to another location
+    // in the sorted child list.
+
+    if ( !m_branchData )
+        return;
+    if ( !m_branchData->open )
+        return;
+    if ( m_branchData->sortColumn == SortColumn_None )
+        return;
+
+    g_column = m_window->GetSortColumn();
+    g_model = m_window->GetModel();
+    g_asending = m_window->IsAscendingSort();
+
+    wxASSERT(g_column == m_branchData->sortColumn);
+    wxASSERT(g_asending == m_branchData->sortAscending);
+
+    wxDataViewTreeNodes& nodes = m_branchData->children;
+
+    // First find the node in the current child list
+    int hi = nodes.size();
+    int oldLocation = -1;
+    for ( int index = 0; index < hi; ++index )
+    {
+        if ( nodes[index] == childNode )
+        {
+            oldLocation = index;
+            break;
+        }
+    }
+    wxASSERT(oldLocation >= 0);
+
+    if ( oldLocation < 0 )
+        return;
+
+    // Check if we actually need to move the node.
+    bool locationChanged = false;
+
+    if ( oldLocation > 0 )
+    {
+        if (wxGenericTreeModelNodeCmp(&nodes[oldLocation - 1], &childNode) > 0 )
+            locationChanged = true;
+    }
+    if ( !locationChanged && (oldLocation + 1 < static_cast<int>(nodes.size())) )
+    {
+        if ( wxGenericTreeModelNodeCmp(&childNode, &nodes[oldLocation + 1]) > 0 )
+            locationChanged = true;
+    }
+
+
+    if ( locationChanged )
+    {
+        // Remove and reinsert the node in the child list
+        nodes.RemoveAt(oldLocation);
+        hi = nodes.size();
+        int lo = 0;
+        while ( lo < hi )
+        {
+            int mid = lo + (hi - lo) / 2;
+            int r = wxGenericTreeModelNodeCmp(&childNode, &m_branchData->children[mid]);
+            if ( r < 0 )
+                hi = mid;
+            else if ( r > 0 )
+                lo = mid + 1;
+            else
+                lo = hi = mid;
+        }
+        nodes.Insert(childNode, lo);
+    }
+
+}
+
+
 //-----------------------------------------------------------------------------
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
@@ -2536,60 +2686,70 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
         if ( !parentNode )
             return false;
 
-        wxDataViewItemArray modelSiblings;
-        GetModel()->GetChildren(parent, modelSiblings);
-        const int modelSiblingsSize = modelSiblings.size();
-
-        int posInModel = modelSiblings.Index(item, /*fromEnd=*/true);
-        wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" );
-
         wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(this, parentNode, item);
         itemNode->SetHasChildren(GetModel()->IsContainer(item));
-
         parentNode->SetHasChildren(true);
 
-        const wxDataViewTreeNodes& nodeSiblings = parentNode->GetChildNodes();
-        const int nodeSiblingsSize = nodeSiblings.size();
-
-        int nodePos = 0;
-
-        if ( posInModel == modelSiblingsSize - 1 )
+        if ( m_sortColumn == SortColumn_None )
         {
-            nodePos = nodeSiblingsSize;
-        }
-        else if ( modelSiblingsSize == nodeSiblingsSize + 1 )
-        {
-            // This is the simple case when our node tree already matches the
-            // model and only this one item is missing.
-            nodePos = posInModel;
+            // There's no sorting, so we need to select an insertion position
+
+            wxDataViewItemArray modelSiblings;
+            GetModel()->GetChildren(parent, modelSiblings);
+            const int modelSiblingsSize = modelSiblings.size();
+
+            int posInModel = modelSiblings.Index(item, /*fromEnd=*/true);
+            wxCHECK_MSG(posInModel != wxNOT_FOUND, false, "adding non-existent item?");
+
+
+            const wxDataViewTreeNodes& nodeSiblings = parentNode->GetChildNodes();
+            const int nodeSiblingsSize = nodeSiblings.size();
+
+            int nodePos = 0;
+
+            if ( posInModel == modelSiblingsSize - 1 )
+            {
+                nodePos = nodeSiblingsSize;
+            }
+            else if ( modelSiblingsSize == nodeSiblingsSize + 1 )
+            {
+                // This is the simple case when our node tree already matches the
+                // model and only this one item is missing.
+                nodePos = posInModel;
+            }
+            else
+            {
+                // It's possible that a larger discrepancy between the model and
+                // our realization exists. This can happen e.g. when adding a bunch
+                // of items to the model and then calling ItemsAdded() just once
+                // afterwards. In this case, we must find the right position by
+                // looking at sibling items.
+
+                // append to the end if we won't find a better position:
+                nodePos = nodeSiblingsSize;
+
+                for ( int nextItemPos = posInModel + 1;
+                     nextItemPos < modelSiblingsSize;
+                     nextItemPos++ )
+                {
+                    int nextNodePos = parentNode->FindChildByItem(modelSiblings[nextItemPos]);
+                    if ( nextNodePos != wxNOT_FOUND )
+                    {
+                        nodePos = nextNodePos;
+                        break;
+                    }
+                }
+            }
+            parentNode->ChangeSubTreeCount(+1);
+            parentNode->InsertChild(itemNode, nodePos);
         }
         else
         {
-            // It's possible that a larger discrepancy between the model and
-            // our realization exists. This can happen e.g. when adding a bunch
-            // of items to the model and then calling ItemsAdded() just once
-            // afterwards. In this case, we must find the right position by
-            // looking at sibling items.
-
-            // append to the end if we won't find a better position:
-            nodePos = nodeSiblingsSize;
-
-            for ( int nextItemPos = posInModel + 1;
-                  nextItemPos < modelSiblingsSize;
-                  nextItemPos++ )
-            {
-                int nextNodePos = parentNode->FindChildByItem(modelSiblings[nextItemPos]);
-                if ( nextNodePos != wxNOT_FOUND )
-                {
-                    nodePos = nextNodePos;
-                    break;
-                }
-            }
+            // Node list is or will be sorted, so InsertChild do not need insertion position
+            parentNode->ChangeSubTreeCount(+1);
+            parentNode->InsertChild(itemNode, 0);
         }
 
-        parentNode->ChangeSubTreeCount(+1);
-        parentNode->InsertChild(itemNode, nodePos);
-
         InvalidateCount();
     }
 
@@ -2716,7 +2876,16 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {
     SortPrepare();
-    GetModel()->Resort();
+
+    // Instead of resorting the parent, just move this specific child node.
+    wxDataViewItem parentItem = GetModel()->GetParent(item);
+    wxDataViewTreeNode * parentNode = FindNode(parentItem);
+    if ( parentNode )
+    {
+        wxDataViewTreeNode * node = FindNode(item);
+        wxASSERT(node);
+        parentNode->MoveUpdatedChild(node);
+    }
 
     GetOwner()->InvalidateColBestWidths();
 
@@ -2724,6 +2893,8 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner, item);
     m_owner->ProcessWindowEvent(le);
 
+    // Make sure the change is actually shown right away
+    UpdateDisplay();
     return true;
 }
 
@@ -2743,7 +2914,30 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
     return true;
 */
     SortPrepare();
-    GetModel()->Resort();
+
+    // Instead of resorting the parent, just move this specific child node.
+
+    // It is possible to skip the call to MoveUpdatedChild if the
+    // modified column is not the sort column, but in real world
+    // applications it's fully possible and likely that custom
+    // compare uses not only the selected model column but also
+    // falls back to other values for comparison. To ensure
+    // consistency it is better to treat a value change as if it
+    // was an item change.
+
+    // Alternatively, one could require the user to use ItemChanged
+    // rather than ValueChanged when the changed value may affect
+    // sorting, and add a check for model_column vs sort column
+    // here.
+
+    wxDataViewItem parentItem = GetModel()->GetParent(item);
+    wxDataViewTreeNode * parentNode = FindNode(parentItem);
+    if ( parentNode )
+    {
+        wxDataViewTreeNode * node = FindNode(item);
+        wxASSERT(node);
+        parentNode->MoveUpdatedChild(node);
+    }
 
     GetOwner()->InvalidateColBestWidth(view_column);
 
@@ -2752,6 +2946,9 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
     wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner, column, item);
     m_owner->ProcessWindowEvent(le);
 
+    // Make sure the change is actually shown right away
+    UpdateDisplay();
+
     return true;
 }
 
@@ -3390,12 +3587,15 @@ void wxDataViewMainWindow::Expand( unsigned int row )
             return;
         }
 
+
+        // ToggleOpen needs sorting to be prepared, in case the child list
+        // isn't sorted correctly.
+        SortPrepare();
         node->ToggleOpen();
 
         // build the children of current node
         if( node->GetChildNodes().empty() )
         {
-            SortPrepare();
             ::BuildTreeHelper(this, GetModel(), node->GetItem(), node);
         }
 

From eef994016a204df7d136ea4f5e9c43f444529871 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 16 Dec 2017 17:30:11 +0100
Subject: [PATCH 013/916] Reorder BranchNodeData struct members to make it more
 compact

By simply putting two bool fields consecutively to each other, we reduce
the number of bytes of padding used from 6 to 2 in a typical 32 bit
build, saving 4 (or 8, in 64 bits) bytes per branch item.
---
 src/generic/datavgen.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index f62622acaa..b4a993f888 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -615,12 +615,12 @@ private:
         // Is the branch node currently open (expanded)?
         bool                 open;
 
-        // By which column are the children currently sorted
-        int                  sortColumn;
-
         // Are the children currently sorted ascending or descending
         bool                 sortAscending;
 
+        // By which column are the children currently sorted
+        int                  sortColumn;
+
         // Total count of expanded (i.e. visible with the help of some
         // scrolling) items in the subtree, but excluding this node. I.e. it is
         // 0 for leaves and is the number of rows the subtree occupies for

From 8d9f0e6fef89100f66888ff7c09591e178504331 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 16 Dec 2017 17:32:53 +0100
Subject: [PATCH 014/916] Initialize BranchNodeData members in declaration
 order

Doing it out of order is harmless here, but would result gcc -Wreorder
warnings.
---
 src/generic/datavgen.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index b4a993f888..aaa097ca68 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -602,9 +602,9 @@ private:
     {
         BranchNodeData()
             : open(false),
-              subTreeCount(0),
+              sortAscending(false),
               sortColumn(SortColumn_None),
-              sortAscending(false)
+              subTreeCount(0)
         {
         }
 

From 0268c062c0d14d9028908e5d9b10f45ee26d29ae Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Dec 2017 17:23:42 +0100
Subject: [PATCH 015/916] Minor improvements to wxDataViewCtrl sorting
 optimization commit

Simplify some code and make it more clear, notably by changing
conditionals to be easier to follow.

Also avoid repeating the same functions calls (like SortPrepare() or
UpdateDisplay()) by folding them into the functions that actually need
them to be done.
---
 src/generic/datavgen.cpp | 229 +++++++++++++++++++--------------------
 1 file changed, 111 insertions(+), 118 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index aaa097ca68..5408794848 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -587,9 +587,23 @@ public:
     }
 
     void Resort();
-    void MoveUpdatedChild(wxDataViewTreeNode * childNode);
+
+    // Should be called after changing the item value to update its position in
+    // the control if necessary.
+    void PutInSortOrder()
+    {
+        if ( m_parent )
+            m_parent->PutChildInSortOrder(this);
+    }
 
 private:
+    // Called by the child after it has been updated to put it in the right
+    // place among its siblings, depending on the sort order.
+    //
+    // The argument must be non-null, but is passed as a pointer as it's
+    // inserted into m_branchData->children.
+    void PutChildInSortOrder(wxDataViewTreeNode* childNode);
+
     wxDataViewMainWindow * const m_window;
     wxDataViewTreeNode  *m_parent;
 
@@ -673,21 +687,20 @@ public:
         wxDataViewModel* model = GetModel();
 
         wxDataViewColumn* col = GetOwner()->GetSortingColumn();
-        if( !col )
+        if ( col )
+        {
+            m_sortColumn = col->GetModelColumn();
+            m_sortAscending = col->IsSortOrderAscending();
+        }
+        else
         {
             if (model->HasDefaultCompare())
-            {
                 m_sortColumn = SortColumn_Default;
-            }
             else
                 m_sortColumn = SortColumn_None;
 
             m_sortAscending = true;
-            return;
         }
-
-        m_sortColumn = col->GetModelColumn();
-        m_sortAscending = col->IsSortOrderAscending();
     }
 
     void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
@@ -1619,6 +1632,8 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
     if (!m_branchData)
         m_branchData = new BranchNodeData;
 
+    m_window->SortPrepare();
+
     g_column = m_window->GetSortColumn();
     g_model = m_window->GetModel();
     g_asending = m_window->IsAscendingSort();
@@ -1636,21 +1651,23 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
     }
     else if ( m_branchData->open )
     {
-        // The child list will always be correctly sorted for open nodes.
-        // The sole exception is the root node, on the first child
-        // addition.
-        if ( ( m_parent == NULL ) && m_branchData->children.IsEmpty())
+        // For open branches, children should be already sorted, with one
+        // possible exception that we check for here:
+        if ( m_branchData->sortColumn != g_column ||
+                m_branchData->sortAscending != g_asending )
         {
+            // This can happen for the root node, on the first child addition,
+            // in which case the children are nevertheless sorted (because
+            // there is only one of them), but we need to set the correct sort
+            // order.
+            wxASSERT_MSG( !m_parent && m_branchData->children.IsEmpty(),
+                          "Logic error in wxDVC sorting code" );
+
             m_branchData->sortColumn = g_column;
             m_branchData->sortAscending = g_asending;
         }
-        else
-        {
-            wxASSERT(m_branchData->sortColumn == g_column);
-            wxASSERT(m_branchData->sortAscending == g_asending);
-        }
 
-        // We retain the sorted child list
+        // We can use fast insertion.
         insertSorted = true;
     }
     else if ( m_branchData->children.IsEmpty() )
@@ -1662,11 +1679,13 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
         m_branchData->sortColumn = SortColumn_None;
         m_branchData->sortAscending = true;
     }
-    else if ( (m_branchData->sortColumn == g_column) && (m_branchData->sortAscending == g_asending) )
+    else if ( (m_branchData->sortColumn == g_column) &&
+                (m_branchData->sortAscending == g_asending) )
     {
-        // The children are already sorted by the correct criteria. This
-        // means the node has at some point in time been open. Even though
-        // the node is closed now, we insert sorted to avoid a later resort.
+        // The children are already sorted by the correct criteria (because
+        // the node must have been opened in the same time in the past). Even
+        // though it is closed now, we still insert in sort order to avoid a
+        // later resort.
         insertSorted = true;
     }
     else
@@ -1680,28 +1699,20 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
 
     if ( insertSorted )
     {
-        if ( m_branchData->children.IsEmpty() )
+        // Use binary search to find the correct position to insert at.
+        int lo = 0, hi = m_branchData->children.size();
+        while ( lo < hi )
         {
-            m_branchData->children.Insert(node, 0);
-        }
-        else
-        {
-            // Insert directly into sorted array
-            int lo = 0, hi = m_branchData->children.size();
-            while ( lo < hi )
-            {
-                int mid = lo + (hi - lo) / 2;
-                int r = wxGenericTreeModelNodeCmp(&node, &m_branchData->children[mid]);
-                if ( r < 0 )
-                    hi = mid;
-                else if ( r > 0 )
-                    lo = mid + 1;
-                else
-                    lo = hi = mid;
-            }
-            m_branchData->children.Insert(node, lo);
-
+            int mid = lo + (hi - lo) / 2;
+            int r = wxGenericTreeModelNodeCmp(&node, &m_branchData->children[mid]);
+            if ( r < 0 )
+                hi = mid;
+            else if ( r > 0 )
+                lo = mid + 1;
+            else
+                lo = hi = mid;
         }
+        m_branchData->children.Insert(node, lo);
     }
     else
     {
@@ -1726,8 +1737,10 @@ void wxDataViewTreeNode::Resort()
         g_asending = m_window->IsAscendingSort();
         wxDataViewTreeNodes& nodes = m_branchData->children;
 
-        // Only sort the children if they aren't already sorted by the wanted criteria
-        if ( (g_column != m_branchData->sortColumn) || (g_asending != m_branchData->sortAscending) )
+        // Only sort the children if they aren't already sorted by the wanted
+        // criteria.
+        if ( (g_column != m_branchData->sortColumn) ||
+                (g_asending != m_branchData->sortAscending) )
         {
             nodes.Sort(&wxGenericTreeModelNodeCmp);
             m_branchData->sortColumn = g_column;
@@ -1745,7 +1758,7 @@ void wxDataViewTreeNode::Resort()
 }
 
 
-void wxDataViewTreeNode::MoveUpdatedChild(wxDataViewTreeNode * childNode)
+void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
 {
     // The childNode has changed, and may need to be moved to another location
     // in the sorted child list.
@@ -1757,6 +1770,15 @@ void wxDataViewTreeNode::MoveUpdatedChild(wxDataViewTreeNode * childNode)
     if ( m_branchData->sortColumn == SortColumn_None )
         return;
 
+    wxDataViewTreeNodes& nodes = m_branchData->children;
+
+    // This is more than an optimization, the code below assumes that 1 is a
+    // valid index.
+    if ( nodes.size() == 1 )
+        return;
+
+    m_window->SortPrepare();
+
     g_column = m_window->GetSortColumn();
     g_model = m_window->GetModel();
     g_asending = m_window->IsAscendingSort();
@@ -1764,11 +1786,9 @@ void wxDataViewTreeNode::MoveUpdatedChild(wxDataViewTreeNode * childNode)
     wxASSERT(g_column == m_branchData->sortColumn);
     wxASSERT(g_asending == m_branchData->sortAscending);
 
-    wxDataViewTreeNodes& nodes = m_branchData->children;
-
     // First find the node in the current child list
     int hi = nodes.size();
-    int oldLocation = -1;
+    int oldLocation = wxNOT_FOUND;
     for ( int index = 0; index < hi; ++index )
     {
         if ( nodes[index] == childNode )
@@ -1777,46 +1797,47 @@ void wxDataViewTreeNode::MoveUpdatedChild(wxDataViewTreeNode * childNode)
             break;
         }
     }
-    wxASSERT(oldLocation >= 0);
-
-    if ( oldLocation < 0 )
-        return;
+    wxCHECK_RET( oldLocation >= 0, "not our child?" );
 
     // Check if we actually need to move the node.
     bool locationChanged = false;
 
-    if ( oldLocation > 0 )
+    if ( oldLocation == 0 )
     {
-        if (wxGenericTreeModelNodeCmp(&nodes[oldLocation - 1], &childNode) > 0 )
+        // Compare with the next item (as we return early in the case of only a
+        // single child, we know that there is one) to check if the item is now
+        // out of order.
+        if ( wxGenericTreeModelNodeCmp(&childNode, &nodes[1]) > 0 )
             locationChanged = true;
     }
-    if ( !locationChanged && (oldLocation + 1 < static_cast<int>(nodes.size())) )
+    else // Compare with the previous item.
     {
-        if ( wxGenericTreeModelNodeCmp(&childNode, &nodes[oldLocation + 1]) > 0 )
+        if ( wxGenericTreeModelNodeCmp(&nodes[oldLocation - 1], &childNode) > 0 )
             locationChanged = true;
     }
 
+    if ( !locationChanged )
+        return;
 
-    if ( locationChanged )
+    // Remove and reinsert the node in the child list
+    nodes.RemoveAt(oldLocation);
+    hi = nodes.size();
+    int lo = 0;
+    while ( lo < hi )
     {
-        // Remove and reinsert the node in the child list
-        nodes.RemoveAt(oldLocation);
-        hi = nodes.size();
-        int lo = 0;
-        while ( lo < hi )
-        {
-            int mid = lo + (hi - lo) / 2;
-            int r = wxGenericTreeModelNodeCmp(&childNode, &m_branchData->children[mid]);
-            if ( r < 0 )
-                hi = mid;
-            else if ( r > 0 )
-                lo = mid + 1;
-            else
-                lo = hi = mid;
-        }
-        nodes.Insert(childNode, lo);
+        int mid = lo + (hi - lo) / 2;
+        int r = wxGenericTreeModelNodeCmp(&childNode, &m_branchData->children[mid]);
+        if ( r < 0 )
+            hi = mid;
+        else if ( r > 0 )
+            lo = mid + 1;
+        else
+            lo = hi = mid;
     }
+    nodes.Insert(childNode, lo);
 
+    // Make sure the change is actually shown right away
+    m_window->UpdateDisplay();
 }
 
 
@@ -2679,8 +2700,6 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
     }
     else
     {
-        SortPrepare();
-
         wxDataViewTreeNode *parentNode = FindNode(parent);
 
         if ( !parentNode )
@@ -2875,17 +2894,10 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 
 bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
 {
-    SortPrepare();
-
-    // Instead of resorting the parent, just move this specific child node.
-    wxDataViewItem parentItem = GetModel()->GetParent(item);
-    wxDataViewTreeNode * parentNode = FindNode(parentItem);
-    if ( parentNode )
-    {
-        wxDataViewTreeNode * node = FindNode(item);
-        wxASSERT(node);
-        parentNode->MoveUpdatedChild(node);
-    }
+    // Move this node to its new correct place after it was updated.
+    wxDataViewTreeNode* const node = FindNode(item);
+    wxCHECK_MSG( node, false, "invalid item" );
+    node->PutInSortOrder();
 
     GetOwner()->InvalidateColBestWidths();
 
@@ -2893,8 +2905,6 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner, item);
     m_owner->ProcessWindowEvent(le);
 
-    // Make sure the change is actually shown right away
-    UpdateDisplay();
     return true;
 }
 
@@ -2913,31 +2923,21 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
     return true;
 */
-    SortPrepare();
 
-    // Instead of resorting the parent, just move this specific child node.
+    // In principle, we could skip the call to PutInSortOrder() if the modified
+    // column is not the sort column, but in real-world applications it's fully
+    // possible and likely that custom compare uses not only the selected model
+    // column but also falls back to other values for comparison. To ensure
+    // consistency it is better to treat a value change as if it was an item
+    // change.
+    //
+    // Alternatively, one could require the user to use ItemChanged() rather
+    // than ValueChanged() when the changed value may affect sorting, and add a
+    // check for model_column vs sort column here.
 
-    // It is possible to skip the call to MoveUpdatedChild if the
-    // modified column is not the sort column, but in real world
-    // applications it's fully possible and likely that custom
-    // compare uses not only the selected model column but also
-    // falls back to other values for comparison. To ensure
-    // consistency it is better to treat a value change as if it
-    // was an item change.
-
-    // Alternatively, one could require the user to use ItemChanged
-    // rather than ValueChanged when the changed value may affect
-    // sorting, and add a check for model_column vs sort column
-    // here.
-
-    wxDataViewItem parentItem = GetModel()->GetParent(item);
-    wxDataViewTreeNode * parentNode = FindNode(parentItem);
-    if ( parentNode )
-    {
-        wxDataViewTreeNode * node = FindNode(item);
-        wxASSERT(node);
-        parentNode->MoveUpdatedChild(node);
-    }
+    wxDataViewTreeNode* const node = FindNode(item);
+    wxCHECK_MSG( node, false, "invalid item" );
+    node->PutInSortOrder();
 
     GetOwner()->InvalidateColBestWidth(view_column);
 
@@ -2946,9 +2946,6 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
     wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner, column, item);
     m_owner->ProcessWindowEvent(le);
 
-    // Make sure the change is actually shown right away
-    UpdateDisplay();
-
     return true;
 }
 
@@ -3587,10 +3584,6 @@ void wxDataViewMainWindow::Expand( unsigned int row )
             return;
         }
 
-
-        // ToggleOpen needs sorting to be prepared, in case the child list
-        // isn't sorted correctly.
-        SortPrepare();
         node->ToggleOpen();
 
         // build the children of current node

From 259a3578244864976cbb90ceb6317913dbdc883f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Dec 2017 17:31:09 +0100
Subject: [PATCH 016/916] Use index, not value, when removing items from
 wxDataViewTreeNode

This avoids another (linear) search among the item siblings, as we can
use the index we've just found instead directly.
---
 src/generic/datavgen.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 5408794848..0da29eba68 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -471,10 +471,10 @@ public:
 
     void InsertChild(wxDataViewTreeNode *node, unsigned index);
 
-    void RemoveChild(wxDataViewTreeNode *node)
+    void RemoveChild(unsigned index)
     {
         wxCHECK_RET( m_branchData != NULL, "leaf node doesn't have children" );
-        m_branchData->children.Remove(node);
+        m_branchData->children.RemoveAt(index);
     }
 
     // returns position of child node for given item in children list or wxNOT_FOUND
@@ -2835,7 +2835,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
         // Delete the item from wxDataViewTreeNode representation:
         const int itemsDeleted = 1 + itemNode->GetSubTreeCount();
 
-        parentNode->RemoveChild(itemNode);
+        parentNode->RemoveChild(itemPosInNode);
         delete itemNode;
         parentNode->ChangeSubTreeCount(-itemsDeleted);
 

From a7c68663fd25d10cd152f8460d8c6e14089f19cd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Dec 2017 17:43:11 +0100
Subject: [PATCH 017/916] Replace macro-based items array with wxVector in
 wxDataViewCtrl

No real changes, just try to minimize the use of the old macro-based
containers as there is really no reason to do it here.
---
 src/generic/datavgen.cpp | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 0da29eba68..55de3a6eb2 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -35,6 +35,7 @@
     #include "wx/msgdlg.h"
     #include "wx/dcscreen.h"
     #include "wx/frame.h"
+    #include "wx/vector.h"
 #endif
 
 #include "wx/stockitem.h"
@@ -422,7 +423,8 @@ public:
 
 class wxDataViewMainWindow;
 class wxDataViewTreeNode;
-WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes );
+
+typedef wxVector<wxDataViewTreeNode*> wxDataViewTreeNodes;
 
 class wxDataViewTreeNode
 {
@@ -474,7 +476,7 @@ public:
     void RemoveChild(unsigned index)
     {
         wxCHECK_RET( m_branchData != NULL, "leaf node doesn't have children" );
-        m_branchData->children.RemoveAt(index);
+        m_branchData->RemoveChild(index);
     }
 
     // returns position of child node for given item in children list or wxNOT_FOUND
@@ -525,7 +527,7 @@ public:
         int sum = 0;
 
         const wxDataViewTreeNodes& nodes = m_branchData->children;
-        const int len = nodes.GetCount();
+        const int len = nodes.size();
         for ( int i = 0;i < len; i ++)
             sum += 1 + nodes[i]->GetSubTreeCount();
 
@@ -622,6 +624,16 @@ private:
         {
         }
 
+        void InsertChild(wxDataViewTreeNode* node, unsigned index)
+        {
+            children.insert(children.begin() + index, node);
+        }
+
+        void RemoveChild(unsigned index)
+        {
+            children.erase(children.begin() + index);
+        }
+
         // Child nodes. Note that this may be empty even if m_hasChildren in
         // case this branch of the tree wasn't expanded and realized yet.
         wxDataViewTreeNodes  children;
@@ -1660,7 +1672,7 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
             // in which case the children are nevertheless sorted (because
             // there is only one of them), but we need to set the correct sort
             // order.
-            wxASSERT_MSG( !m_parent && m_branchData->children.IsEmpty(),
+            wxASSERT_MSG( !m_parent && m_branchData->children.empty(),
                           "Logic error in wxDVC sorting code" );
 
             m_branchData->sortColumn = g_column;
@@ -1670,7 +1682,7 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
         // We can use fast insertion.
         insertSorted = true;
     }
-    else if ( m_branchData->children.IsEmpty() )
+    else if ( m_branchData->children.empty() )
     {
         // We're inserting the first child of a closed node. We can choose
         // whether to consider this empty child list sorted or unsorted.
@@ -1712,11 +1724,11 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
             else
                 lo = hi = mid;
         }
-        m_branchData->children.Insert(node, lo);
+        m_branchData->InsertChild(node, lo);
     }
     else
     {
-        m_branchData->children.Insert(node, index);
+        m_branchData->InsertChild(node, index);
     }
 }
 
@@ -1742,13 +1754,15 @@ void wxDataViewTreeNode::Resort()
         if ( (g_column != m_branchData->sortColumn) ||
                 (g_asending != m_branchData->sortAscending) )
         {
-            nodes.Sort(&wxGenericTreeModelNodeCmp);
+            qsort(&m_branchData->children[0], m_branchData->children.size(),
+                  sizeof(m_branchData->children[0]),
+                  (CMPFUNC)&wxGenericTreeModelNodeCmp);
             m_branchData->sortColumn = g_column;
             m_branchData->sortAscending = g_asending;
         }
 
         // There may be open child nodes that also need a resort.
-        int len = nodes.GetCount();
+        int len = nodes.size();
         for ( int i = 0; i < len; i++ )
         {
             if ( nodes[i]->HasChildren() )
@@ -1820,7 +1834,7 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
         return;
 
     // Remove and reinsert the node in the child list
-    nodes.RemoveAt(oldLocation);
+    m_branchData->RemoveChild(oldLocation);
     hi = nodes.size();
     int lo = 0;
     while ( lo < hi )
@@ -1834,7 +1848,7 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
         else
             lo = hi = mid;
     }
-    nodes.Insert(childNode, lo);
+    m_branchData->InsertChild(childNode, lo);
 
     // Make sure the change is actually shown right away
     m_window->UpdateDisplay();
@@ -3700,7 +3714,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
             const wxDataViewTreeNodes& nodes = node->GetChildNodes();
             bool found = false;
 
-            for (unsigned i = 0; i < nodes.GetCount(); ++i)
+            for (unsigned i = 0; i < nodes.size(); ++i)
             {
                 wxDataViewTreeNode* currentNode = nodes[i];
                 if (currentNode->GetItem() == parentChain[iter])

From 5365f3563e2800aac27fc47551da399cd47f30ea Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Dec 2017 18:40:14 +0100
Subject: [PATCH 018/916] Get rid of global sort-related variables in
 wxDataViewCtrl

Having to set up global variables before (re)sorting the items was too
ugly and became even more so after the latest changes optimizing item
sorting as sorting is done in more places now.

Improve the code by introducing a SortOrder class instead of dealing
with the sort column and sort order direction separately and,
especially, by using std::sort() (which should be fine to use here,
considering that it's used since quite some time in wxArrayString
implementation) with a comparator object instead of qsort(), which
doesn't allow passing any data to the sort callback otherwise than via
the global variables.

No changes in behaviour.
---
 src/generic/datavgen.cpp | 208 +++++++++++++++++++++------------------
 1 file changed, 113 insertions(+), 95 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 55de3a6eb2..cb77a75e71 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -67,7 +67,7 @@ class wxDataViewHeaderWindow;
 class wxDataViewCtrl;
 
 //-----------------------------------------------------------------------------
-// classes
+// constants
 //-----------------------------------------------------------------------------
 
 static const int SCROLL_UNIT_X = 15;
@@ -84,9 +84,8 @@ static const int EXPANDER_OFFSET = 4;
 static const int EXPANDER_OFFSET = 1;
 #endif
 
-// Below is the compare stuff.
-// For the generic implementation, both the leaf nodes and the nodes are sorted for
-// fast search when needed
+namespace
+{
 
 // The column is either the index of the column to be used for sorting or one
 // of the special values in this enum:
@@ -99,13 +98,46 @@ enum
     SortColumn_Default = -1
 };
 
+// A class storing the definition of sort order used, as a column index and
+// sort direction by this column.
+//
+// Notice that the sort order may be invalid, meaning that items shouldn't be
+// sorted.
+class SortOrder
+{
+public:
+    explicit SortOrder(int column = SortColumn_None, bool ascending = true)
+        : m_column(column),
+          m_ascending(ascending)
+    {
+    }
+
+    // Default copy ctor, assignment operator and dtor are all OK.
+
+    bool IsNone() const { return m_column == SortColumn_None; }
+
+    int GetColumn() const { return m_column; }
+    bool IsAscending() const { return m_ascending; }
+
+    bool operator==(const SortOrder& other) const
+    {
+        return m_column == other.m_column && m_ascending == other.m_ascending;
+    }
+
+    bool operator!=(const SortOrder& other) const
+    {
+        return !(*this == other);
+    }
+
+private:
+    int m_column;
+    bool m_ascending;
+};
+
 // ----------------------------------------------------------------------------
 // helper functions
 // ----------------------------------------------------------------------------
 
-namespace
-{
-
 // Return the expander column or, if it is not set, the first column and also
 // set it as the expander one for the future.
 wxDataViewColumn* GetExpanderColumnOrFirstOne(wxDataViewCtrl* dataview)
@@ -618,8 +650,6 @@ private:
     {
         BranchNodeData()
             : open(false),
-              sortAscending(false),
-              sortColumn(SortColumn_None),
               subTreeCount(0)
         {
         }
@@ -638,15 +668,12 @@ private:
         // case this branch of the tree wasn't expanded and realized yet.
         wxDataViewTreeNodes  children;
 
+        // Order in which children are sorted (possibly none).
+        SortOrder            sortOrder;
+
         // Is the branch node currently open (expanded)?
         bool                 open;
 
-        // Are the children currently sorted ascending or descending
-        bool                 sortAscending;
-
-        // By which column are the children currently sorted
-        int                  sortColumn;
-
         // Total count of expanded (i.e. visible with the help of some
         // scrolling) items in the subtree, but excluding this node. I.e. it is
         // 0 for leaves and is the number of rows the subtree occupies for
@@ -688,30 +715,25 @@ public:
     {
         if (!IsVirtualList())
         {
-            SortPrepare();
             m_root->Resort();
         }
         UpdateDisplay();
     }
 
-    void SortPrepare()
+    SortOrder GetSortOrder() const
     {
-        wxDataViewModel* model = GetModel();
-
-        wxDataViewColumn* col = GetOwner()->GetSortingColumn();
+        wxDataViewColumn* const col = GetOwner()->GetSortingColumn();
         if ( col )
         {
-            m_sortColumn = col->GetModelColumn();
-            m_sortAscending = col->IsSortOrderAscending();
+            return SortOrder(col->GetModelColumn(),
+                             col->IsSortOrderAscending());
         }
         else
         {
-            if (model->HasDefaultCompare())
-                m_sortColumn = SortColumn_Default;
+            if (GetModel()->HasDefaultCompare())
+                return SortOrder(SortColumn_Default);
             else
-                m_sortColumn = SortColumn_None;
-
-            m_sortAscending = true;
+                return SortOrder();
         }
     }
 
@@ -852,9 +874,6 @@ public:
         return FindColumnForEditing(item, wxDATAVIEW_CELL_EDITABLE) != NULL;
     }
 
-    int GetSortColumn() const { return m_sortColumn; }
-    bool IsAscendingSort() const { return m_sortAscending; }
-
 private:
     void InvalidateCount() { m_count = -1; }
     void UpdateCount(int count)
@@ -923,10 +942,6 @@ private:
     // This is the tree node under the cursor
     wxDataViewTreeNode * m_underMouse;
 
-    // sorted column + extra flags
-    int m_sortColumn;
-    bool m_sortAscending;
-
     // The control used for editing or NULL.
     wxWeakRef<wxWindow> m_editorCtrl;
 
@@ -1624,49 +1639,68 @@ void wxDataViewRenameTimer::Notify()
 // wxDataViewTreeNode
 // ----------------------------------------------------------------------------
 
-// Used by wxGenericTreeModelNodeCmp sort callback only.
-//
-// This is not thread safe but it should be fine if all events are handled in
-// one thread.
-static wxDataViewModel* g_model;
-static int g_column;
-static bool g_asending;
-
-int LINKAGEMODE wxGenericTreeModelNodeCmp(wxDataViewTreeNode ** node1,
-    wxDataViewTreeNode ** node2)
+namespace
 {
-    return g_model->Compare((*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending);
-}
 
+// Comparator used for sorting the tree nodes using the model-defined sort
+// order and also for performing binary search in our own code.
+class wxGenericTreeModelNodeCmp
+{
+public:
+    wxGenericTreeModelNodeCmp(wxDataViewMainWindow* window,
+                              const SortOrder& sortOrder)
+        : m_model(window->GetModel()),
+          m_sortOrder(sortOrder)
+    {
+        wxASSERT_MSG( !m_sortOrder.IsNone(), "should have sort order" );
+    }
+
+    // Return negative, zero or positive value depending on whether the first
+    // item is less than, equal to or greater than the second one.
+    int Compare(wxDataViewTreeNode* first, wxDataViewTreeNode* second) const
+    {
+        return m_model->Compare(first->GetItem(), second->GetItem(),
+                                m_sortOrder.GetColumn(),
+                                m_sortOrder.IsAscending());
+    }
+
+    // Return true if the items are in order, i.e. the first item is less than
+    // or equal (because it's useless to exchange them in this case) than the
+    // second one. This is used by std::sort().
+    bool operator()(wxDataViewTreeNode* first, wxDataViewTreeNode* second) const
+    {
+        return Compare(first, second) <= 0;
+    }
+
+private:
+    wxDataViewModel* const m_model;
+    const SortOrder m_sortOrder;
+};
+
+} // anonymous namespace
 
 void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
 {
     if (!m_branchData)
         m_branchData = new BranchNodeData;
 
-    m_window->SortPrepare();
-
-    g_column = m_window->GetSortColumn();
-    g_model = m_window->GetModel();
-    g_asending = m_window->IsAscendingSort();
+    const SortOrder sortOrder = m_window->GetSortOrder();
 
     // Flag indicating whether we should retain existing sorted list when
     // inserting the child node.
     bool insertSorted = false;
 
-    if ( g_column == SortColumn_None )
+    if ( sortOrder.IsNone() )
     {
         // We should insert assuming an unsorted list. This will cause the
         // child list to lose the current sort order, if any.
-        m_branchData->sortColumn = SortColumn_None;
-        m_branchData->sortAscending = true;
+        m_branchData->sortOrder = SortOrder();
     }
     else if ( m_branchData->open )
     {
         // For open branches, children should be already sorted, with one
         // possible exception that we check for here:
-        if ( m_branchData->sortColumn != g_column ||
-                m_branchData->sortAscending != g_asending )
+        if ( m_branchData->sortOrder != sortOrder )
         {
             // This can happen for the root node, on the first child addition,
             // in which case the children are nevertheless sorted (because
@@ -1675,8 +1709,7 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
             wxASSERT_MSG( !m_parent && m_branchData->children.empty(),
                           "Logic error in wxDVC sorting code" );
 
-            m_branchData->sortColumn = g_column;
-            m_branchData->sortAscending = g_asending;
+            m_branchData->sortOrder = sortOrder;
         }
 
         // We can use fast insertion.
@@ -1688,11 +1721,9 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
         // whether to consider this empty child list sorted or unsorted.
         // By choosing unsorted, we postpone comparisons until the parent
         // node is opened in the view, which may be never.
-        m_branchData->sortColumn = SortColumn_None;
-        m_branchData->sortAscending = true;
+        m_branchData->sortOrder = SortOrder();
     }
-    else if ( (m_branchData->sortColumn == g_column) &&
-                (m_branchData->sortAscending == g_asending) )
+    else if ( m_branchData->sortOrder == sortOrder )
     {
         // The children are already sorted by the correct criteria (because
         // the node must have been opened in the same time in the past). Even
@@ -1704,19 +1735,19 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
     {
         // The children aren't sorted by the correct criteria, so we just
         // insert unsorted.
-        m_branchData->sortColumn = SortColumn_None;
-        m_branchData->sortAscending = true;
+        m_branchData->sortOrder = SortOrder();
     }
 
 
     if ( insertSorted )
     {
         // Use binary search to find the correct position to insert at.
+        wxGenericTreeModelNodeCmp cmp(m_window, sortOrder);
         int lo = 0, hi = m_branchData->children.size();
         while ( lo < hi )
         {
             int mid = lo + (hi - lo) / 2;
-            int r = wxGenericTreeModelNodeCmp(&node, &m_branchData->children[mid]);
+            int r = cmp.Compare(node, m_branchData->children[mid]);
             if ( r < 0 )
                 hi = mid;
             else if ( r > 0 )
@@ -1742,23 +1773,20 @@ void wxDataViewTreeNode::Resort()
     if ( !m_branchData->open )
         return;
 
-    g_column = m_window->GetSortColumn();
-    if ( g_column != SortColumn_None )
+    const SortOrder sortOrder = m_window->GetSortOrder();
+    if ( !sortOrder.IsNone() )
     {
-        g_model = m_window->GetModel();
-        g_asending = m_window->IsAscendingSort();
         wxDataViewTreeNodes& nodes = m_branchData->children;
 
         // Only sort the children if they aren't already sorted by the wanted
         // criteria.
-        if ( (g_column != m_branchData->sortColumn) ||
-                (g_asending != m_branchData->sortAscending) )
+        if ( m_branchData->sortOrder != sortOrder )
         {
-            qsort(&m_branchData->children[0], m_branchData->children.size(),
-                  sizeof(m_branchData->children[0]),
-                  (CMPFUNC)&wxGenericTreeModelNodeCmp);
-            m_branchData->sortColumn = g_column;
-            m_branchData->sortAscending = g_asending;
+            std::sort(m_branchData->children.begin(),
+                      m_branchData->children.end(),
+                      wxGenericTreeModelNodeCmp(m_window, sortOrder));
+
+            m_branchData->sortOrder = sortOrder;
         }
 
         // There may be open child nodes that also need a resort.
@@ -1781,7 +1809,7 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
         return;
     if ( !m_branchData->open )
         return;
-    if ( m_branchData->sortColumn == SortColumn_None )
+    if ( m_branchData->sortOrder.IsNone() )
         return;
 
     wxDataViewTreeNodes& nodes = m_branchData->children;
@@ -1791,14 +1819,8 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
     if ( nodes.size() == 1 )
         return;
 
-    m_window->SortPrepare();
-
-    g_column = m_window->GetSortColumn();
-    g_model = m_window->GetModel();
-    g_asending = m_window->IsAscendingSort();
-
-    wxASSERT(g_column == m_branchData->sortColumn);
-    wxASSERT(g_asending == m_branchData->sortAscending);
+    // We should already be sorted in the right order.
+    wxASSERT(m_branchData->sortOrder == m_window->GetSortOrder());
 
     // First find the node in the current child list
     int hi = nodes.size();
@@ -1813,6 +1835,8 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
     }
     wxCHECK_RET( oldLocation >= 0, "not our child?" );
 
+    wxGenericTreeModelNodeCmp cmp(m_window, m_branchData->sortOrder);
+
     // Check if we actually need to move the node.
     bool locationChanged = false;
 
@@ -1821,12 +1845,12 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
         // Compare with the next item (as we return early in the case of only a
         // single child, we know that there is one) to check if the item is now
         // out of order.
-        if ( wxGenericTreeModelNodeCmp(&childNode, &nodes[1]) > 0 )
+        if ( !cmp(childNode, nodes[1]) )
             locationChanged = true;
     }
     else // Compare with the previous item.
     {
-        if ( wxGenericTreeModelNodeCmp(&nodes[oldLocation - 1], &childNode) > 0 )
+        if ( !cmp(nodes[oldLocation - 1], childNode) )
             locationChanged = true;
     }
 
@@ -1840,7 +1864,7 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
     while ( lo < hi )
     {
         int mid = lo + (hi - lo) / 2;
-        int r = wxGenericTreeModelNodeCmp(&childNode, &m_branchData->children[mid]);
+        int r = cmp.Compare(childNode, m_branchData->children[mid]);
         if ( r < 0 )
             hi = mid;
         else if ( r > 0 )
@@ -1943,9 +1967,6 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     m_count = -1;
     m_underMouse = NULL;
 
-    m_sortColumn = SortColumn_None;
-    m_sortAscending = true;
-
     UpdateDisplay();
 }
 
@@ -2723,7 +2744,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
         itemNode->SetHasChildren(GetModel()->IsContainer(item));
         parentNode->SetHasChildren(true);
 
-        if ( m_sortColumn == SortColumn_None )
+        if ( GetSortOrder().IsNone() )
         {
             // There's no sorting, so we need to select an insertion position
 
@@ -2971,7 +2992,6 @@ bool wxDataViewMainWindow::Cleared()
 
     if (GetModel())
     {
-        SortPrepare();
         BuildTree( GetModel() );
     }
     else
@@ -3707,7 +3727,6 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item
                 // Even though the item is a container, it doesn't have any
                 // child nodes in the control's representation yet. We have
                 // to realize its subtree now.
-                SortPrepare();
                 ::BuildTreeHelper(this, model, node->GetItem(), node);
             }
 
@@ -3955,7 +3974,6 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
 
     // First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;
-    SortPrepare();
     BuildTreeHelper(this, model, item, m_root);
     InvalidateCount();
 }

From 3f41e84830e522e2d5340f2d109c953359dd8a8b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Dec 2017 18:59:36 +0100
Subject: [PATCH 019/916] Remove unused wxDataViewSelection dynamic array macro

This should have been done in 36a5983f64c0f9adfdc67b5c11fe44671cea1ab5
but was forgotten and the unused array remained in the code.
---
 src/generic/datavgen.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index cb77a75e71..9c8736cb78 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -690,8 +690,6 @@ private:
 // wxDataViewMainWindow
 //-----------------------------------------------------------------------------
 
-WX_DEFINE_SORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection);
-
 class wxDataViewMainWindow: public wxWindow
 {
 public:

From 1bfe42b0ce02ab63cdc53e012cb6c553a261861e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Dec 2017 19:09:04 +0100
Subject: [PATCH 020/916] Simplify sort order handling for first child item

Test whether this is the first child before testing whether the branch
is open as this allows to avoid the special case of inserting the first
child under the root node and simplifies the assert condition to a
simple check that the sort order is already what we expect.
---
 src/generic/datavgen.cpp | 42 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 9c8736cb78..3750116e64 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1694,33 +1694,33 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
         // child list to lose the current sort order, if any.
         m_branchData->sortOrder = SortOrder();
     }
-    else if ( m_branchData->open )
+    else if ( m_branchData->children.empty() )
     {
-        // For open branches, children should be already sorted, with one
-        // possible exception that we check for here:
-        if ( m_branchData->sortOrder != sortOrder )
+        if ( m_branchData->open )
         {
-            // This can happen for the root node, on the first child addition,
-            // in which case the children are nevertheless sorted (because
-            // there is only one of them), but we need to set the correct sort
-            // order.
-            wxASSERT_MSG( !m_parent && m_branchData->children.empty(),
-                          "Logic error in wxDVC sorting code" );
-
+            // We don't need to search for the right place to insert the first
+            // item (there is only one), but we do need to remember the sort
+            // order to use for the subsequent ones.
             m_branchData->sortOrder = sortOrder;
         }
+        else
+        {
+            // We're inserting the first child of a closed node. We can choose
+            // whether to consider this empty child list sorted or unsorted.
+            // By choosing unsorted, we postpone comparisons until the parent
+            // node is opened in the view, which may be never.
+            m_branchData->sortOrder = SortOrder();
+        }
+    }
+    else if ( m_branchData->open )
+    {
+        // For open branches, children should be already sorted.
+        wxASSERT_MSG( m_branchData->sortOrder == sortOrder,
+                      wxS("Logic error in wxDVC sorting code") );
 
         // We can use fast insertion.
         insertSorted = true;
     }
-    else if ( m_branchData->children.empty() )
-    {
-        // We're inserting the first child of a closed node. We can choose
-        // whether to consider this empty child list sorted or unsorted.
-        // By choosing unsorted, we postpone comparisons until the parent
-        // node is opened in the view, which may be never.
-        m_branchData->sortOrder = SortOrder();
-    }
     else if ( m_branchData->sortOrder == sortOrder )
     {
         // The children are already sorted by the correct criteria (because
@@ -1731,8 +1731,8 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
     }
     else
     {
-        // The children aren't sorted by the correct criteria, so we just
-        // insert unsorted.
+        // The children of this closed node aren't sorted by the correct
+        // criteria, so we just insert unsorted.
         m_branchData->sortOrder = SortOrder();
     }
 

From 1dbe3dafe4b3a2fcc6134ed24abf21d7faa3851f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Dec 2017 19:16:34 +0100
Subject: [PATCH 021/916] Stop storing window pointer in all wxDataViewTreeNode
 objects

This didn't make any sense, all these objects reachable from the given
root node are used by the same window, so storing the same pointer in
all of them just wasted memory unnecessarily.

Avoid this by passing wxDataViewMainWindow pointer explicitly to those
methods of wxDataViewTreeNode that need it.

No changes in behaviour, this is just a (memory use) optimization.
---
 src/generic/datavgen.cpp | 79 ++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 3750116e64..82885fdc41 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -461,11 +461,8 @@ typedef wxVector<wxDataViewTreeNode*> wxDataViewTreeNodes;
 class wxDataViewTreeNode
 {
 public:
-    wxDataViewTreeNode(wxDataViewMainWindow *window,
-                       wxDataViewTreeNode *parent,
-                       const wxDataViewItem& item)
-        : m_window(window),
-          m_parent(parent),
+    wxDataViewTreeNode(wxDataViewTreeNode *parent, const wxDataViewItem& item)
+        : m_parent(parent),
           m_item(item),
           m_branchData(NULL)
     {
@@ -487,9 +484,9 @@ public:
         }
     }
 
-    static wxDataViewTreeNode* CreateRootNode(wxDataViewMainWindow *w)
+    static wxDataViewTreeNode* CreateRootNode()
     {
-        wxDataViewTreeNode *n = new wxDataViewTreeNode(w, NULL, wxDataViewItem());
+        wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem());
         n->m_branchData = new BranchNodeData;
         n->m_branchData->open = true;
         return n;
@@ -503,7 +500,8 @@ public:
         return m_branchData->children;
     }
 
-    void InsertChild(wxDataViewTreeNode *node, unsigned index);
+    void InsertChild(wxDataViewMainWindow* window,
+                     wxDataViewTreeNode *node, unsigned index);
 
     void RemoveChild(unsigned index)
     {
@@ -547,7 +545,7 @@ public:
         return m_branchData && m_branchData->open;
     }
 
-    void ToggleOpen()
+    void ToggleOpen(wxDataViewMainWindow* window)
     {
         // We do not allow the (invisible) root node to be collapsed because
         // there is no way to expand it again.
@@ -573,7 +571,7 @@ public:
             m_branchData->open = !m_branchData->open;
             ChangeSubTreeCount(+sum);
             // Sort the children if needed
-            Resort();
+            Resort(window);
         }
     }
 
@@ -620,14 +618,14 @@ public:
             m_parent->ChangeSubTreeCount(num);
     }
 
-    void Resort();
+    void Resort(wxDataViewMainWindow* window);
 
     // Should be called after changing the item value to update its position in
     // the control if necessary.
-    void PutInSortOrder()
+    void PutInSortOrder(wxDataViewMainWindow* window)
     {
         if ( m_parent )
-            m_parent->PutChildInSortOrder(this);
+            m_parent->PutChildInSortOrder(window, this);
     }
 
 private:
@@ -636,9 +634,9 @@ private:
     //
     // The argument must be non-null, but is passed as a pointer as it's
     // inserted into m_branchData->children.
-    void PutChildInSortOrder(wxDataViewTreeNode* childNode);
+    void PutChildInSortOrder(wxDataViewMainWindow* window,
+                             wxDataViewTreeNode* childNode);
 
-    wxDataViewMainWindow * const m_window;
     wxDataViewTreeNode  *m_parent;
 
     // Corresponding model item.
@@ -713,7 +711,7 @@ public:
     {
         if (!IsVirtualList())
         {
-            m_root->Resort();
+            m_root->Resort(this);
         }
         UpdateDisplay();
     }
@@ -1677,12 +1675,13 @@ private:
 
 } // anonymous namespace
 
-void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
+void wxDataViewTreeNode::InsertChild(wxDataViewMainWindow* window,
+                                     wxDataViewTreeNode *node, unsigned index)
 {
     if (!m_branchData)
         m_branchData = new BranchNodeData;
 
-    const SortOrder sortOrder = m_window->GetSortOrder();
+    const SortOrder sortOrder = window->GetSortOrder();
 
     // Flag indicating whether we should retain existing sorted list when
     // inserting the child node.
@@ -1740,7 +1739,7 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
     if ( insertSorted )
     {
         // Use binary search to find the correct position to insert at.
-        wxGenericTreeModelNodeCmp cmp(m_window, sortOrder);
+        wxGenericTreeModelNodeCmp cmp(window, sortOrder);
         int lo = 0, hi = m_branchData->children.size();
         while ( lo < hi )
         {
@@ -1762,7 +1761,7 @@ void wxDataViewTreeNode::InsertChild(wxDataViewTreeNode *node, unsigned index)
 }
 
 
-void wxDataViewTreeNode::Resort()
+void wxDataViewTreeNode::Resort(wxDataViewMainWindow* window)
 {
     if (!m_branchData)
         return;
@@ -1771,7 +1770,7 @@ void wxDataViewTreeNode::Resort()
     if ( !m_branchData->open )
         return;
 
-    const SortOrder sortOrder = m_window->GetSortOrder();
+    const SortOrder sortOrder = window->GetSortOrder();
     if ( !sortOrder.IsNone() )
     {
         wxDataViewTreeNodes& nodes = m_branchData->children;
@@ -1782,7 +1781,7 @@ void wxDataViewTreeNode::Resort()
         {
             std::sort(m_branchData->children.begin(),
                       m_branchData->children.end(),
-                      wxGenericTreeModelNodeCmp(m_window, sortOrder));
+                      wxGenericTreeModelNodeCmp(window, sortOrder));
 
             m_branchData->sortOrder = sortOrder;
         }
@@ -1792,13 +1791,15 @@ void wxDataViewTreeNode::Resort()
         for ( int i = 0; i < len; i++ )
         {
             if ( nodes[i]->HasChildren() )
-                nodes[i]->Resort();
+                nodes[i]->Resort(window);
         }
     }
 }
 
 
-void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
+void
+wxDataViewTreeNode::PutChildInSortOrder(wxDataViewMainWindow* window,
+                                        wxDataViewTreeNode* childNode)
 {
     // The childNode has changed, and may need to be moved to another location
     // in the sorted child list.
@@ -1818,7 +1819,7 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
         return;
 
     // We should already be sorted in the right order.
-    wxASSERT(m_branchData->sortOrder == m_window->GetSortOrder());
+    wxASSERT(m_branchData->sortOrder == window->GetSortOrder());
 
     // First find the node in the current child list
     int hi = nodes.size();
@@ -1833,7 +1834,7 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
     }
     wxCHECK_RET( oldLocation >= 0, "not our child?" );
 
-    wxGenericTreeModelNodeCmp cmp(m_window, m_branchData->sortOrder);
+    wxGenericTreeModelNodeCmp cmp(window, m_branchData->sortOrder);
 
     // Check if we actually need to move the node.
     bool locationChanged = false;
@@ -1873,7 +1874,7 @@ void wxDataViewTreeNode::PutChildInSortOrder(wxDataViewTreeNode* childNode)
     m_branchData->InsertChild(childNode, lo);
 
     // Make sure the change is actually shown right away
-    m_window->UpdateDisplay();
+    window->UpdateDisplay();
 }
 
 
@@ -1959,7 +1960,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
     // TODO: maybe there is something system colour to use
     m_penExpander = wxPen(wxColour(0,0,0));
 
-    m_root = wxDataViewTreeNode::CreateRootNode(this);
+    m_root = wxDataViewTreeNode::CreateRootNode();
 
     // Make m_count = -1 will cause the class recaculate the real displaying number of rows.
     m_count = -1;
@@ -2738,7 +2739,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
         if ( !parentNode )
             return false;
 
-        wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(this, parentNode, item);
+        wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(parentNode, item);
         itemNode->SetHasChildren(GetModel()->IsContainer(item));
         parentNode->SetHasChildren(true);
 
@@ -2793,13 +2794,13 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
                 }
             }
             parentNode->ChangeSubTreeCount(+1);
-            parentNode->InsertChild(itemNode, nodePos);
+            parentNode->InsertChild(this, itemNode, nodePos);
         }
         else
         {
             // Node list is or will be sorted, so InsertChild do not need insertion position
             parentNode->ChangeSubTreeCount(+1);
-            parentNode->InsertChild(itemNode, 0);
+            parentNode->InsertChild(this, itemNode, 0);
         }
 
         InvalidateCount();
@@ -2886,7 +2887,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
                 // If it's still a container, make sure we show "+" icon for it
                 // and not "-" one as there is nothing to collapse any more.
                 if ( parentNode->IsOpen() )
-                    parentNode->ToggleOpen();
+                    parentNode->ToggleOpen(this);
             }
         }
 
@@ -2930,7 +2931,7 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
     // Move this node to its new correct place after it was updated.
     wxDataViewTreeNode* const node = FindNode(item);
     wxCHECK_MSG( node, false, "invalid item" );
-    node->PutInSortOrder();
+    node->PutInSortOrder(this);
 
     GetOwner()->InvalidateColBestWidths();
 
@@ -2970,7 +2971,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
 
     wxDataViewTreeNode* const node = FindNode(item);
     wxCHECK_MSG( node, false, "invalid item" );
-    node->PutInSortOrder();
+    node->PutInSortOrder(this);
 
     GetOwner()->InvalidateColBestWidth(view_column);
 
@@ -3616,7 +3617,7 @@ void wxDataViewMainWindow::Expand( unsigned int row )
             return;
         }
 
-        node->ToggleOpen();
+        node->ToggleOpen(this);
 
         // build the children of current node
         if( node->GetChildNodes().empty() )
@@ -3672,7 +3673,7 @@ void wxDataViewMainWindow::Collapse(unsigned int row)
             SendSelectionChangedEvent(GetItemByRow(row));
         }
 
-        node->ToggleOpen();
+        node->ToggleOpen(this);
 
         // Adjust the current row if necessary.
         if ( m_currentRow > row )
@@ -3946,12 +3947,12 @@ static void BuildTreeHelper( wxDataViewMainWindow *window, const wxDataViewModel
 
     for ( unsigned int index = 0; index < num; index++ )
     {
-        wxDataViewTreeNode *n = new wxDataViewTreeNode(window, node, children[index]);
+        wxDataViewTreeNode *n = new wxDataViewTreeNode(node, children[index]);
 
         if( model->IsContainer(children[index]) )
             n->SetHasChildren( true );
 
-        node->InsertChild(n, index);
+        node->InsertChild(window, n, index);
     }
 
     wxASSERT( node->IsOpen() );
@@ -3968,7 +3969,7 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)
         return;
     }
 
-    m_root = wxDataViewTreeNode::CreateRootNode(this);
+    m_root = wxDataViewTreeNode::CreateRootNode();
 
     // First we define a invalid item to fetch the top-level elements
     wxDataViewItem item;

From aa7c99b275fb6485bfcd80f2348b5de6a1143f19 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Dec 2017 16:58:59 +0100
Subject: [PATCH 022/916] Minor formatting fixes to recently changed wxListCtrl
 code

No real changes.
---
 src/msw/listctrl.cpp | 51 ++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index f470bb8bd6..40bdee2b09 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -3107,18 +3107,17 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
         }
 
         /*
-        The drawing can be clipped horizontally to the rightmost column. This
-        happens when an item is added (and visible) and results in a
-        horizontal rule being clipped instead of drawn across the entire list
-        control. In that case we request for the part to the right of the
-        rightmost column to be drawn as well.
+            The drawing can be clipped horizontally to the rightmost column.
+            This happens when an item is added (and visible) and results in a
+            horizontal rule being clipped instead of drawn across the entire
+            list control. In that case we request for the part to the right of
+            the rightmost column to be drawn as well.
         */
-        if ( clipRect.GetRight()  != clientSize.GetWidth() - 1
-            && clipRect.width)
+        if ( clipRect.GetRight() != clientSize.x - 1 && clipRect.width )
         {
             RefreshRect(wxRect(clipRect.GetRight(), clipRect.y,
-                clientSize.x - clipRect.width, clipRect.height),
-                false /* erase background? */);
+                               clientSize.x - clipRect.width, clipRect.height),
+                        false /* don't erase background */);
         }
     }
 
@@ -3130,25 +3129,25 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
         if (GetItemRect(bottom, bottomItemRect))
         {
             /*
-            This is a fix for ticket #747: erase the pixels which we would
-            otherwise leave on the screen.
+                This is a fix for ticket #747: erase the pixels which we would
+                otherwise leave on the screen.
 
-            The drawing of the rectangle as a fix to erase trailing pixels
-            when resizing a column is only needed for ComCtl32 prior to
-            6.0, i.e. when not using a manifest in which case 5.82 is
-            used. And even then it only happens when "Show window contents
-            while dragging" is enabled under Windows, resulting in live
-            updates when resizing columns. Note that even with that setting
-            on, at least under Windows 7 and 10 no live updating is done when
-            using ComCtl32 5.82.
+                The drawing of the rectangle as a fix to erase trailing pixels
+                when resizing a column is only needed for ComCtl32 prior to
+                6.0, i.e. when not using a manifest in which case 5.82 is used.
+                And even then it only happens when "Show window contents while
+                dragging" is enabled under Windows, resulting in live updates
+                when resizing columns. Note that even with that setting on, at
+                least under Windows 7 and 10 no live updating is done when
+                using ComCtl32 5.82.
 
-            Revision b66c3a67519caa9debfd76e6d74954eaebfa56d9 made this fix
-            almost redundant, except that when you do NOT handle
-            EVT_LIST_COL_DRAGGING (or do and skip the event) the trailing
-            pixels still appear. In case of wanting to reproduce the problem
-            in the listctrl sample: comment out handling oF
-            EVT_LIST_COL_DRAGGING and also set useDrawFix to false and gap to
-            2 (not 0).
+                Revision b66c3a67519caa9debfd76e6d74954eaebfa56d9 made this fix
+                almost redundant, except that when you do NOT handle
+                EVT_LIST_COL_DRAGGING (or do and skip the event) the trailing
+                pixels still appear. In case of wanting to reproduce the
+                problem in the listctrl sample: comment out handling oF
+                EVT_LIST_COL_DRAGGING and also set useDrawFix to false and gap
+                to 2 (not 0).
             */
 
             static const bool useDrawFix = wxApp::GetComCtl32Version() < 600;

From de7fa05245d4e50cb5cebd55345ab4b1571edaee Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Dec 2017 17:00:44 +0100
Subject: [PATCH 023/916] Use wxDCXXXChanger classes instead of manual SetXXX()
 calls

No real changes, but the code is slightly shorter, maybe more clear and
will be easier to maintain (because more difficult to break
accidentally) in the future.
---
 src/msw/listctrl.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 40bdee2b09..5896a1db7d 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -3156,13 +3156,11 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
 
             if (useDrawFix)
             {
-                dc.SetPen(*wxTRANSPARENT_PEN);
-                dc.SetBrush(wxBrush(GetBackgroundColour()));
+                wxDCPenChanger changePen(dc, *wxTRANSPARENT_PEN);
+                wxDCBrushChanger changeBrush(dc, GetBackgroundColour());
+
                 dc.DrawRectangle(0, topItemRect.GetY() - gap,
                                  clientSize.GetWidth(), gap);
-
-                dc.SetPen(pen);
-                dc.SetBrush(*wxTRANSPARENT_BRUSH);
             }
 
             const int numCols = GetColumnCount();

From b573315e7fbadd16c4eae3e98cd0bb448688c554 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 09:41:26 -0800
Subject: [PATCH 024/916] Add wx_is_at_least_gtk3() helper

---
 include/wx/gtk/private/gtk3-compat.h | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/wx/gtk/private/gtk3-compat.h b/include/wx/gtk/private/gtk3-compat.h
index 19e9626b15..56e889ed26 100644
--- a/include/wx/gtk/private/gtk3-compat.h
+++ b/include/wx/gtk/private/gtk3-compat.h
@@ -23,8 +23,6 @@ static inline gboolean wx_gtk_text_iter_starts_tag(const GtkTextIter* iter, GtkT
 }
 #define gtk_text_iter_starts_tag wx_gtk_text_iter_starts_tag
 
-#endif // !__WXGTK4__
-
 #ifdef __WXGTK3__
 
 // ----------------------------------------------------------------------------
@@ -43,7 +41,24 @@ static inline void wx_gtk_widget_set_margin_end(GtkWidget* widget, gint margin)
 #define gtk_widget_set_margin_end wx_gtk_widget_set_margin_end
 
 #endif // __WXGTK3__
+#endif // !__WXGTK4__
 
 wxGCC_WARNING_RESTORE()
 
+#if defined(__WXGTK4__) || !defined(__WXGTK3__)
+static inline bool wx_is_at_least_gtk3(int /* minor */)
+{
+#ifdef __WXGTK4__
+    return true;
+#else
+    return false;
+#endif
+}
+#else
+static inline bool wx_is_at_least_gtk3(int minor)
+{
+    return gtk_check_version(3, minor, 0) == NULL;
+}
+#endif
+
 #endif // _WX_GTK_PRIVATE_COMPAT3_H_

From 35f6a7c1d888a85d3c5ee9b4ef4a752c437804d4 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 09:52:56 -0800
Subject: [PATCH 025/916] Avoid deprecated GtkArrow with GTK+ >= 3.14

---
 src/gtk/toolbar.cpp | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp
index f432879948..e7ead42550 100644
--- a/src/gtk/toolbar.cpp
+++ b/src/gtk/toolbar.cpp
@@ -17,6 +17,7 @@
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/gtk3-compat.h"
 
 // ----------------------------------------------------------------------------
 // globals
@@ -277,14 +278,28 @@ void wxToolBarTool::CreateDropDown()
 {
     gtk_tool_item_set_homogeneous(m_item, false);
     GtkOrientation orient = GTK_ORIENTATION_HORIZONTAL;
-    GtkArrowType arrowType = GTK_ARROW_DOWN;
     if (GetToolBar()->HasFlag(wxTB_LEFT | wxTB_RIGHT))
-    {
         orient = GTK_ORIENTATION_VERTICAL;
-        arrowType = GTK_ARROW_RIGHT;
-    }
     GtkWidget* box = gtk_box_new(orient, 0);
-    GtkWidget* arrow = gtk_arrow_new(arrowType, GTK_SHADOW_NONE);
+    GtkWidget* arrow;
+    if (wx_is_at_least_gtk3(14))
+    {
+        const char* icon = "pan-down-symbolic";
+        if (orient == GTK_ORIENTATION_VERTICAL)
+            icon = "pan-end-symbolic";
+        arrow = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON);
+    }
+#ifndef __WXGTK4__
+    else
+    {
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+        GtkArrowType arrowType = GTK_ARROW_DOWN;
+        if (orient == GTK_ORIENTATION_VERTICAL)
+            arrowType = GTK_ARROW_RIGHT;
+        arrow = gtk_arrow_new(arrowType, GTK_SHADOW_NONE);
+        wxGCC_WARNING_RESTORE()
+    }
+#endif
     GtkWidget* tool_button = gtk_bin_get_child(GTK_BIN(m_item));
     g_object_ref(tool_button);
     gtk_container_remove(GTK_CONTAINER(m_item), tool_button);

From 96befc88c0e1dca9b37a049b619c89a6b9e1d951 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 09:56:23 -0800
Subject: [PATCH 026/916] Avoid gtk_tree_view_set_rules_hint() with GTK+4

---
 src/gtk/assertdlg_gtk.cpp | 2 ++
 src/gtk/dataview.cpp      | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp
index ffe6a1353c..3efdc27b13 100644
--- a/src/gtk/assertdlg_gtk.cpp
+++ b/src/gtk/assertdlg_gtk.cpp
@@ -118,7 +118,9 @@ GtkWidget *gtk_assert_dialog_create_backtrace_list_model ()
     treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store));
     g_object_unref (store);
 #ifndef __WXGTK4__
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
+    wxGCC_WARNING_RESTORE()
 #endif
 
     /* append columns */
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index ce16351a86..3683bd3e0e 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -4627,8 +4627,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
             gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid );
     }
 #endif
-
+#ifndef __WXGTK4__
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_ROW_LINES) != 0 );
+    wxGCC_WARNING_RESTORE()
+#endif
 
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget),
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);

From ecda9c2016701932d3e20daf360b5750d27ca426 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 10:12:04 -0800
Subject: [PATCH 027/916] Avoid GtkAlignment with GTK+4

---
 src/gtk/button.cpp   | 23 +++++++++++++++++++++++
 src/gtk/checkbox.cpp |  6 ++++++
 src/gtk/filectrl.cpp |  6 ++----
 src/gtk/mdi.cpp      |  6 ++++++
 src/gtk/stattext.cpp |  6 ++++++
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index ca6fe2fc15..6121109932 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -119,7 +119,17 @@ bool wxButton::Create(wxWindow *parent,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
+#ifdef __WXGTK4__
+    if (useLabel)
+    {
+        g_object_set(gtk_bin_get_child(GTK_BIN(m_widget)),
+            "xalign", x_alignment, "yalign", y_alignment, NULL);
+    }
+#else
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
+    wxGCC_WARNING_RESTORE()
+#endif
 
     if ( useLabel )
         SetLabel(label);
@@ -259,6 +269,13 @@ bool wxButton::DoSetLabelMarkup(const wxString& markup)
 GtkLabel *wxButton::GTKGetLabel() const
 {
     GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));
+#ifdef __WXGTK4__
+    if (GTK_IS_LABEL(child))
+        return GTK_LABEL(child);
+
+    return NULL;
+#else
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     if ( GTK_IS_ALIGNMENT(child) )
     {
         GtkWidget* box = gtk_bin_get_child(GTK_BIN(child));
@@ -274,6 +291,8 @@ GtkLabel *wxButton::GTKGetLabel() const
     }
 
     return GTK_LABEL(child);
+    wxGCC_WARNING_RESTORE()
+#endif
 }
 #endif // wxUSE_MARKUP
 
@@ -283,6 +302,8 @@ void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
     GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));
     GTKApplyStyle(child, style);
 
+#ifndef __WXGTK4__
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     // for buttons with images, the path to the label is (at least in 2.12)
     // GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel
     if ( GTK_IS_ALIGNMENT(child) )
@@ -297,6 +318,8 @@ void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)
             }
         }
     }
+    wxGCC_WARNING_RESTORE()
+#endif
 }
 
 wxSize wxButton::DoGetBestSize() const
diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 997f81fb55..72beb09210 100644
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -123,7 +123,13 @@ bool wxCheckBox::Create(wxWindow *parent,
         m_widgetCheckbox = gtk_check_button_new();
 
         m_widgetLabel = gtk_label_new("");
+#ifdef __WXGTK4__
+        g_object_set(m_widgetLabel, "xalign", 0.0f, NULL);
+#else
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
+        wxGCC_WARNING_RESTORE()
+#endif
 
         m_widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
         gtk_box_pack_start(GTK_BOX(m_widget), m_widgetLabel, FALSE, FALSE, 3);
diff --git a/src/gtk/filectrl.cpp b/src/gtk/filectrl.cpp
index 0ab9103b48..a50a83b27d 100644
--- a/src/gtk/filectrl.cpp
+++ b/src/gtk/filectrl.cpp
@@ -339,11 +339,9 @@ bool wxGtkFileCtrl::Create( wxWindow *parent,
     if ( style & wxFC_SAVE )
         gtkAction = GTK_FILE_CHOOSER_ACTION_SAVE;
 
-    m_widget =  gtk_alignment_new ( 0, 0, 1, 1 );
-    g_object_ref(m_widget);
     m_fcWidget = GTK_FILE_CHOOSER( gtk_file_chooser_widget_new(gtkAction) );
-    gtk_widget_show ( GTK_WIDGET( m_fcWidget ) );
-    gtk_container_add ( GTK_CONTAINER ( m_widget ), GTK_WIDGET( m_fcWidget ) );
+    m_widget = GTK_WIDGET(m_fcWidget);
+    g_object_ref(m_widget);
 
     m_focusWidget = GTK_WIDGET( m_fcWidget );
 
diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 4437030362..dd86d5c83e 100644
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -422,7 +422,13 @@ void wxMDIClientWindow::AddChildGTK(wxWindowGTK* child)
         s = _("MDI child");
 
     GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
+#ifdef __WXGTK4__
+    g_object_set(label_widget, "xalign", 0.0f, NULL);
+#else
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
+    wxGCC_WARNING_RESTORE()
+#endif
 
     GtkNotebook* notebook = GTK_NOTEBOOK(m_widget);
 
diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index b84ddd9073..9c1031f9fb 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -108,7 +108,13 @@ bool wxStaticText::Create(wxWindow *parent,
 
     // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
+#ifdef __WXGTK4__
+    g_object_set(m_widget, "xalign", labelAlignments[justify], NULL);
+#else
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
+    wxGCC_WARNING_RESTORE()
+#endif
 
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
 

From 97ee4582a45ea894060db784a11f2678ad957289 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 10:38:38 -0800
Subject: [PATCH 028/916] Avoid GtkHandleBox, GtkTearoffMenuItem,
 GtkImageMenuItem with GTK+4

---
 src/gtk/menu.cpp | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 763cadee7e..1b84b76807 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -120,6 +120,7 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
 
     m_menubar = gtk_menu_bar_new();
 
+#ifndef __WXGTK4__
     if ((style & wxMB_DOCKABLE)
 #ifdef __WXGTK3__
         // using GtkHandleBox prevents menubar from drawing with GTK+ >= 3.19.7
@@ -127,11 +128,14 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
 #endif
         )
     {
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
         m_widget = gtk_handle_box_new();
+        wxGCC_WARNING_RESTORE()
         gtk_container_add(GTK_CONTAINER(m_widget), m_menubar);
         gtk_widget_show(m_menubar);
     }
     else
+#endif
     {
         m_widget = m_menubar;
     }
@@ -773,15 +777,19 @@ void wxMenu::Init()
 
     m_owner = NULL;
 
+#ifndef __WXGTK4__
     // Tearoffs are entries, just like separators. So if we want this
     // menu to be a tear-off one, we just append a tearoff entry
     // immediately.
     if ( m_style & wxMENU_TEAROFF )
     {
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
         GtkWidget *tearoff = gtk_tearoff_menu_item_new();
+        wxGCC_WARNING_RESTORE()
 
         gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff);
     }
+#endif
 
     // append the title as the very first entry if we have it
     if ( !m_title.empty() )
@@ -894,6 +902,12 @@ void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
             wxFAIL_MSG("unexpected menu item kind");
             // fall through
         case wxITEM_NORMAL:
+#ifdef __WXGTK4__
+            //TODO GtkImageMenuItem is gone, have to implement it ourselves with
+            //   GtkMenuItem GtkBox GtkAccelLabel GtkImage
+            menuItem = gtk_menu_item_new_with_label("");
+#else
+            wxGCC_WARNING_SUPPRESS(deprecated-declarations)
             const wxBitmap& bitmap = mitem->GetBitmap();
             if (bitmap.IsOk())
             {
@@ -906,16 +920,16 @@ void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
             }
             else
             {
-#if !defined(__WXGTK3__) || !GTK_CHECK_VERSION(3,10,0)
                 const char* stockid = wxGetStockGtkID(mitem->GetId());
                 if (stockid)
                     // use stock bitmap for this item if available on the assumption
                     // that it never hurts to follow GTK+ conventions more closely
                     menuItem = gtk_image_menu_item_new_from_stock(stockid, NULL);
                 else
-#endif // GTK < 3.10
                     menuItem = gtk_menu_item_new_with_label("");
             }
+            wxGCC_WARNING_RESTORE()
+#endif
             break;
     }
     mitem->SetMenuItem(menuItem);
@@ -1279,9 +1293,10 @@ wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_m
     const wxString string = GetGtkHotKey(*item);
     if (!string.empty())
         gtk_accelerator_parse(wxGTK_CONV_SYS(string), accel_key, accel_mods);
-#if !defined(__WXGTK3__) || !GTK_CHECK_VERSION(3,10,0)
+#ifndef __WXGTK4__
     else
     {
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
         GtkStockItem stock_item;
         const char* stockid = wxGetStockGtkID(item->GetId());
         if (stockid && gtk_stock_lookup(stockid, &stock_item))
@@ -1289,13 +1304,14 @@ wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_m
             *accel_key = stock_item.keyval;
             *accel_mods = stock_item.modifier;
         }
+        wxGCC_WARNING_RESTORE()
     }
-#endif // GTK < 3.10
+#endif
 }
 #endif // wxUSE_ACCEL
 
-// Stock items are deprecated since GTK+ 3.10
-#if !defined(__WXGTK3__) || !GTK_CHECK_VERSION(3,10,0)
+#ifndef __WXGTK4__
+wxGCC_WARNING_SUPPRESS(deprecated-declarations)
 const char *wxGetStockGtkID(wxWindowID id)
 {
     #define STOCKITEM(wx,gtk)      \
@@ -1398,6 +1414,7 @@ const char *wxGetStockGtkID(wxWindowID id)
 
     return NULL;
 }
-#endif // GTK < 3.10
+wxGCC_WARNING_RESTORE()
+#endif // !__WXGTK4__
 
 #endif // wxUSE_MENUS

From 620b83109e26471f82728c62f75457c107749dad Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 10:40:34 -0800
Subject: [PATCH 029/916] Use gdk_seat_grab()/gdk_seat_ungrab() with GTK+4

---
 src/gtk/minifram.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 1ff1327c14..20735bc921 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -171,6 +171,11 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
 
     gdk_window_raise(gtk_widget_get_window(win->m_widget));
 
+#ifdef __WXGTK4__
+    gdk_seat_grab(
+        gdk_event_get_seat((GdkEvent*)gdk_event), gdk_event_get_window((GdkEvent*)gdk_event),
+        GDK_SEAT_CAPABILITY_POINTER, false, NULL, (GdkEvent*)gdk_event, NULL, 0);
+#else
     const GdkEventMask mask = GdkEventMask(
         GDK_BUTTON_PRESS_MASK |
         GDK_BUTTON_RELEASE_MASK |
@@ -179,12 +184,15 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w
         GDK_BUTTON_MOTION_MASK |
         GDK_BUTTON1_MOTION_MASK);
 #ifdef __WXGTK3__
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     gdk_device_grab(
         gdk_event->device, gdk_event->window, GDK_OWNERSHIP_NONE,
         false, mask, NULL, gdk_event->time);
+    wxGCC_WARNING_RESTORE()
 #else
     gdk_pointer_grab(gdk_event->window, false, mask, NULL, NULL, gdk_event->time);
 #endif
+#endif // !__WXGTK4__
 
     win->m_diffX = x;
     win->m_diffY = y;
@@ -216,8 +224,12 @@ gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event,
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;
 
-#ifdef __WXGTK3__
+#ifdef __WXGTK4__
+    gdk_seat_ungrab(gdk_event_get_seat((GdkEvent*)gdk_event));
+#elif defined(__WXGTK3__)
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     gdk_device_ungrab(gdk_event->device, gdk_event->time);
+    wxGCC_WARNING_RESTORE()
 #else
     gdk_pointer_ungrab(gdk_event->time);
 #endif

From 9d837f7556738ade8c0ea0aad696d0f37555a3ca Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 10:41:49 -0800
Subject: [PATCH 030/916] Avoid gdk_screen_get_width() with GTK+4

---
 src/gtk/textctrl.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 32e6ec5834..dd02a570ba 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -217,9 +217,19 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
         wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", &para_start, &para_end);
 
         // Convert indent from 1/10th of a mm into pixels
+#ifdef __WXGTK4__
+        GdkMonitor* monitor = gdk_display_get_monitor_at_window(
+            gtk_widget_get_display(text), gtk_widget_get_window(text));
+        GdkRectangle rect;
+        gdk_monitor_get_geometry(monitor, &rect);
+        float factor = float(rect.width) / gdk_monitor_get_width_mm(monitor);
+#else
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
         float factor =
             (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
                       gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
+        wxGCC_WARNING_RESTORE()
+#endif
 
         const int indent = (int)(factor * attr.GetLeftIndent());
         const int subIndent = (int)(factor * attr.GetLeftSubIndent());
@@ -274,10 +284,19 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
         if (!tag)
         {
             // Factor to convert from 1/10th of a mm into pixels
+#ifdef __WXGTK4__
+            GdkMonitor* monitor = gdk_display_get_monitor_at_window(
+                gtk_widget_get_display(text), gtk_widget_get_window(text));
+            GdkRectangle rect;
+            gdk_monitor_get_geometry(monitor, &rect);
+            float factor = float(rect.width) / gdk_monitor_get_width_mm(monitor);
+#else
+            wxGCC_WARNING_SUPPRESS(deprecated-declarations)
             float factor =
                 (float)gdk_screen_get_width(gtk_widget_get_screen(text)) /
                           gdk_screen_get_width_mm(gtk_widget_get_screen(text)) / 10;
-
+            wxGCC_WARNING_RESTORE()
+#endif
             PangoTabArray* tabArray = pango_tab_array_new(tabs.GetCount(), TRUE);
             for (size_t i = 0; i < tabs.GetCount(); i++)
                 pango_tab_array_set_tab(tabArray, i, PANGO_TAB_LEFT, (gint)(tabs[i] * factor));

From de273046a408ea25a82f5f6de2c62a2e02a15749 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 10:42:47 -0800
Subject: [PATCH 031/916] Avoid gtk_entry_{get,set}_inner_border() with GTK+4

---
 src/gtk/textentry.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 7725a45800..966d9b9153 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -521,7 +521,7 @@ bool wxTextEntry::GTKEntryOnInsertText(const char* text)
 
 bool wxTextEntry::DoSetMargins(const wxPoint& margins)
 {
-#if GTK_CHECK_VERSION(2,10,0)
+#if GTK_CHECK_VERSION(2,10,0) && !defined(__WXGTK4__)
     GtkEntry* entry = GetEntry();
 
     if ( !entry )
@@ -529,6 +529,7 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
     if ( !wx_is_at_least_gtk2(10) )
         return false;
 
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     const GtkBorder* oldBorder = gtk_entry_get_inner_border(entry);
     GtkBorder newBorder;
 
@@ -553,6 +554,7 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
         newBorder.top = margins.y;
 
     gtk_entry_set_inner_border(entry, &newBorder);
+    wxGCC_WARNING_RESTORE()
 
     return true;
 #else
@@ -564,13 +566,15 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
 wxPoint wxTextEntry::DoGetMargins() const
 {
     wxPoint point(-1, -1);
-#if GTK_CHECK_VERSION(2,10,0)
+#if GTK_CHECK_VERSION(2,10,0) && !defined(__WXGTK4__)
     GtkEntry* entry = GetEntry();
     if (entry)
     {
         if (wx_is_at_least_gtk2(10))
         {
+            wxGCC_WARNING_SUPPRESS(deprecated-declarations)
             const GtkBorder* border = gtk_entry_get_inner_border(entry);
+            wxGCC_WARNING_RESTORE()
             if (border)
             {
                 point.x = border->left;

From 54bcf1b9b6d1490b7d2050d86b259d0e76700b25 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 10:46:37 -0800
Subject: [PATCH 032/916] Avoid gtk_widget_get_pointer() with GTK+4

---
 src/gtk/dataview.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 3683bd3e0e..6e102ae7c4 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -3631,14 +3631,19 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag
     delete m_dragDataObject;
     m_dragDataObject = NULL;
 
+#ifdef __WXGTK4__
+    return false;
+#else
     wxDataViewCtrl* const dvc = GetOwner();
     wxDataViewItem item(dvc->GTKPathToItem(path));
     if ( !item )
         return FALSE;
 
     wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, dvc, item);
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     gint x, y;
     gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y);
+    wxGCC_WARNING_RESTORE()
     event.SetPosition(x, y);
     if (!m_owner->HandleWindowEvent( event ))
         return FALSE;
@@ -3653,6 +3658,7 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag
     m_dragDataObject = obj;
 
     return TRUE;
+#endif
 }
 
 gboolean

From a3518a550f2ee6bba6d56d949b1139f4ffe72234 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 20:47:10 -0800
Subject: [PATCH 033/916] Use GtkGrid instead of GtkTable with GTK+3

GtkTable was deprecated in GTK+ 3.4
---
 src/gtk/radiobox.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 96ac8cc740..4a47baaa5b 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -236,11 +236,17 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     GtkRadioButton *rbtn = NULL;
 
+#ifdef __WXGTK3__
+    GtkWidget* grid = gtk_grid_new();
+    gtk_widget_show(grid);
+    gtk_container_add(GTK_CONTAINER(m_widget), grid);
+#else
     GtkWidget *table = gtk_table_new( num_of_rows, num_of_cols, FALSE );
     gtk_table_set_col_spacings( GTK_TABLE(table), 1 );
     gtk_table_set_row_spacings( GTK_TABLE(table), 1 );
     gtk_widget_show( table );
     gtk_container_add( GTK_CONTAINER(m_widget), table );
+#endif
 
     GSList *radio_button_group = NULL;
     for (unsigned int i = 0; i < (unsigned int)n; i++)
@@ -301,6 +307,20 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
         m_buttonsInfo.Append( new wxGTKRadioButtonInfo( rbtn, wxRect() ) );
 
+#ifdef __WXGTK3__
+        int left, top;
+        if (HasFlag(wxRA_SPECIFY_COLS))
+        {
+            left = i % num_of_cols;
+            top = i / num_of_cols;
+        }
+        else
+        {
+            left = i / num_of_rows;
+            top = i % num_of_rows;
+        }
+        gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(rbtn), left, top, 1, 1);
+#else
         if (HasFlag(wxRA_SPECIFY_COLS))
         {
             int left = i%num_of_cols;
@@ -319,6 +339,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
             gtk_table_attach( GTK_TABLE(table), GTK_WIDGET(rbtn), left, right, top, bottom,
                   GTK_FILL, GTK_FILL, 1, 1 );
         }
+#endif
 
         ConnectWidget( GTK_WIDGET(rbtn) );
 

From 72fe3a1d0708550d63e22f14a48d562ebe444617 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 21:40:38 -0800
Subject: [PATCH 034/916] Avoid gdk_window_set_composited() with GTK+4

---
 src/gtk/window.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 93a209b5d2..4c7426756b 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -53,8 +53,12 @@ using namespace wxGTKImpl;
 typedef guint KeySym;
 #endif
 
+#ifdef __WXGTK4__
+#define wxGTK_HAS_COMPOSITING_SUPPORT 0
+#else
 // gdk_window_set_composited() is only supported since 2.12
 #define wxGTK_HAS_COMPOSITING_SUPPORT (GTK_CHECK_VERSION(2,12,0) && wxUSE_CAIRO)
+#endif
 
 #ifndef PANGO_VERSION_CHECK
     #define PANGO_VERSION_CHECK(a,b,c) 0
@@ -2310,8 +2314,10 @@ void wxWindowGTK::GTKHandleRealized()
 #if wxGTK_HAS_COMPOSITING_SUPPORT
         if (IsTransparentBackgroundSupported())
         {
+            wxGCC_WARNING_SUPPRESS(deprecated-declarations)
             if (window)
                 gdk_window_set_composited(window, true);
+            wxGCC_WARNING_RESTORE()
         }
         else
 #endif // wxGTK_HAS_COMPOSITING_SUPPORT

From 1235c7bb74bc932db210aa81e98b440f5fe10285 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 21:43:16 -0800
Subject: [PATCH 035/916] Avoid gtk_widget_is_composited() with GTK+4

---
 src/gtk/toplevel.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index f300b5ea56..3be043c44e 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -1641,16 +1641,22 @@ bool wxTopLevelWindowGTK::CanSetTransparent()
         return wxSystemOptions::GetOptionInt(SYSOPT_TRANSPARENT) != 0;
     }
 
+#ifdef __WXGTK4__
+    return gdk_display_is_composited(gtk_widget_get_display(m_widget)) != 0;
+#else
 #if GTK_CHECK_VERSION(2,10,0)
     if (wx_is_at_least_gtk2(10))
     {
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
         return gtk_widget_is_composited(m_widget) != 0;
+        wxGCC_WARNING_RESTORE()
     }
     else
 #endif // In case of lower versions than gtk+-2.10.0 we could look for _NET_WM_CM_Sn ourselves
     {
         return false;
     }
+#endif
 
 #if 0 // Don't be optimistic here for the sake of wxAUI
     int opcode, event, error;

From 9249e823d91b201cccc2d58bce82f358bd228b9c Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 21:48:34 -0800
Subject: [PATCH 036/916] Avoid gtk_window_set_opacity() with GTK+4

---
 src/gtk/toplevel.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 3be043c44e..f63fdd3e46 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -41,6 +41,7 @@
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/gtk3-compat.h"
 #include "wx/gtk/private/win_gtk.h"
 
 // ----------------------------------------------------------------------------
@@ -1587,14 +1588,18 @@ bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha)
 
 #ifdef __WXGTK3__
 #if GTK_CHECK_VERSION(3,8,0)
-    if(gtk_check_version(3,8,0) == NULL)
+    if (wx_is_at_least_gtk3(8))
     {
         gtk_widget_set_opacity(m_widget, alpha / 255.0);
     }
     else
 #endif // GTK+ 3.8+
     {
+#ifndef __WXGTK4__
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
         gtk_window_set_opacity(GTK_WINDOW(m_widget), alpha / 255.0);
+        wxGCC_WARNING_RESTORE()
+#endif
     }
 
     return true;

From c23cac4c7917e629df2146358d1d3a8408f229ed Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 19 Dec 2017 21:49:13 -0800
Subject: [PATCH 037/916] Avoid GtkAlignment with GTK+4

---
 src/gtk/tglbtn.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index b4d90adb5f..0778546883 100644
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -216,6 +216,8 @@ void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
     GtkWidget* child = gtk_bin_get_child(GTK_BIN(m_widget));
     GTKApplyStyle(child, style);
 
+#ifndef __WXGTK4__
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     // for buttons with images, the path to the label is (at least in 2.12)
     // GtkButton -> GtkAlignment -> GtkHBox -> GtkLabel
     if ( GTK_IS_ALIGNMENT(child) )
@@ -230,6 +232,8 @@ void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)
             }
         }
     }
+    wxGCC_WARNING_RESTORE()
+#endif
 }
 
 // Get the "best" size for this control.

From 121ac8742dc615d068edfad83b24a0bcffe46d0a Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 20 Dec 2017 22:29:21 -0800
Subject: [PATCH 038/916] Fix wxStaticBox non-default background with GTK+2

See #15466
---
 src/gtk/statbox.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index cfbd915fd3..71ec2c0dde 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -44,6 +44,14 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc, void*)
         gtk_widget_size_allocate(label_widget, &a);
     }
 }
+
+static gboolean expose_event(GtkWidget* widget, GdkEventExpose*, wxWindow*)
+{
+    const GtkAllocation& a = widget->allocation;
+    gtk_paint_flat_box(gtk_widget_get_style(widget), gtk_widget_get_window(widget),
+        GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, "", a.x, a.y, a.width, a.height);
+    return false;
+}
 }
 #endif
 
@@ -137,6 +145,14 @@ void wxStaticBox::SetLabel( const wxString& label )
 void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
+    if (m_wxwindow)
+        GTKApplyStyle(m_wxwindow, style);
+
+#ifndef __WXGTK3__
+    g_signal_handlers_disconnect_by_func(m_widget, (void*)expose_event, this);
+    if (m_backgroundColour.IsOk())
+        g_signal_connect(m_widget, "expose-event", G_CALLBACK(expose_event), this);
+#endif
 }
 
 bool wxStaticBox::GTKWidgetNeedsMnemonic() const

From c867e0a23bb0222ee84c55be4901d9c310fef525 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 20 Dec 2017 22:33:07 -0800
Subject: [PATCH 039/916] Fix wxRadioBox non-default background with GTK+2

---
 src/gtk/radiobox.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 4a47baaa5b..a92985a16a 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -183,6 +183,17 @@ static void gtk_radiobutton_size_allocate( GtkWidget *widget,
 }
 }
 
+#ifndef __WXGTK3__
+extern "C" {
+static gboolean expose_event(GtkWidget* widget, GdkEventExpose*, wxWindow*)
+{
+    const GtkAllocation& a = widget->allocation;
+    gtk_paint_flat_box(gtk_widget_get_style(widget), gtk_widget_get_window(widget),
+        GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, "", a.x, a.y, a.width, a.height);
+    return false;
+}
+}
+#endif
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
@@ -605,6 +616,12 @@ void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
 
         node = node->GetNext();
     }
+
+#ifndef __WXGTK3__
+    g_signal_handlers_disconnect_by_func(m_widget, (void*)expose_event, this);
+    if (m_backgroundColour.IsOk())
+        g_signal_connect(m_widget, "expose-event", G_CALLBACK(expose_event), this);
+#endif
 }
 
 bool wxRadioBox::GTKWidgetNeedsMnemonic() const

From be35405129932325a506bc27064bff2dcb76a4ad Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 21 Dec 2017 10:06:10 -0800
Subject: [PATCH 040/916] Apply current style to wxStaticBox container when
 it's created

Background may have been set before adding any children
See #15466
---
 src/gtk/statbox.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 71ec2c0dde..797d80caf8 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -130,6 +130,7 @@ void wxStaticBox::AddChild( wxWindowBase *child )
         m_wxwindow = wxPizza::New();
         gtk_widget_show( m_wxwindow );
         gtk_container_add( GTK_CONTAINER (m_widget), m_wxwindow );
+        GTKApplyWidgetStyle();
     }
 
     wxStaticBoxBase::AddChild(child);

From 4f7fb24ef44dfff5f062fa3dee3bfc4c4cbf1771 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sun, 24 Dec 2017 00:22:15 +0100
Subject: [PATCH 041/916] Use composite template to create GtkAssertDialog as a
 composite children

GtkAssertDialog UI is now defined with GtkBuilder XML because
gtk_widget_push_composite_child() and gtk_widget_pop_composite_child() are
deprecated since 3.10 and composite widget templates should be used
to make composite children.
---
 src/gtk/assertdlg_gtk.cpp | 636 +++++++++++++++++++++++++++++++-------
 1 file changed, 516 insertions(+), 120 deletions(-)

diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp
index 3efdc27b13..12cc36109f 100644
--- a/src/gtk/assertdlg_gtk.cpp
+++ b/src/gtk/assertdlg_gtk.cpp
@@ -37,13 +37,10 @@
    GtkAssertDialog helpers
  ---------------------------------------------------------------------------- */
 
+// This function is called only for GTK+ < 3.10
 static
 GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
-#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
-                                            const gchar *icon)
-#else
                                             const gchar *stock)
-#endif // GTK >= 3.10 / < 3.10
 {
     /* create the button */
     GtkWidget *button = gtk_button_new_with_mnemonic (label);
@@ -51,13 +48,11 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
 
     /* add a stock icon inside it */
 #ifdef __WXGTK4__
-    gtk_button_set_icon_name (GTK_BUTTON (button), icon);
+    gtk_button_set_icon_name (GTK_BUTTON (button), stock);
 #else
-  #if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
-    GtkWidget *image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_BUTTON);
-  #else
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
     GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
-  #endif // GTK >= 3.10 / < 3.10
+    wxGCC_WARNING_RESTORE()
     gtk_button_set_image (GTK_BUTTON (button), image);
 #endif
 
@@ -72,6 +67,7 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
     return button;
 }
 
+// This function is called only for GTK+ < 3.10
 static
 GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *label,
                                          const gchar *stock, gint response_id)
@@ -87,6 +83,7 @@ GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *labe
 
 #if wxUSE_STACKWALKER
 
+// This function is called only for GTK+ < 3.10
 static
 void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *name, int index)
 {
@@ -101,6 +98,7 @@ void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *nam
     gtk_tree_view_column_set_reorderable (column, TRUE);
 }
 
+// This function is called only for GTK+ < 3.10
 static
 GtkWidget *gtk_assert_dialog_create_backtrace_list_model ()
 {
@@ -256,6 +254,9 @@ static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg
  ---------------------------------------------------------------------------- */
 
 extern "C" {
+#if GTK_CHECK_VERSION(3,10,0)
+static void gtk_assert_dialog_class_init(gpointer g_class, void*);
+#endif // GTK+ >= 3.10
 static void gtk_assert_dialog_init(GTypeInstance* instance, void*);
 }
 
@@ -270,7 +271,11 @@ GType gtk_assert_dialog_get_type()
             sizeof (GtkAssertDialogClass),
             NULL,           /* base_init */
             NULL,           /* base_finalize */
+#if GTK_CHECK_VERSION(3,10,0)
+            gtk_assert_dialog_class_init,  /* class init */
+#else
             NULL,
+#endif // GTK+ >= 3.10 / < 3.10
             NULL,           /* class_finalize */
             NULL,           /* class_data */
             sizeof (GtkAssertDialog),
@@ -285,139 +290,530 @@ GType gtk_assert_dialog_get_type()
 }
 
 extern "C" {
+// For GTK+ >= 3.10, Composite Widget Templates are used to define composite widgets.
+#if GTK_CHECK_VERSION(3,10,0)
+static void gtk_assert_dialog_class_init(gpointer g_class, void*)
+{
+    if (gtk_check_version(3,10,0) == NULL)
+    {
+        // GtkBuilder XML to be bound to the dialog class data
+        static const char dlgTempl[] =
+            "<interface>"
+              "<object class='GtkListStore' id='backtrace_list_store'>"
+                "<columns>"
+                  "<!-- column-name column_index -->"
+                  "<column type='gint'/>"
+                  "<!-- column-name column_func_prototype -->"
+                  "<column type='gchararray'/>"
+                  "<!-- column-name column_src_file -->"
+                  "<column type='gchararray'/>"
+                  "<!-- column-name column_line_no -->"
+                  "<column type='gchararray'/>"
+                "</columns>"
+              "</object>"
+              "<object class='GtkImage' id='imageBtnContinue'>"
+                "<property name='visible'>True</property>"
+                "<property name='can_focus'>False</property>"
+                "<property name='icon_name'>go-next</property>"
+              "</object>"
+              "<object class='GtkImage' id='imageBtnCopy'>"
+                "<property name='visible'>True</property>"
+                "<property name='can_focus'>False</property>"
+                "<property name='icon_name'>edit-copy</property>"
+              "</object>"
+              "<object class='GtkImage' id='imageBtnSave'>"
+                "<property name='visible'>True</property>"
+                "<property name='can_focus'>False</property>"
+                "<property name='icon_name'>document-save</property>"
+              "</object>"
+              "<object class='GtkImage' id='imageBtnStop'>"
+                "<property name='visible'>True</property>"
+                "<property name='can_focus'>False</property>"
+                "<property name='icon_name'>application-exit</property>"
+              "</object>"
+              "<template class='GtkAssertDialog' parent='GtkDialog'>"
+                "<property name='can_focus'>False</property>"
+                "<property name='resizable'>False</property>"
+                "<property name='type_hint'>dialog</property>"
+                "<child internal-child='vbox'>"
+                  "<object class='GtkBox' id='dialog_vbox'>"
+                    "<property name='can_focus'>False</property>"
+                    "<property name='orientation'>vertical</property>"
+                    "<property name='spacing'>2</property>"
+                    "<child internal-child='action_area'>"
+                      "<object class='GtkButtonBox' id='dialog_buttons'>"
+                        "<property name='can_focus'>False</property>"
+                        "<property name='layout_style'>end</property>"
+                        "<child>"
+                          "<object class='GtkCheckButton' id='shownexttime'>"
+                            "<property name='label' translatable='yes'>Show this _dialog the next time</property>"
+                            "<property name='visible'>True</property>"
+                            "<property name='can_focus'>True</property>"
+                            "<property name='receives_default'>False</property>"
+                            "<property name='use_underline'>True</property>"
+                            "<property name='xalign'>0.5</property>"
+                            "<property name='active'>True</property>"
+                            "<property name='draw_indicator'>True</property>"
+                          "</object>"
+                          "<packing>"
+                            "<property name='expand'>True</property>"
+                            "<property name='fill'>False</property>"
+                            "<property name='padding'>8</property>"
+                            "<property name='pack_type'>end</property>"
+                            "<property name='position'>0</property>"
+                          "</packing>"
+                        "</child>"
+                        "<child>"
+                          "<object class='GtkButton' id='button_stop'>"
+                            "<property name='label' translatable='yes'>_Stop</property>"
+                            "<property name='visible'>True</property>"
+                            "<property name='can_focus'>True</property>"
+                            "<property name='receives_default'>True</property>"
+                            "<property name='image'>imageBtnStop</property>"
+                            "<property name='use_underline'>True</property>"
+                          "</object>"
+                          "<packing>"
+                            "<property name='expand'>True</property>"
+                            "<property name='fill'>True</property>"
+                            "<property name='position'>1</property>"
+                          "</packing>"
+                        "</child>"
+                        "<child>"
+                          "<object class='GtkButton' id='button_continue'>"
+                            "<property name='label' translatable='yes'>_Continue</property>"
+                            "<property name='visible'>True</property>"
+                            "<property name='can_focus'>True</property>"
+                            "<property name='can_default'>True</property>"
+                            "<property name='has_default'>True</property>"
+                            "<property name='receives_default'>True</property>"
+                            "<property name='image'>imageBtnContinue</property>"
+                            "<property name='use_underline'>True</property>"
+                            "<signal name='clicked' handler='gtk_assert_dialog_continue_callback' swapped='no'/>"
+                          "</object>"
+                          "<packing>"
+                            "<property name='expand'>True</property>"
+                            "<property name='fill'>True</property>"
+                            "<property name='position'>2</property>"
+                          "</packing>"
+                        "</child>"
+                      "</object>"
+                      "<packing>"
+                        "<property name='expand'>False</property>"
+                        "<property name='fill'>False</property>"
+                        "<property name='position'>0</property>"
+                      "</packing>"
+                    "</child>"
+                    "<child>"
+                      "<object class='GtkBox' id='vbox'>"
+                        "<property name='visible'>True</property>"
+                        "<property name='can_focus'>False</property>"
+                        "<property name='orientation'>vertical</property>"
+                        "<child>"
+                          "<object class='GtkBox' id='hbox'>"
+                            "<property name='visible'>True</property>"
+                            "<property name='can_focus'>False</property>"
+                            "<property name='border_width'>8</property>"
+                            "<child>"
+                              "<object class='GtkImage' id='image'>"
+                                "<property name='visible'>True</property>"
+                                "<property name='can_focus'>False</property>"
+                                "<property name='icon_name'>dialog-error</property>"
+                                "<property name='icon_size'>6</property>"
+                              "</object>"
+                              "<packing>"
+                                "<property name='expand'>False</property>"
+                                "<property name='fill'>False</property>"
+                                "<property name='padding'>12</property>"
+                                "<property name='position'>0</property>"
+                              "</packing>"
+                            "</child>"
+                            "<child>"
+                              "<object class='GtkBox' id='vbox2'>"
+                                "<property name='visible'>True</property>"
+                                "<property name='can_focus'>False</property>"
+                                "<property name='orientation'>vertical</property>"
+                                "<child>"
+                                  "<object class='GtkLabel' id='info'>"
+                                    "<property name='visible'>True</property>"
+                                    "<property name='can_focus'>False</property>"
+                                    "<property name='label' translatable='yes'>An assertion failed!</property>"
+                                  "</object>"
+                                  "<packing>"
+                                    "<property name='expand'>True</property>"
+                                    "<property name='fill'>True</property>"
+                                    "<property name='padding'>8</property>"
+                                    "<property name='position'>0</property>"
+                                  "</packing>"
+                                "</child>"
+                                "<child>"
+                                  "<object class='GtkLabel' id='message'>"
+                                    "<property name='width_request'>450</property>"
+                                    "<property name='visible'>True</property>"
+                                    "<property name='can_focus'>False</property>"
+                                    "<property name='wrap'>True</property>"
+                                    "<property name='selectable'>True</property>"
+                                  "</object>"
+                                  "<packing>"
+                                    "<property name='expand'>True</property>"
+                                    "<property name='fill'>True</property>"
+                                    "<property name='padding'>8</property>"
+                                    "<property name='pack_type'>end</property>"
+                                    "<property name='position'>1</property>"
+                                  "</packing>"
+                                "</child>"
+                              "</object>"
+                              "<packing>"
+                                "<property name='expand'>True</property>"
+                                "<property name='fill'>True</property>"
+                                "<property name='position'>1</property>"
+                              "</packing>"
+                            "</child>"
+                          "</object>"
+                          "<packing>"
+                            "<property name='expand'>False</property>"
+                            "<property name='fill'>False</property>"
+                            "<property name='position'>0</property>"
+                          "</packing>"
+                        "</child>"
+#if wxUSE_STACKWALKER // expander is needed only if backtrace is enabled
+                        "<child>"
+                          "<object class='GtkExpander' id='expander'>"
+                            "<property name='visible'>True</property>"
+                            "<property name='can_focus'>True</property>"
+                            "<signal name='activate' handler='gtk_assert_dialog_expander_callback' swapped='no'/>"
+                            "<child>"
+                              "<object class='GtkBox' id='vbox_exp'>"
+                                "<property name='visible'>True</property>"
+                                "<property name='can_focus'>False</property>"
+                                "<property name='orientation'>vertical</property>"
+                                "<child>"
+                                  "<object class='GtkScrolledWindow' id='sw'>"
+                                    "<property name='visible'>True</property>"
+                                    "<property name='can_focus'>True</property>"
+                                    "<property name='shadow_type'>etched-in</property>"
+                                    "<child>"
+                                      "<object class='GtkTreeView' id='treeview'>"
+                                        "<property name='height_request'>180</property>"
+                                        "<property name='visible'>True</property>"
+                                        "<property name='can_focus'>True</property>"
+                                        "<property name='model'>backtrace_list_store</property>"
+                                        "<child internal-child='selection'>"
+                                          "<object class='GtkTreeSelection' id='treeview-selection'/>"
+                                        "</child>"
+                                        "<child>"
+                                          "<object class='GtkTreeViewColumn' id='column_index'>"
+                                            "<property name='resizable'>True</property>"
+                                            "<property name='spacing'>4</property>"
+                                            "<property name='title' translatable='yes'>#</property>"
+                                            "<property name='reorderable'>True</property>"
+                                            "<child>"
+                                              "<object class='GtkCellRendererText' id='index_renderer'/>"
+                                              "<attributes>"
+                                                "<attribute name='text'>0</attribute>"
+                                              "</attributes>"
+                                            "</child>"
+                                          "</object>"
+                                        "</child>"
+                                        "<child>"
+                                          "<object class='GtkTreeViewColumn' id='column_func_prototype'>"
+                                            "<property name='resizable'>True</property>"
+                                            "<property name='spacing'>4</property>"
+                                            "<property name='title' translatable='yes'>Function Prototype</property>"
+                                            "<property name='reorderable'>True</property>"
+                                            "<child>"
+                                              "<object class='GtkCellRendererText' id='function_renderer'/>"
+                                              "<attributes>"
+                                                "<attribute name='text'>1</attribute>"
+                                              "</attributes>"
+                                            "</child>"
+                                          "</object>"
+                                        "</child>"
+                                        "<child>"
+                                          "<object class='GtkTreeViewColumn' id='column_src_file'>"
+                                            "<property name='resizable'>True</property>"
+                                            "<property name='spacing'>4</property>"
+                                            "<property name='title' translatable='yes'>Source file</property>"
+                                            "<property name='reorderable'>True</property>"
+                                            "<child>"
+                                              "<object class='GtkCellRendererText' id='src_file_renderer'/>"
+                                              "<attributes>"
+                                                "<attribute name='text'>2</attribute>"
+                                              "</attributes>"
+                                            "</child>"
+                                          "</object>"
+                                        "</child>"
+                                        "<child>"
+                                          "<object class='GtkTreeViewColumn' id='column_line_no'>"
+                                            "<property name='resizable'>True</property>"
+                                            "<property name='spacing'>4</property>"
+                                            "<property name='title' translatable='yes'>Line #</property>"
+                                            "<property name='reorderable'>True</property>"
+                                            "<child>"
+                                              "<object class='GtkCellRendererText' id='line_no_renderer'/>"
+                                              "<attributes>"
+                                                "<attribute name='text'>3</attribute>"
+                                              "</attributes>"
+                                            "</child>"
+                                          "</object>"
+                                        "</child>"
+                                      "</object>"
+                                    "</child>"
+                                  "</object>"
+                                  "<packing>"
+                                    "<property name='expand'>True</property>"
+                                    "<property name='fill'>True</property>"
+                                    "<property name='padding'>8</property>"
+                                    "<property name='position'>0</property>"
+                                  "</packing>"
+                                "</child>"
+                                "<child>"
+                                  "<object class='GtkButtonBox' id='buttonbox_exp'>"
+                                    "<property name='visible'>True</property>"
+                                    "<property name='can_focus'>False</property>"
+                                    "<property name='layout_style'>end</property>"
+                                    "<child>"
+                                      "<object class='GtkButton' id='button_save'>"
+                                        "<property name='label' translatable='yes'>Save to _file</property>"
+                                        "<property name='visible'>True</property>"
+                                        "<property name='can_focus'>True</property>"
+                                        "<property name='receives_default'>True</property>"
+                                        "<property name='image'>imageBtnSave</property>"
+                                        "<property name='use_underline'>True</property>"
+                                        "<signal name='clicked' handler='gtk_assert_dialog_save_backtrace_callback' swapped='no'/>"
+                                      "</object>"
+                                      "<packing>"
+                                        "<property name='expand'>True</property>"
+                                        "<property name='fill'>True</property>"
+                                        "<property name='position'>0</property>"
+                                      "</packing>"
+                                    "</child>"
+                                    "<child>"
+                                      "<object class='GtkButton' id='button_copy'>"
+                                        "<property name='label' translatable='yes'>Copy to clip_board</property>"
+                                        "<property name='visible'>True</property>"
+                                        "<property name='can_focus'>True</property>"
+                                        "<property name='receives_default'>True</property>"
+                                        "<property name='image'>imageBtnCopy</property>"
+                                        "<property name='use_underline'>True</property>"
+                                        "<signal name='clicked' handler='gtk_assert_dialog_copy_callback' swapped='no'/>"
+                                      "</object>"
+                                      "<packing>"
+                                        "<property name='expand'>True</property>"
+                                        "<property name='fill'>True</property>"
+                                        "<property name='position'>1</property>"
+                                      "</packing>"
+                                    "</child>"
+                                  "</object>"
+                                  "<packing>"
+                                    "<property name='expand'>False</property>"
+                                    "<property name='fill'>True</property>"
+                                    "<property name='pack_type'>end</property>"
+                                    "<property name='position'>1</property>"
+                                  "</packing>"
+                                "</child>"
+                              "</object>"
+                            "</child>"
+                            "<child type='label'>"
+                              "<object class='GtkLabel' id='label_exp'>"
+                                "<property name='visible'>True</property>"
+                                "<property name='can_focus'>False</property>"
+                                "<property name='label' translatable='yes'>Back_trace:</property>"
+                                "<property name='use_underline'>True</property>"
+                              "</object>"
+                            "</child>"
+                          "</object>"
+                          "<packing>"
+                            "<property name='expand'>True</property>"
+                            "<property name='fill'>True</property>"
+                            "<property name='position'>1</property>"
+                          "</packing>"
+                        "</child>"
+#endif // wxUSE_STACKWALKER
+                      "</object>"
+                      "<packing>"
+                        "<property name='expand'>True</property>"
+                        "<property name='fill'>True</property>"
+                        "<property name='padding'>5</property>"
+                        "<property name='position'>1</property>"
+                      "</packing>"
+                    "</child>"
+                  "</object>"
+                "</child>"
+                "<action-widgets>"
+                  "<action-widget response='0'>button_stop</action-widget>"
+                  "<action-widget response='1'>button_continue</action-widget>"
+                "</action-widgets>"
+              "</template>"
+            "</interface>";
+
+        // Verify numeric values of response codes hard-coded in the XML
+        wxASSERT(GTK_ASSERT_DIALOG_STOP == 0);
+        wxASSERT(GTK_ASSERT_DIALOG_CONTINUE == 1);
+
+        GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(g_class);
+
+        GBytes* templBytes = g_bytes_new_static(dlgTempl, sizeof(dlgTempl)-1);
+        gtk_widget_class_set_template(widgetClass, templBytes);
+
+        // Define the relationship of the entries in GtkAssertDialog and entries defined in the XML
+        gtk_widget_class_bind_template_child(widgetClass, GtkAssertDialog, message);
+#if wxUSE_STACKWALKER
+        gtk_widget_class_bind_template_child(widgetClass, GtkAssertDialog, expander);
+        gtk_widget_class_bind_template_child(widgetClass, GtkAssertDialog, treeview);
+#endif // wxUSE_STACKWALKER
+        gtk_widget_class_bind_template_child(widgetClass, GtkAssertDialog, shownexttime);
+
+        // Bind <signal> connections defined in the GtkBuilder XML
+        // with callbacks exposed by GtkAssertDialog.
+#if wxUSE_STACKWALKER
+        gtk_widget_class_bind_template_callback(widgetClass, gtk_assert_dialog_expander_callback);
+        gtk_widget_class_bind_template_callback(widgetClass, gtk_assert_dialog_save_backtrace_callback);
+        gtk_widget_class_bind_template_callback(widgetClass, gtk_assert_dialog_copy_callback);
+#endif // wxUSE_STACKWALKER
+        gtk_widget_class_bind_template_callback(widgetClass, gtk_assert_dialog_continue_callback);
+    }
+}
+#endif // GTK+ >= 3.10
+
 static void gtk_assert_dialog_init(GTypeInstance* instance, void*)
 {
-    GtkAssertDialog* dlg = GTK_ASSERT_DIALOG(instance);
-    GtkWidget *continuebtn;
-
+    // For GTK+ >= 3.10 create and initialize the dialog from the already assigned template
+    // or create the dialog "manually" otherwise.
+#if GTK_CHECK_VERSION(3,10,0)
+    if (gtk_check_version(3,10,0) == NULL)
     {
-        GtkWidget *vbox, *hbox, *image;
-
-        /* start the main vbox */
-        gtk_widget_push_composite_child ();
-        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
-        gtk_container_set_border_width (GTK_CONTAINER(vbox), 8);
-        gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), vbox, true, true, 5);
-
-
-        /* add the icon+message hbox */
-        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-        gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-        /* icon */
-#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
-        image = gtk_image_new_from_icon_name("dialog-error", GTK_ICON_SIZE_DIALOG);
-#else
-        image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
-#endif // GTK >= 3.10 / < 3.10
-        gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 12);
+        GtkAssertDialog* dlg = GTK_ASSERT_DIALOG(instance);
+        gtk_widget_init_template(GTK_WIDGET(dlg));
+        /* complete creation */
+        dlg->callback = NULL;
+        dlg->userdata = NULL;
+    }
+    else
+#endif // GTK+ >= 3.10
+    {
+        GtkAssertDialog* dlg = GTK_ASSERT_DIALOG(instance);
+        GtkWidget *continuebtn;
 
+        // This code is called only for GTK+ < 3.10
         {
-            GtkWidget *vbox2, *info;
+            GtkWidget *vbox, *hbox, *image;
 
-            /* message */
-            vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-            gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
-            info = gtk_label_new ("An assertion failed!");
-            gtk_box_pack_start (GTK_BOX(vbox2), info, TRUE, TRUE, 8);
+            /* start the main vbox */
+            wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+            gtk_widget_push_composite_child ();
+            wxGCC_WARNING_RESTORE()
+            vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
+            gtk_container_set_border_width (GTK_CONTAINER(vbox), 8);
+            gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), vbox, true, true, 5);
 
-            /* assert message */
-            dlg->message = gtk_label_new (NULL);
-            gtk_label_set_selectable (GTK_LABEL (dlg->message), TRUE);
-            gtk_label_set_line_wrap (GTK_LABEL (dlg->message), TRUE);
-            gtk_label_set_justify (GTK_LABEL (dlg->message), GTK_JUSTIFY_LEFT);
-            gtk_widget_set_size_request (GTK_WIDGET(dlg->message), 450, -1);
 
-            gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8);
+            /* add the icon+message hbox */
+            hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+            gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+            /* icon */
+            wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+            image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
+            wxGCC_WARNING_RESTORE()
+            gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 12);
+
+            {
+                GtkWidget *vbox2, *info;
+
+                /* message */
+                vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+                gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
+                info = gtk_label_new ("An assertion failed!");
+                gtk_box_pack_start (GTK_BOX(vbox2), info, TRUE, TRUE, 8);
+
+                /* assert message */
+                dlg->message = gtk_label_new (NULL);
+                gtk_label_set_selectable (GTK_LABEL (dlg->message), TRUE);
+                gtk_label_set_line_wrap (GTK_LABEL (dlg->message), TRUE);
+                gtk_label_set_justify (GTK_LABEL (dlg->message), GTK_JUSTIFY_LEFT);
+                gtk_widget_set_size_request (GTK_WIDGET(dlg->message), 450, -1);
+
+                gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8);
+            }
+
+#if wxUSE_STACKWALKER
+            /* add the expander */
+            dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:");
+            gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0);
+            g_signal_connect (dlg->expander, "activate",
+                                G_CALLBACK(gtk_assert_dialog_expander_callback), dlg);
+#endif // wxUSE_STACKWALKER
         }
-
 #if wxUSE_STACKWALKER
-        /* add the expander */
-        dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:");
-        gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0);
-        g_signal_connect (dlg->expander, "activate",
-                            G_CALLBACK(gtk_assert_dialog_expander_callback), dlg);
-#endif // wxUSE_STACKWALKER
-    }
-#if wxUSE_STACKWALKER
-    {
-        GtkWidget *hbox, *vbox, *button, *sw;
+        {
+            GtkWidget *hbox, *vbox, *button, *sw;
 
-        /* create expander's vbox */
-        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-        gtk_container_add (GTK_CONTAINER (dlg->expander), vbox);
+            /* create expander's vbox */
+            vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+            gtk_container_add (GTK_CONTAINER (dlg->expander), vbox);
 
-        /* add a scrollable window under the expander */
-        sw = gtk_scrolled_window_new (NULL, NULL);
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN);
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC,
-                                        GTK_POLICY_AUTOMATIC);
-        gtk_box_pack_start (GTK_BOX(vbox), sw, TRUE, TRUE, 8);
+            /* add a scrollable window under the expander */
+            sw = gtk_scrolled_window_new (NULL, NULL);
+            gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN);
+            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC,
+                                            GTK_POLICY_AUTOMATIC);
+            gtk_box_pack_start (GTK_BOX(vbox), sw, TRUE, TRUE, 8);
 
-        /* add the treeview to the scrollable window */
-        dlg->treeview = gtk_assert_dialog_create_backtrace_list_model ();
-        gtk_widget_set_size_request (GTK_WIDGET(dlg->treeview), -1, 180);
-        gtk_container_add (GTK_CONTAINER (sw), dlg->treeview);
+            /* add the treeview to the scrollable window */
+            dlg->treeview = gtk_assert_dialog_create_backtrace_list_model ();
+            gtk_widget_set_size_request (GTK_WIDGET(dlg->treeview), -1, 180);
+            gtk_container_add (GTK_CONTAINER (sw), dlg->treeview);
 
-        /* create button's hbox */
-        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-        gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-        gtk_button_box_set_layout (GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
+            /* create button's hbox */
+            hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+            gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+            gtk_button_box_set_layout (GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
 
-        /* add the buttons */
-        button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Save to _file",
-#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
-                                                "document-save");
-#else
-                                                GTK_STOCK_SAVE);
-#endif // GTK >= 3.10 / < 3.10
-        g_signal_connect (button, "clicked",
-                            G_CALLBACK(gtk_assert_dialog_save_backtrace_callback), dlg);
+            /* add the buttons */
+            wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+            button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Save to _file", GTK_STOCK_SAVE);
+            wxGCC_WARNING_RESTORE()
+            g_signal_connect (button, "clicked",
+                                G_CALLBACK(gtk_assert_dialog_save_backtrace_callback), dlg);
 
-        button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Copy to clip_board",
-#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
-                                                  "edit-copy");
-#else
-                                                  GTK_STOCK_COPY);
-#endif // GTK >= 3.10 / < 3.10
-        g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_copy_callback), dlg);
-    }
+            wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+            button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Copy to clip_board", GTK_STOCK_COPY);
+            wxGCC_WARNING_RESTORE()
+            g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_copy_callback), dlg);
+        }
 #endif // wxUSE_STACKWALKER
 
-    /* add the checkbutton */
-    dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time");
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dlg->shownexttime), TRUE);
-    gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dlg))), dlg->shownexttime, false, true, 8);
+        /* add the checkbutton */
+        dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time");
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dlg->shownexttime), TRUE);
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+        gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dlg))), dlg->shownexttime, false, true, 8);
+        wxGCC_WARNING_RESTORE()
 
-    /* add the stop button */
-    gtk_assert_dialog_add_button (dlg, "_Stop",
-#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
-                                  "application-exit",
-#else
-                                  GTK_STOCK_QUIT,
-#endif // GTK >= 3.10 / < 3.10
-                                  GTK_ASSERT_DIALOG_STOP);
+        /* add the stop button */
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+        gtk_assert_dialog_add_button (dlg, "_Stop", GTK_STOCK_QUIT, GTK_ASSERT_DIALOG_STOP);
+        wxGCC_WARNING_RESTORE()
 
-    /* add the continue button */
-    continuebtn = gtk_assert_dialog_add_button (dlg, "_Continue",
-#if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
-                                                "go-next",
-#else
-                                                GTK_STOCK_YES,
-#endif
-                                                GTK_ASSERT_DIALOG_CONTINUE);
-    gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_ASSERT_DIALOG_CONTINUE);
-    g_signal_connect (continuebtn, "clicked", G_CALLBACK(gtk_assert_dialog_continue_callback), dlg);
+        /* add the continue button */
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+        continuebtn = gtk_assert_dialog_add_button (dlg, "_Continue", GTK_STOCK_YES, GTK_ASSERT_DIALOG_CONTINUE);
+        wxGCC_WARNING_RESTORE()
+        gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_ASSERT_DIALOG_CONTINUE);
+        g_signal_connect (continuebtn, "clicked", G_CALLBACK(gtk_assert_dialog_continue_callback), dlg);
 
-    /* complete creation */
-    dlg->callback = NULL;
-    dlg->userdata = NULL;
+        /* complete creation */
+        dlg->callback = NULL;
+        dlg->userdata = NULL;
 
-    /* the resizable property of this window is modified by the expander:
-       when it's collapsed, the window must be non-resizable! */
-    gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
-    gtk_widget_pop_composite_child ();
-    gtk_widget_show_all (GTK_WIDGET(dlg));
+        /* the resizable property of this window is modified by the expander:
+           when it's collapsed, the window must be non-resizable! */
+        gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
+        wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+        gtk_widget_pop_composite_child ();
+        wxGCC_WARNING_RESTORE()
+        gtk_widget_show_all (GTK_WIDGET(dlg));
+    }
 }
 }
 

From 3de89b2710b6a1724323246067db9ba59fffef13 Mon Sep 17 00:00:00 2001
From: skruse <Schmensch@gmx.de>
Date: Sun, 24 Dec 2017 15:20:23 +0100
Subject: [PATCH 042/916] Fix auto-sizing multiline wxGrid column labels with
 empty lines

Account for the empty lines explicitly by reserving enough vertical
space for them, as wxDC::GetTextExtent() wouldn't do it as it simply
returns 0 for empty strings.

Closes #18028.
---
 src/generic/grid.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 64b2113ebf..ddc158258a 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -6139,9 +6139,18 @@ void wxGrid::GetTextBoxSize( const wxDC& dc,
     size_t i;
     for ( i = 0; i < lines.GetCount(); i++ )
     {
-        dc.GetTextExtent( lines[i], &lineW, &lineH );
-        w = wxMax( w, lineW );
-        h += lineH;
+        if ( lines[i].empty() )
+        {
+            // GetTextExtent() would return 0 for empty lines, but we still
+            // need to account for their height.
+            h += dc.GetCharHeight();
+        }
+        else
+        {
+            dc.GetTextExtent( lines[i], &lineW, &lineH );
+            w = wxMax( w, lineW );
+            h += lineH;
+        }
     }
 
     *width = w;

From 2a8c290e0de5e657f22a0c13817df65688b01345 Mon Sep 17 00:00:00 2001
From: jonkraber <jonkraber@trac.wxwidgets.org>
Date: Sun, 24 Dec 2017 15:37:10 +0100
Subject: [PATCH 043/916] Restore previous clipping box in wxDCClipper

Remember the clipping box of the previously active clipping region in
wxDCClipper ctor and restore it in its dtor.

See #13834.
---
 include/wx/dc.h | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 7cfe17fb14..dadbe793a3 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1436,16 +1436,30 @@ class WXDLLIMPEXP_CORE wxDCClipper
 {
 public:
     wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc)
-        { dc.SetClippingRegion(r.GetBox()); }
+    {
+        dc.GetClippingBox(m_oldClipRect);
+        dc.SetClippingRegion(r.GetBox());
+    }
     wxDCClipper(wxDC& dc, const wxRect& r) : m_dc(dc)
-        { dc.SetClippingRegion(r.x, r.y, r.width, r.height); }
+    {
+        dc.GetClippingBox(m_oldClipRect);
+        dc.SetClippingRegion(r.x, r.y, r.width, r.height);
+    }
     wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) : m_dc(dc)
-        { dc.SetClippingRegion(x, y, w, h); }
+    {
+        dc.GetClippingBox(m_oldClipRect);
+        dc.SetClippingRegion(x, y, w, h);
+    }
 
-    ~wxDCClipper() { m_dc.DestroyClippingRegion(); }
+    ~wxDCClipper()
+    {
+        m_dc.DestroyClippingRegion();
+        m_dc.SetClippingRegion(m_oldClipRect);
+    }
 
 private:
     wxDC& m_dc;
+    wxRect m_oldClipRect;
 
     wxDECLARE_NO_COPY_CLASS(wxDCClipper);
 };

From ba719c576ec72d42186309131d30c111309a2ce9 Mon Sep 17 00:00:00 2001
From: John Roberts <johnr@iinet.net.au>
Date: Sun, 24 Dec 2017 15:39:40 +0100
Subject: [PATCH 044/916] Document the new wxDCClipper behaviour after last
 commit change

wxDCClipper does restore the (bounding box of the) previously active
clipping region now.

See #13834.
---
 interface/wx/dc.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/interface/wx/dc.h b/interface/wx/dc.h
index 67ce583325..79490c9c9a 100644
--- a/interface/wx/dc.h
+++ b/interface/wx/dc.h
@@ -1669,11 +1669,10 @@ public:
     }
     @endcode
 
-    @note Unlike other similar classes such as wxDCFontChanger, wxDCClipper
-        currently doesn't restore the previously active clipping region when it
-        is destroyed but simply resets clipping on the associated wxDC. This
-        may be changed in the future wxWidgets versions but has to be taken
-        into account explicitly in the current one.
+    @note Since 3.1.1 wxDCClipper restores the previously active clipping
+        region when it is destroyed. Previously it reset clipping on the
+        associated wxDC and this has to be taken into account explicitly in
+        previous wxWidgets versions.
 
     @library{wxcore}
     @category{gdi}

From 7f52ff751f377ab616550fdf9dbbfeff2f808332 Mon Sep 17 00:00:00 2001
From: jonkraber <jonkraber@trac.wxwidgets.org>
Date: Sun, 24 Dec 2017 15:43:20 +0100
Subject: [PATCH 045/916] Fix clipping of cell contents in wxGrid

Use wxDCClipper, now that it doesn't lose the previously set clipping
region any more, in wxGridCellStringRenderer::Draw() to ensure that we
don't overflow the area allocated for the cell.

Closes #17872.
---
 src/generic/grid.cpp     | 5 ++++-
 src/generic/gridctrl.cpp | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 64b2113ebf..37041f5d1d 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1871,7 +1871,10 @@ void wxGrid::Render( wxDC& dc,
     dc.DrawRectangle( pointOffSet, sizeCells );
 
     // draw cells
-    DrawGridCellArea( dc, renderCells );
+    {
+        wxDCClipper clipper( dc, wxRect(pointOffSet, sizeCells) );
+        DrawGridCellArea( dc, renderCells );
+    }
 
     // draw grid lines
     if ( style & wxGRID_DRAW_CELL_LINES )
diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 36ff071777..ecd8ac5d13 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -630,8 +630,7 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
             for (int i = col + cell_cols; i <= col_end; i++)
             {
                 clip.width = grid.GetColSize(i) - 1;
-                dc.DestroyClippingRegion();
-                dc.SetClippingRegion(clip);
+                wxDCClipper clipper(dc, clip);
 
                 SetTextColoursAndFont(grid, attr, dc,
                         grid.IsInSelection(row,i));
@@ -644,7 +643,6 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
             rect = rectCell;
             rect.Inflate(-1);
             rect.width++;
-            dc.DestroyClippingRegion();
         }
     }
 

From f36973875ead865f0ca251b57971255cd9f73777 Mon Sep 17 00:00:00 2001
From: John Roberts <johnr@iinet.net.au>
Date: Sun, 24 Dec 2017 15:54:51 +0100
Subject: [PATCH 046/916] Silence uninitialized variable warning in wxMac
 PanGestureEvent

Even though the value of this variable is not actually used in this
case, we still must initialize it to something before comparing with
NSGestureRecognizerState{Began,Ended} below.

Closes https://github.com/wxWidgets/wxWidgets/pull/645
---
 src/osx/cocoa/window.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index ffe70b4429..de48514a23 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -1646,6 +1646,7 @@ void wxWidgetCocoaImpl::PanGestureEvent(NSPanGestureRecognizer* panGestureRecogn
              gestureState = NSGestureRecognizerStateBegan;
              break;
         case NSGestureRecognizerStateChanged:
+             gestureState = NSGestureRecognizerStateChanged;
              break;
         case NSGestureRecognizerStateEnded:
         case NSGestureRecognizerStateCancelled:

From 87afebd6f280b564dcefc27231dbd1dec9f71162 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Dec 2017 18:28:53 +0100
Subject: [PATCH 047/916] Inline wxStaticBox ctors in wxGTK

No real changes, just make the trivial ctors of this class inline for
consistency with the new ctor about to be added.
---
 include/wx/gtk/statbox.h | 11 +++++++++--
 src/gtk/statbox.cpp      | 15 ---------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index 7dd72b86ff..b019740133 100644
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -16,14 +16,21 @@
 class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
 {
 public:
-    wxStaticBox();
+    wxStaticBox()
+    {
+    }
+
     wxStaticBox( wxWindow *parent,
                  wxWindowID id,
                  const wxString &label,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticBoxNameStr );
+                 const wxString &name = wxStaticBoxNameStr )
+    {
+        Create( parent, id, label, pos, size, style, name );
+    }
+
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString &label,
diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 797d80caf8..1e4a724497 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -59,21 +59,6 @@ static gboolean expose_event(GtkWidget* widget, GdkEventExpose*, wxWindow*)
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
-wxStaticBox::wxStaticBox()
-{
-}
-
-wxStaticBox::wxStaticBox( wxWindow *parent,
-                          wxWindowID id,
-                          const wxString &label,
-                          const wxPoint& pos,
-                          const wxSize& size,
-                          long style,
-                          const wxString& name )
-{
-    Create( parent, id, label, pos, size, style, name );
-}
-
 bool wxStaticBox::Create( wxWindow *parent,
                           wxWindowID id,
                           const wxString& label,

From aa47c15abdbd582c5a7c78d745412c15e4c41b45 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 19 Dec 2017 21:47:01 +0100
Subject: [PATCH 048/916] Add WXDestroyWithoutChildren() and use it from
 wxStaticBoxSizer

Factor out the code from wxStaticBoxSizer dtor into a wxStaticBox method
to improve encapsulation: the static box knows better than another class
how to detach its children from it before destroying it.

No real changes yet.
---
 include/wx/statbox.h      |  6 ++++++
 src/common/sizer.cpp      | 15 +--------------
 src/common/statboxcmn.cpp | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 968903b009..26f3f0dd14 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -45,6 +45,12 @@ public:
         *borderOther = BORDER;
     }
 
+    // This is an internal function currently used by wxStaticBoxSizer only.
+    //
+    // Reparent all children of the static box under its parent and destroy the
+    // box itself.
+    virtual void WXDestroyWithoutChildren();
+
 protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index ce59f88a1e..b0b94674b0 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -2582,20 +2582,7 @@ wxStaticBoxSizer::~wxStaticBoxSizer()
     // previous wxWidgets versions, so ensure they are left alive.
 
     if ( m_staticBox )
-    {
-        // Notice that we must make a copy of the list as it will be changed by
-        // Reparent() calls in the loop.
-        const wxWindowList children = m_staticBox->GetChildren();
-        wxWindow* const parent = m_staticBox->GetParent();
-        for ( wxWindowList::const_iterator i = children.begin();
-              i != children.end();
-              ++i )
-        {
-            (*i)->Reparent(parent);
-        }
-
-        delete m_staticBox;
-    }
+        m_staticBox->WXDestroyWithoutChildren();
 }
 
 void wxStaticBoxSizer::RecalcSizes()
diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 3539c3c356..68b42d7af4 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -36,6 +36,22 @@ wxStaticBoxBase::wxStaticBoxBase()
 #endif
 }
 
+void wxStaticBoxBase::WXDestroyWithoutChildren()
+{
+    // Notice that we must make a copy of the list as it will be changed by
+    // Reparent() calls in the loop.
+    const wxWindowList children = GetChildren();
+    wxWindow* const parent = GetParent();
+    for ( wxWindowList::const_iterator i = children.begin();
+          i != children.end();
+          ++i )
+    {
+        (*i)->Reparent(parent);
+    }
+
+    delete this;
+}
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------

From 29bd25b757a9e18888f43be551367a8ac812665e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 19 Dec 2017 22:07:15 +0100
Subject: [PATCH 049/916] Add GTKDoApplyWidgetStyle() helper

This allows to call the protected wxWindowGTK::DoApplyWidgetStyle()
method when it's really necessary, e.g. when forwarding to it from
DoApplyWidgetStyle() implementation for another window.
---
 include/wx/gtk/window.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index fd3f683491..d7b55ae685 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -206,6 +206,15 @@ public:
     virtual void GTKHandleRealized();
     void GTKHandleUnrealize();
 
+    // Apply the widget style to the given window. Should normally only be
+    // called from the overridden DoApplyWidgetStyle() implementation in
+    // another window and exists solely to provide access to protected
+    // DoApplyWidgetStyle() when it's really needed.
+    static void GTKDoApplyWidgetStyle(wxWindowGTK* win, GtkRcStyle *style)
+    {
+        win->DoApplyWidgetStyle(style);
+    }
+
 protected:
     // for controls composed of multiple GTK widgets, return true to eliminate
     // spurious focus events if the focus changes between GTK+ children within
@@ -426,8 +435,11 @@ protected:
 
     void GTKApplyWidgetStyle(bool forceStyle = false);
 
-    // helper function to ease native widgets wrapping, called by
-    // ApplyWidgetStyle -- override this, not ApplyWidgetStyle
+    // Helper function to ease native widgets wrapping, called by
+    // GTKApplyWidgetStyle() and supposed to be overridden, not called.
+    //
+    // And if you actually need to call it, e.g. to propagate style change to a
+    // composite control, use public static GTKDoApplyWidgetStyle().
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
 
     void GTKApplyStyle(GtkWidget* widget, GtkRcStyle* style);

From 7c849276f884de1471e56b3b262e408dcbf20cec Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 19 Dec 2017 21:29:32 +0100
Subject: [PATCH 050/916] Add support for using arbitrary windows as
 wxStaticBox labels

This commit implements the new feature in wxGTK and updates the sample
and the documentation.
---
 docs/changes.txt                   |  1 +
 docs/doxygen/mainpages/const_cpp.h |  2 +
 include/wx/gtk/statbox.h           | 58 ++++++++++++++++++++++-
 interface/wx/statbox.h             | 58 ++++++++++++++++++++++-
 samples/widgets/static.cpp         | 49 +++++++++++++++++--
 src/gtk/statbox.cpp                | 75 +++++++++++++++++++++++++-----
 6 files changed, 226 insertions(+), 17 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 676a77fc19..58207bbf06 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -113,6 +113,7 @@ All (GUI):
 - Allow wxWebView::RunScript() return values (Jose Lorenzo, GSoC 2017).
 - Allow using fractional pen widths with wxGraphicsContext (Adrien Tétar).
 - Add support for loading fonts from external files (Arthur Norman).
+- Add support for using arbitrary windows as wxStaticBox labels.
 - Improve wxSVGFileDC to support more of wxDC API (Maarten Bent).
 - Add support for wxAuiManager and wxAuiPaneInfo to XRC (Andrea Zanellato).
 - Add support for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL to XRC (ousnius).
diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h
index 1756d18a82..6114326616 100644
--- a/docs/doxygen/mainpages/const_cpp.h
+++ b/docs/doxygen/mainpages/const_cpp.h
@@ -194,6 +194,8 @@ Currently the following symbols exist:
 @itemdef{wxHAS_RAW_KEY_CODES, Defined if raw key codes (see wxKeyEvent::GetRawKeyCode are supported.}
 @itemdef{wxHAS_REGEX_ADVANCED, Defined if advanced syntax is available in wxRegEx.}
 @itemdef{wxHAS_TASK_BAR_ICON, Defined if wxTaskBarIcon is available on the current platform.}
+@itemdef{wxHAS_WINDOW_LABEL_IN_STATIC_BOX, Defined if wxStaticBox::Create()
+    overload taking @c wxWindow* instead of the text label is available on the current platform.}
 @itemdef{wxHAS_MODE_T, Defined when wxWidgets defines @c mode_t typedef for the
     compilers not providing it. If another library used in a wxWidgets
     application, such as ACE (http://www.cs.wustl.edu/~schmidt/ACE.html), also
diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index b019740133..64255f242d 100644
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -18,6 +18,7 @@ class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
 public:
     wxStaticBox()
     {
+        Init();
     }
 
     wxStaticBox( wxWindow *parent,
@@ -28,6 +29,21 @@ public:
                  long style = 0,
                  const wxString &name = wxStaticBoxNameStr )
     {
+        Init();
+
+        Create( parent, id, label, pos, size, style, name );
+    }
+
+    wxStaticBox( wxWindow *parent,
+                 wxWindowID id,
+                 wxWindow* label,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxStaticBoxNameStr )
+    {
+        Init();
+
         Create( parent, id, label, pos, size, style, name );
     }
 
@@ -37,7 +53,21 @@ public:
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = 0,
-                 const wxString &name = wxStaticBoxNameStr );
+                 const wxString &name = wxStaticBoxNameStr )
+    {
+        return DoCreate( parent, id, &label, NULL, pos, size, style, name );
+    }
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id,
+                 wxWindow* label,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxStaticBoxNameStr )
+    {
+        return DoCreate( parent, id, NULL, label, pos, size, style, name );
+    }
 
     virtual void SetLabel( const wxString &label ) wxOVERRIDE;
 
@@ -52,13 +82,39 @@ public:
 
     virtual void AddChild( wxWindowBase *child ) wxOVERRIDE;
 
+    virtual void WXDestroyWithoutChildren() wxOVERRIDE;
+
 protected:
+    // Common part of all ctors.
+    void Init()
+    {
+        m_labelWin = NULL;
+    }
+
+    // Common implementation of both Create() overloads: exactly one of
+    // labelStr and labelWin parameters must be non-null.
+    bool DoCreate(wxWindow *parent,
+                  wxWindowID id,
+                  const wxString* labelStr,
+                  wxWindow* labelWin,
+                  const wxPoint& pos,
+                  const wxSize& size,
+                  long style,
+                  const wxString& name);
+
     virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE;
     virtual void GTKWidgetDoSetMnemonic(GtkWidget* w) wxOVERRIDE;
 
     void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
 
+    // If non-null, the window used as our label. This window is owned by the
+    // static box and will be deleted when it is.
+    wxWindow* m_labelWin;
+
     wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
 };
 
+// Indicate that we have the ctor overload taking wxWindow as label.
+#define wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+
 #endif // _WX_GTKSTATICBOX_H_
diff --git a/interface/wx/statbox.h b/interface/wx/statbox.h
index 46004f20f4..8627255027 100644
--- a/interface/wx/statbox.h
+++ b/interface/wx/statbox.h
@@ -84,6 +84,42 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
+    /**
+        Constructor for a static box using the given window as label.
+
+        This constructor takes a pointer to an arbitrary window (although
+        usually a wxCheckBox or a wxRadioButton) instead of just the usual text
+        label and puts this window at the top of the box at the place where the
+        label would be shown.
+
+        The @a label window must be a non-null, fully created window and will
+        become a child of this wxStaticBox, i.e. it will be owned by this
+        control and will be deleted when the wxStaticBox itself is deleted.
+
+        An example of creating a wxStaticBox with window as a label:
+        @code
+        void MyFrame::CreateControls()
+        {
+            wxPanel* panel = new wxPanel(this);
+            wxCheckBox* checkbox = new wxCheckBox(panel, wxID_ANY, "Box checkbox");
+            wxStaticBox* box = new wxStaticBox(panel, wxID_ANY, checkbox);
+            ...
+        }
+        @endcode
+
+        Currently this constructor is only available in wxGTK, use
+        @c wxHAS_WINDOW_LABEL_IN_STATIC_BOX to check whether it can be used at
+        compile-time.
+
+        @since 3.1.1
+     */
+    wxStaticBox(wxWindow* parent, wxWindowID id,
+                wxWindow* label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBoxNameStr);
+
     /**
         Destructor, destroying the group box.
     */
@@ -97,5 +133,25 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
-};
 
+    /**
+        Creates the static box with the window as a label.
+
+        This method can only be called for an object created using its default
+        constructor.
+
+        See the constructor documentation for more details.
+
+        Currently this overload is only available in wxGTK, use
+        @c wxHAS_WINDOW_LABEL_IN_STATIC_BOX to check whether it can be used at
+        compile-time.
+
+        @since 3.1.1
+     */
+    wxStaticBox(wxWindow* parent, wxWindowID id,
+                wxWindow* label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBoxNameStr);
+};
diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 36827f50ae..5e16c71d89 100644
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -116,6 +116,9 @@ public:
 protected:
     // event handlers
     void OnCheckOrRadioBox(wxCommandEvent& event);
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+    void OnBoxCheckBox(wxCommandEvent& event);
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX
 
     void OnButtonReset(wxCommandEvent& event);
     void OnButtonBoxText(wxCommandEvent& event);
@@ -137,6 +140,9 @@ protected:
     // the check/radio boxes for styles
     wxCheckBox *m_chkVert,
                *m_chkGeneric,
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+               *m_chkBoxWithCheck,
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX
                *m_chkAutoResize,
                *m_chkEllipsize;
 
@@ -207,6 +213,9 @@ StaticWidgetsPage::StaticWidgetsPage(WidgetsBookCtrl *book,
     m_chkVert =
     m_chkAutoResize =
     m_chkGeneric =
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+    m_chkBoxWithCheck =
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX
 #if wxUSE_MARKUP
     m_chkGreen =
 #endif // wxUSE_MARKUP
@@ -243,6 +252,9 @@ void StaticWidgetsPage::CreateContent()
 
     m_chkGeneric = CreateCheckBoxAndAddToSizer(sizerLeft,
                                                "&Generic wxStaticText");
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+    m_chkBoxWithCheck = CreateCheckBoxAndAddToSizer(sizerLeft, "Checkable &box");
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX
     m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, "&Vertical line");
     m_chkAutoResize = CreateCheckBoxAndAddToSizer(sizerLeft, "&Fit to text");
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
@@ -367,6 +379,9 @@ void StaticWidgetsPage::CreateContent()
 void StaticWidgetsPage::Reset()
 {
     m_chkGeneric->SetValue(false);
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+    m_chkBoxWithCheck->SetValue(false);
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX
     m_chkVert->SetValue(false);
     m_chkAutoResize->SetValue(true);
     m_chkEllipsize->SetValue(true);
@@ -469,10 +484,28 @@ void StaticWidgetsPage::CreateStatic()
     flagsText |= align;
     flagsBox |= align;
 
-    wxStaticBox *staticBox = new wxStaticBox(this, wxID_ANY,
-                                             m_textBox->GetValue(),
-                                             wxDefaultPosition, wxDefaultSize,
-                                             flagsBox);
+    wxStaticBox *staticBox;
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+    if ( m_chkBoxWithCheck->GetValue() )
+    {
+        wxCheckBox* const label = new wxCheckBox(this, wxID_ANY,
+                                                 m_textBox->GetValue());
+        label->Bind(wxEVT_CHECKBOX, &StaticWidgetsPage::OnBoxCheckBox, this);
+
+        staticBox = new wxStaticBox(this, wxID_ANY,
+                                    label,
+                                    wxDefaultPosition, wxDefaultSize,
+                                    flagsBox);
+    }
+    else // normal static box
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+    {
+        staticBox = new wxStaticBox(this, wxID_ANY,
+                                    m_textBox->GetValue(),
+                                    wxDefaultPosition, wxDefaultSize,
+                                    flagsBox);
+    }
+
     m_sizerStatBox = new wxStaticBoxSizer(staticBox, isVert ? wxHORIZONTAL
                                                             : wxVERTICAL);
 
@@ -559,6 +592,14 @@ void StaticWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
     CreateStatic();
 }
 
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+void StaticWidgetsPage::OnBoxCheckBox(wxCommandEvent& event)
+{
+    wxLogMessage("Box check box has been %schecked",
+                 event.IsChecked() ? "": "un");
+}
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+
 void StaticWidgetsPage::OnButtonBoxText(wxCommandEvent& WXUNUSED(event))
 {
     m_sizerStatBox->GetStaticBox()->SetLabel(m_textBox->GetValue());
diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 1e4a724497..0d144e128b 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -59,13 +59,14 @@ static gboolean expose_event(GtkWidget* widget, GdkEventExpose*, wxWindow*)
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
-bool wxStaticBox::Create( wxWindow *parent,
-                          wxWindowID id,
-                          const wxString& label,
-                          const wxPoint& pos,
-                          const wxSize& size,
-                          long style,
-                          const wxString& name )
+bool wxStaticBox::DoCreate(wxWindow *parent,
+                           wxWindowID id,
+                           const wxString* labelStr,
+                           wxWindow* labelWin,
+                           const wxPoint& pos,
+                           const wxSize& size,
+                           long style,
+                           const wxString& name)
 {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
@@ -74,11 +75,41 @@ bool wxStaticBox::Create( wxWindow *parent,
         return false;
     }
 
-    m_widget = GTKCreateFrame(label);
-    g_object_ref(m_widget);
+    if ( labelStr )
+    {
+        m_widget = GTKCreateFrame(*labelStr);
 
-    // only base SetLabel needs to be called after GTKCreateFrame
-    wxControl::SetLabel(label);
+        // only base SetLabel needs to be called after GTKCreateFrame
+        wxControl::SetLabel(*labelStr);
+    }
+    else // Use the given window as the label.
+    {
+        wxCHECK_MSG( labelWin, false, wxS("Label window can't be null") );
+
+        GtkWidget* const labelWidget = labelWin->m_widget;
+        wxCHECK_MSG( labelWidget, false, wxS("Label window must be created") );
+
+        // The widget must not have any parent at GTK+ level or setting it as
+        // label widget would fail.
+        GtkWidget* const oldParent = gtk_widget_get_parent(labelWidget);
+        gtk_container_remove(GTK_CONTAINER(oldParent), labelWidget);
+        gtk_widget_unparent(labelWidget);
+
+        // It also should be our child at wx API level, but without being our
+        // child in wxGTK, i.e. it must not be added to the GtkFrame container,
+        // so we can't call Reparent() here (not even wxWindowBase version, as
+        // it still would end up in our overridden AddChild()), nor the normal
+        // AddChild() for the same reason.
+        labelWin->GetParent()->RemoveChild(labelWin);
+        wxWindowBase::AddChild(labelWin);
+
+        m_labelWin = labelWin;
+
+        m_widget = gtk_frame_new(NULL);
+        gtk_frame_set_label_widget(GTK_FRAME(m_widget), labelWidget);
+    }
+
+    g_object_ref(m_widget);
 
     m_parent->DoAddChild( this );
 
@@ -121,16 +152,38 @@ void wxStaticBox::AddChild( wxWindowBase *child )
     wxStaticBoxBase::AddChild(child);
 }
 
+void wxStaticBox::WXDestroyWithoutChildren()
+{
+    // The label window doesn't count as our child, it's really a part of
+    // static box itself and it makes no sense to leave it alive when the box
+    // is destroyed, so do it even when it's supposed to be destroyed without
+    // destroying its children.
+    if ( m_labelWin )
+    {
+        // By deleting it here, we indirectly remove this window from the list
+        // of our children and hence prevent the base class version of this
+        // method from reparenting it and thus keeping it alive.
+        delete m_labelWin;
+        m_labelWin = NULL;
+    }
+
+    wxStaticBoxBase::WXDestroyWithoutChildren();
+}
+
 void wxStaticBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );
 
+    wxCHECK_RET( !m_labelWin, wxS("Doesn't make sense when using label window") );
+
     GTKSetLabelForFrame(GTK_FRAME(m_widget), label);
 }
 
 void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     GTKFrameApplyWidgetStyle(GTK_FRAME(m_widget), style);
+    if ( m_labelWin )
+        GTKDoApplyWidgetStyle(m_labelWin, style);
     if (m_wxwindow)
         GTKApplyStyle(m_wxwindow, style);
 

From 8c06a24da4ffdb0e4f3d9713491edb45f9fac318 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Dec 2017 00:03:55 +0100
Subject: [PATCH 051/916] Move m_labelWin to wxStaticBoxBase itself

It will be reused by all platforms and is not specific to wxGTK.

This also means WXDestroyWithoutChildren() doesn't need to be virtual
any longer.
---
 include/wx/gtk/statbox.h  | 17 -----------------
 include/wx/statbox.h      |  6 +++++-
 src/common/statboxcmn.cpp | 12 +++++++++++-
 src/gtk/statbox.cpp       | 18 ------------------
 4 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index 64255f242d..cce262cbae 100644
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -18,7 +18,6 @@ class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
 public:
     wxStaticBox()
     {
-        Init();
     }
 
     wxStaticBox( wxWindow *parent,
@@ -29,8 +28,6 @@ public:
                  long style = 0,
                  const wxString &name = wxStaticBoxNameStr )
     {
-        Init();
-
         Create( parent, id, label, pos, size, style, name );
     }
 
@@ -42,8 +39,6 @@ public:
                  long style = 0,
                  const wxString &name = wxStaticBoxNameStr )
     {
-        Init();
-
         Create( parent, id, label, pos, size, style, name );
     }
 
@@ -82,15 +77,7 @@ public:
 
     virtual void AddChild( wxWindowBase *child ) wxOVERRIDE;
 
-    virtual void WXDestroyWithoutChildren() wxOVERRIDE;
-
 protected:
-    // Common part of all ctors.
-    void Init()
-    {
-        m_labelWin = NULL;
-    }
-
     // Common implementation of both Create() overloads: exactly one of
     // labelStr and labelWin parameters must be non-null.
     bool DoCreate(wxWindow *parent,
@@ -107,10 +94,6 @@ protected:
 
     void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
 
-    // If non-null, the window used as our label. This window is owned by the
-    // static box and will be deleted when it is.
-    wxWindow* m_labelWin;
-
     wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
 };
 
diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 26f3f0dd14..360881031a 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -49,12 +49,16 @@ public:
     //
     // Reparent all children of the static box under its parent and destroy the
     // box itself.
-    virtual void WXDestroyWithoutChildren();
+    void WXDestroyWithoutChildren();
 
 protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
+    // If non-null, the window used as our label. This window is owned by the
+    // static box and will be deleted when it is.
+    wxWindow* m_labelWin;
+
     wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);
 };
 
diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 68b42d7af4..62c4b50134 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -31,6 +31,8 @@ extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox";
 
 wxStaticBoxBase::wxStaticBoxBase()
 {
+    m_labelWin = NULL;
+
 #ifndef __WXGTK__
     m_container.DisableSelfFocus();
 #endif
@@ -46,7 +48,15 @@ void wxStaticBoxBase::WXDestroyWithoutChildren()
           i != children.end();
           ++i )
     {
-        (*i)->Reparent(parent);
+        // The label window doesn't count as our child, it's really a part of
+        // static box itself and it makes no sense to leave it alive when the
+        // box is destroyed, so do it even when it's supposed to be destroyed
+        // without destroying its children -- by not reparenting it, we ensure
+        // that it's destroyed when this object itself is below.
+        if ( *i != m_labelWin )
+        {
+            (*i)->Reparent(parent);
+        }
     }
 
     delete this;
diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 0d144e128b..6979591287 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -152,24 +152,6 @@ void wxStaticBox::AddChild( wxWindowBase *child )
     wxStaticBoxBase::AddChild(child);
 }
 
-void wxStaticBox::WXDestroyWithoutChildren()
-{
-    // The label window doesn't count as our child, it's really a part of
-    // static box itself and it makes no sense to leave it alive when the box
-    // is destroyed, so do it even when it's supposed to be destroyed without
-    // destroying its children.
-    if ( m_labelWin )
-    {
-        // By deleting it here, we indirectly remove this window from the list
-        // of our children and hence prevent the base class version of this
-        // method from reparenting it and thus keeping it alive.
-        delete m_labelWin;
-        m_labelWin = NULL;
-    }
-
-    wxStaticBoxBase::WXDestroyWithoutChildren();
-}
-
 void wxStaticBox::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") );

From 91875045ac841f2c1d9d7d6b1c7539ba7d111b06 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Dec 2017 00:06:08 +0100
Subject: [PATCH 052/916] Don't make wxStaticBoxBase::GetBordersForSizer()
 inline

Move the function definition to the source file, there doesn't seem to
be any reason to keep it in the header.
---
 include/wx/statbox.h      | 8 +-------
 src/common/statboxcmn.cpp | 8 ++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 360881031a..0e6e4f3ac3 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -37,13 +37,7 @@ public:
     //
     // the top border is the margin at the top (where the title is),
     // borderOther is the margin on all other sides
-    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const
-    {
-        const int BORDER = FromDIP(5); // FIXME: hardcoded value
-
-        *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
-        *borderOther = BORDER;
-    }
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 
     // This is an internal function currently used by wxStaticBoxSizer only.
     //
diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 62c4b50134..c8427783f3 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -38,6 +38,14 @@ wxStaticBoxBase::wxStaticBoxBase()
 #endif
 }
 
+void wxStaticBoxBase::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    const int BORDER = FromDIP(5); // FIXME: hardcoded value
+
+    *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
+    *borderOther = BORDER;
+}
+
 void wxStaticBoxBase::WXDestroyWithoutChildren()
 {
     // Notice that we must make a copy of the list as it will be changed by

From 67225fb07edb94deefc8d2e5b05431ad5e2e2d98 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Dec 2017 00:29:03 +0100
Subject: [PATCH 053/916] Remove borders from wxStaticBoxSizer items in the
 widgets sample

This allows to see better whether the borders returned by
wxStaticBox::GetBordersForSizer() are correct.
---
 samples/widgets/static.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 5e16c71d89..8869bab39d 100644
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -551,12 +551,12 @@ void StaticWidgetsPage::CreateStatic()
                                   isVert ? wxLI_VERTICAL : wxLI_HORIZONTAL);
 #endif // wxUSE_STATLINE
 
-    m_sizerStatBox->Add(m_statText, 0, wxGROW | wxALL, 5);
+    m_sizerStatBox->Add(m_statText, 0, wxGROW);
 #if wxUSE_STATLINE
-    m_sizerStatBox->Add(m_statLine, 0, wxGROW | wxALL, 5);
+    m_sizerStatBox->Add(m_statLine, 0, wxGROW | wxTOP | wxBOTTOM, 10);
 #endif // wxUSE_STATLINE
 #if wxUSE_MARKUP
-    m_sizerStatBox->Add(m_statMarkup, 0, wxALL, 5);
+    m_sizerStatBox->Add(m_statMarkup);
 #endif // wxUSE_MARKUP
 
     m_sizerStatic->Add(m_sizerStatBox, 0, wxGROW);

From b34a1c036a18e1bf90cd81b264ee9dfe1d5382f3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Dec 2017 00:30:12 +0100
Subject: [PATCH 054/916] Account for label window in
 wxStaticBoxBase::GetBordersForSizer()

Take the window used as label into account in the default implementation
of this method.
---
 src/common/statboxcmn.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index c8427783f3..4db934146a 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -42,7 +42,15 @@ void wxStaticBoxBase::GetBordersForSizer(int *borderTop, int *borderOther) const
 {
     const int BORDER = FromDIP(5); // FIXME: hardcoded value
 
-    *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
+    if ( m_labelWin )
+    {
+        *borderTop = m_labelWin->GetSize().y;
+    }
+    else
+    {
+        *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
+    }
+
     *borderOther = BORDER;
 }
 

From 23a830ae16de33d30ee184097e42b5998c3ebb73 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Dec 2017 22:53:12 +0100
Subject: [PATCH 055/916] Use symbolic names in wxMSW wxStaticBox drawing code

Introduce symbolic constants instead of using raw magic numbers.

No real changes and these numbers are still as magic as before, but at
least they will be easier to change now.
---
 src/msw/statbox.cpp | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 9ae5c230df..bcc79cd1f7 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -54,6 +54,21 @@
 
 #define TMT_FONT 210
 
+namespace
+{
+
+// Offset of the first pixel of the label from the box left border.
+//
+// FIXME: value is hardcoded as this is what it is on my system, no idea if
+//        it's true everywhere
+const int LABEL_HORZ_OFFSET = 9;
+
+// Extra borders around the label on left/right and bottom sides.
+const int LABEL_HORZ_BORDER = 2;
+const int LABEL_VERT_BORDER = 2;
+
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -443,23 +458,17 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT&)
         dc.GetTextExtent(wxStripMenuCodes(label, wxStrip_Mnemonics),
                          &width, &height);
 
-        int x;
-        int y = height;
-
         // first we need to correctly paint the background of the label
         // as Windows ignores the brush offset when doing it
-        //
-        // FIXME: value of x is hardcoded as this is what it is on my system,
-        //        no idea if it's true everywhere
-        RECT dimensions = {0, 0, 0, y};
-        x = 9;
+        const int x = LABEL_HORZ_OFFSET;
+        RECT dimensions = { x, 0, 0, height };
         dimensions.left = x;
         dimensions.right = x + width;
 
         // need to adjust the rectangle to cover all the label background
-        dimensions.left -= 2;
-        dimensions.right += 2;
-        dimensions.bottom += 2;
+        dimensions.left -= LABEL_HORZ_BORDER;
+        dimensions.right += LABEL_HORZ_BORDER;
+        dimensions.bottom += LABEL_VERT_BORDER;
 
         if ( UseBgCol() )
         {
@@ -489,7 +498,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT&)
         }
 
         // now draw the text
-        RECT rc2 = { x, 0, x + width, y };
+        RECT rc2 = { x, 0, x + width, height };
         ::DrawText(hdc, label.t_str(), label.length(), &rc2,
                    drawTextFlags);
     }

From dfba063d53b0183196f1be7c49be18840ea475d8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Dec 2017 23:01:11 +0100
Subject: [PATCH 056/916] Adjust wxMSW wxStaticBox pixel constants for DPI

Use FromDIP() with all constants expressed in pixels, this should result
in better appearance when using high DPI.
---
 src/msw/statbox.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index bcc79cd1f7..167de6c152 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -460,15 +460,15 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT&)
 
         // first we need to correctly paint the background of the label
         // as Windows ignores the brush offset when doing it
-        const int x = LABEL_HORZ_OFFSET;
+        const int x = FromDIP(LABEL_HORZ_OFFSET);
         RECT dimensions = { x, 0, 0, height };
         dimensions.left = x;
         dimensions.right = x + width;
 
         // need to adjust the rectangle to cover all the label background
-        dimensions.left -= LABEL_HORZ_BORDER;
-        dimensions.right += LABEL_HORZ_BORDER;
-        dimensions.bottom += LABEL_VERT_BORDER;
+        dimensions.left -= FromDIP(LABEL_HORZ_BORDER);
+        dimensions.right += FromDIP(LABEL_HORZ_BORDER);
+        dimensions.bottom += FromDIP(LABEL_VERT_BORDER);
 
         if ( UseBgCol() )
         {

From 900c6d5d75ae980c3ebf03c70bebcc319a44bfe2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Dec 2017 22:54:44 +0100
Subject: [PATCH 057/916] Slightly decrease the top margin of wxMSW wxStaticBox

Use the same offset we already use in the drawing code, this is a bit
less arbitrary than what we did before and looks slightly better too.
---
 src/msw/statbox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 167de6c152..a178c4abcb 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -167,7 +167,7 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
     wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther);
 
     // need extra space, don't know how much but this seems to be enough
-    *borderTop += GetCharHeight()/3;
+    *borderTop += FromDIP(LABEL_VERT_BORDER);
 }
 
 WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

From 4a4d1643192d3d485ff073707ae941e4480132e3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Dec 2017 23:29:07 +0100
Subject: [PATCH 058/916] Keep attributes after recreating static controls in
 widgets sample

Preserve the colours, font etc after recreating the widgets to
facilitate testing.
---
 samples/widgets/static.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 8869bab39d..71b42b59b4 100644
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -569,6 +569,8 @@ void StaticWidgetsPage::CreateStatic()
     staticBox->Connect(wxEVT_LEFT_UP,
                        wxMouseEventHandler(StaticWidgetsPage::OnMouseEvent),
                        NULL, this);
+
+    SetUpWidget();
 }
 
 // ----------------------------------------------------------------------------

From 598c62a26715e3e6ebdb1c9485b437fba649a40f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 21 Dec 2017 13:46:32 +0100
Subject: [PATCH 059/916] Don't change wxCompositeWindow size from
 SetLayoutDirection()

Remove wxSIZE_AUTO from the SetSize() call, this was completely
unnecessary and unexpectedly (and wrongly) resized composite windows
managed by sizers as SetLayoutDirection() side-effect.
---
 include/wx/compositewin.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h
index b443eaceb5..48d0ae344e 100644
--- a/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@ -109,7 +109,7 @@ public:
         // SetLayoutDirection(wxLayout_Default) wouldn't result in a re-layout
         // neither, but then we're not supposed to be called with it at all.
         if ( dir != wxLayout_Default )
-            this->SetSize(-1, -1, -1, -1, wxSIZE_AUTO | wxSIZE_FORCE);
+            this->SetSize(-1, -1, -1, -1, wxSIZE_FORCE);
     }
 
 #if wxUSE_TOOLTIPS

From 59ca9b93a0b36200e1bc15f39c85f78bb0ee7d38 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 21 Dec 2017 13:48:30 +0100
Subject: [PATCH 060/916] Make wxCompositeWindow ctor protected

As this class is only supposed to be used as a base class, its ctor
doesn't need to be, and hence ought not to be, public.

Also update an outdated comment stating that the ctor didn't do anything
when it, in fact, does perform an important task.
---
 include/wx/compositewin.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h
index 48d0ae344e..ec26a414b5 100644
--- a/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@ -33,17 +33,6 @@ class wxCompositeWindow : public W
 public:
     typedef W BaseWindowClass;
 
-    // Default ctor doesn't do anything.
-    wxCompositeWindow()
-    {
-        this->Connect
-              (
-                  wxEVT_CREATE,
-                  wxWindowCreateEventHandler(wxCompositeWindow::OnWindowCreate)
-              );
-
-    }
-
     // Override all wxWindow methods which must be forwarded to the composite
     // window parts.
 
@@ -136,6 +125,17 @@ public:
         wxSetFocusToChild(this, NULL);
     }
 
+protected:
+    // Default ctor sets things up for handling children events correctly.
+    wxCompositeWindow()
+    {
+        this->Connect
+              (
+                  wxEVT_CREATE,
+                  wxWindowCreateEventHandler(wxCompositeWindow::OnWindowCreate)
+              );
+    }
+
 private:
     // Must be implemented by the derived class to return all children to which
     // the public methods we override should forward to.

From 3ff9846a227b8eba066d12cedbc86d58cd61c192 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 21 Dec 2017 19:03:12 +0100
Subject: [PATCH 061/916] Document alignment styles in wxStaticBox

Mention that they work in wxGTK, even if it seems to be the only
platform supporting them currently.
---
 interface/wx/statbox.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/interface/wx/statbox.h b/interface/wx/statbox.h
index 8627255027..d57949ee9b 100644
--- a/interface/wx/statbox.h
+++ b/interface/wx/statbox.h
@@ -71,7 +71,11 @@ public:
             Checkbox size.
             If ::wxDefaultSize is specified then a default size is chosen.
         @param style
-            Window style. See wxStaticBox.
+            Window style. There are no wxStaticBox-specific styles, but generic
+            ::wxALIGN_LEFT, ::wxALIGN_CENTRE_HORIZONTAL and ::wxALIGN_RIGHT can
+            be used here to change the position of the static box label when
+            using wxGTK (these styles are ignored under the other platforms
+            currently).
         @param name
             Window name.
 

From 36c4b7651e83752745c1e10f6fe3d742b2ef9942 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Dec 2017 19:54:41 +0100
Subject: [PATCH 062/916] Fix background of wxCheckBoxes inside wxStaticBox in
 wxMSW

Erase background of the partially transparent native child controls,
such as wxCheckBox, using our own background colour if we have it
instead of using the parent's colour.

For some reason, we -- seemingly intentionally, judging from the comment
-- didn't do it before, but this meant that checkboxes inside static
boxes didn't inherit the box background colour, if it was set, which was
ugly and inconsistent with at least wxGTK. So do use our own background
if we have it now by just reusing the existing PaintBackground() instead
of manually using the parent background brush in WM_PRINTCLIENT handler.
---
 src/msw/statbox.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index a178c4abcb..6596e1b573 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -204,9 +204,10 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar
         if ( !HandlePrintClient((WXHDC)wParam) )
         {
             // no, we don't, erase the background ourselves
-            // (don't use our own) - see PaintBackground for explanation
-            wxBrush brush(GetParent()->GetBackgroundColour());
-            wxFillRect(GetHwnd(), (HDC)wParam, GetHbrushOf(brush));
+            RECT rc;
+            ::GetClientRect(GetHwnd(), &rc);
+            wxDCTemp dc((WXHDC)wParam);
+            PaintBackground(dc, rc);
         }
 
         return 0;

From 687192d86a52b2779ff0c73a32403c1a0a257385 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Dec 2017 20:07:05 +0100
Subject: [PATCH 063/916] Add support for arbitrary window labels in
 wxStaticBox to wxMSW

Just reparent the label window and position it accordingly and, also,
avoid painting over it in MSW-specific code.
---
 include/wx/msw/statbox.h | 20 ++++++++++++
 interface/wx/statbox.h   |  2 +-
 src/msw/statbox.cpp      | 66 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 87ad173cba..89eb8fcdde 100644
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -27,6 +27,16 @@ public:
         Create(parent, id, label, pos, size, style, name);
     }
 
+    wxStaticBox(wxWindow* parent, wxWindowID id,
+                wxWindow* label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString &name = wxStaticBoxNameStr)
+    {
+        Create(parent, id, label, pos, size, style, name);
+    }
+
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
@@ -34,6 +44,13 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
+    bool Create(wxWindow *parent, wxWindowID id,
+                wxWindow* label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBoxNameStr);
+
     /// Implementation only
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
 
@@ -66,5 +83,8 @@ protected:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox);
 };
 
+// Indicate that we have the ctor overload taking wxWindow as label.
+#define wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+
 #endif // _WX_MSW_STATBOX_H_
 
diff --git a/interface/wx/statbox.h b/interface/wx/statbox.h
index d57949ee9b..d7aae13cc0 100644
--- a/interface/wx/statbox.h
+++ b/interface/wx/statbox.h
@@ -111,7 +111,7 @@ public:
         }
         @endcode
 
-        Currently this constructor is only available in wxGTK, use
+        Currently this constructor is only available in wxGTK and wxMSW, use
         @c wxHAS_WINDOW_LABEL_IN_STATIC_BOX to check whether it can be used at
         compile-time.
 
diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 6596e1b573..9ca1b792bd 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -107,6 +107,27 @@ bool wxStaticBox::Create(wxWindow *parent,
     return true;
 }
 
+bool wxStaticBox::Create(wxWindow* parent,
+                         wxWindowID id,
+                         wxWindow* labelWin,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         long style,
+                         const wxString& name)
+{
+    wxCHECK_MSG( labelWin, false, wxS("Label window can't be null") );
+
+    if ( !Create(parent, id, wxString(), pos, size, style, name) )
+        return false;
+
+    m_labelWin = labelWin;
+    m_labelWin->Reparent(this);
+
+    m_labelWin->Move(FromDIP(LABEL_HORZ_OFFSET), 0);
+
+    return true;
+}
+
 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
@@ -269,7 +290,21 @@ void wxStaticBox::MSWGetRegionWithoutSelf(WXHRGN hRgn, int w, int h)
     GetBordersForSizer(&borderTop, &border);
 
     // top
-    SubtractRectFromRgn(hrgn, 0, 0, w, borderTop);
+    if ( m_labelWin )
+    {
+        // Don't exclude the entire rectangle at the top, we do need to paint
+        // the background of the gap between the label window and the box
+        // frame.
+        const wxRect labelRect = m_labelWin->GetRect();
+        const int gap = FromDIP(LABEL_HORZ_BORDER);
+
+        SubtractRectFromRgn(hrgn, 0, 0, labelRect.GetLeft() - gap, borderTop);
+        SubtractRectFromRgn(hrgn, labelRect.GetRight() + gap, 0, w, borderTop);
+    }
+    else
+    {
+        SubtractRectFromRgn(hrgn, 0, 0, w, borderTop);
+    }
 
     // bottom
     SubtractRectFromRgn(hrgn, 0, h - border, w, h);
@@ -415,7 +450,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT&)
     // background mode doesn't change anything: the static box def window proc
     // still draws the label in its own colours, so we need to redraw the text
     // ourselves if we have a non default fg colour
-    if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() )
+    if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() && !m_labelWin )
     {
         // draw over the text in default colour in our colour
         HDC hdc = GetHdcOf(*impl);
@@ -535,8 +570,31 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
     GetBordersForSizer(&borderTop, &border);
 
     // top
-    dc.Blit(border, 0, rc.right - border, borderTop,
-            &memdc, border, 0);
+    if ( m_labelWin )
+    {
+        // We also have to exclude the area taken by the label window,
+        // otherwise there would be flicker when it draws itself on top of it.
+        const wxRect labelRect = m_labelWin->GetRect();
+
+        // We also leave a small border around label window to make it appear
+        // more similarly to a plain text label.
+        const int gap = FromDIP(LABEL_HORZ_BORDER);
+
+        dc.Blit(border, 0,
+                labelRect.GetLeft() - gap - border,
+                borderTop,
+                &memdc, border, 0);
+        dc.Blit(labelRect.GetRight() + gap, 0,
+                rc.right - (labelRect.GetRight() + gap),
+                borderTop,
+                &memdc, border, 0);
+    }
+    else
+    {
+        dc.Blit(border, 0, rc.right - border, borderTop,
+                &memdc, border, 0);
+    }
+
     // bottom
     dc.Blit(border, rc.bottom - border, rc.right - border, border,
             &memdc, border, rc.bottom - border);

From 329af399ebfeeb3c92c78d8ec3a9e876ed4c01f1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Dec 2017 21:43:57 +0100
Subject: [PATCH 064/916] Factor out wxCompositeWindowSettersOnly class

Extract this class from wxCompositeWindow, as sometimes it can be
convenient to just define the setter functions to do the right thing for
a window containing sub-windows, but without dealing with focus too.

This will be used in wxMSW wxStaticBox in the next commit.
---
 include/wx/compositewin.h | 68 +++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h
index ec26a414b5..567d0e8999 100644
--- a/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@ -26,9 +26,14 @@ class WXDLLIMPEXP_FWD_CORE wxToolTip;
 // base class name and implement GetCompositeWindowParts() pure virtual method.
 // ----------------------------------------------------------------------------
 
+// This is the base class of wxCompositeWindow which takes care of propagating
+// colours, fonts etc changes to all the children, but doesn't bother with
+// handling their events or focus. There should be rarely any need to use it
+// rather than the full wxCompositeWindow.
+
 // The template parameter W must be a wxWindow-derived class.
 template <class W>
-class wxCompositeWindow : public W
+class wxCompositeWindowSettersOnly : public W
 {
 public:
     typedef W BaseWindowClass;
@@ -120,6 +125,44 @@ public:
     }
 #endif // wxUSE_TOOLTIPS
 
+protected:
+    // Trivial but necessary default ctor.
+    wxCompositeWindowSettersOnly()
+    {
+    }
+
+private:
+    // Must be implemented by the derived class to return all children to which
+    // the public methods we override should forward to.
+    virtual wxWindowList GetCompositeWindowParts() const = 0;
+
+    template <class T, class TArg, class R>
+    void SetForAllParts(R (wxWindowBase::*func)(TArg), T arg)
+    {
+        // Simply call the setters for all parts of this composite window.
+        const wxWindowList parts = GetCompositeWindowParts();
+        for ( wxWindowList::const_iterator i = parts.begin();
+              i != parts.end();
+              ++i )
+        {
+            wxWindow * const child = *i;
+
+            // Allow NULL elements in the list, this makes the code of derived
+            // composite controls which may have optionally shown children
+            // simpler and it doesn't cost us much here.
+            if ( child )
+                (child->*func)(arg);
+        }
+    }
+
+    wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCompositeWindowSettersOnly, W);
+};
+
+// The real wxCompositeWindow itself, inheriting all the setters defined above.
+template <class W>
+class wxCompositeWindow : public wxCompositeWindowSettersOnly<W>
+{
+public:
     virtual void SetFocus() wxOVERRIDE
     {
         wxSetFocusToChild(this, NULL);
@@ -137,10 +180,6 @@ protected:
     }
 
 private:
-    // Must be implemented by the derived class to return all children to which
-    // the public methods we override should forward to.
-    virtual wxWindowList GetCompositeWindowParts() const = 0;
-
     void OnWindowCreate(wxWindowCreateEvent& event)
     {
         event.Skip();
@@ -206,25 +245,6 @@ private:
             event.Skip();
     }
 
-    template <class T, class TArg, class R>
-    void SetForAllParts(R (wxWindowBase::*func)(TArg), T arg)
-    {
-        // Simply call the setters for all parts of this composite window.
-        const wxWindowList parts = GetCompositeWindowParts();
-        for ( wxWindowList::const_iterator i = parts.begin();
-              i != parts.end();
-              ++i )
-        {
-            wxWindow * const child = *i;
-
-            // Allow NULL elements in the list, this makes the code of derived
-            // composite controls which may have optionally shown children
-            // simpler and it doesn't cost us much here.
-            if ( child )
-                (child->*func)(arg);
-        }
-    }
-
     wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCompositeWindow, W);
 };
 

From fdf47e8e1279f6becf013e1025c091a54caac894 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Dec 2017 21:48:51 +0100
Subject: [PATCH 065/916] Fix colours and fonts of wxStaticBox label window in
 wxMSW

Inherit from wxCompositeWindowSettersOnly<> to make sure all the usual
setters, such as SetForegroundColour() and SetFont(), called on
wxStaticBox are propagated to the label window too.

However also prevent SetBackgroundColour() from being propagated
unnecessarily -- because the checkbox already inherits the parent
background colour by default in wxMSW anyhow -- and still override
SetFont() to adjust the label window position after the font change,
otherwise it could be truncated after increasing the font size, for
example.

Because of these issues, wxCompositeWindowSettersOnly is not ideally
suited for its use here, but on balance it still seems to be better to
use it rather than reimplement parts of its functionality here.
---
 include/wx/msw/statbox.h | 19 +++++++++++++++++--
 src/msw/statbox.cpp      | 40 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 89eb8fcdde..294f1519ae 100644
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -11,11 +11,16 @@
 #ifndef _WX_MSW_STATBOX_H_
 #define _WX_MSW_STATBOX_H_
 
+#include "wx/compositewin.h"
+
 // Group box
-class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
+class WXDLLIMPEXP_CORE wxStaticBox : public wxCompositeWindowSettersOnly<wxStaticBoxBase>
 {
 public:
-    wxStaticBox() { }
+    wxStaticBox()
+        : wxCompositeWindowSettersOnly<wxStaticBoxBase>()
+    {
+    }
 
     wxStaticBox(wxWindow *parent, wxWindowID id,
                 const wxString& label,
@@ -23,6 +28,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr)
+        : wxCompositeWindowSettersOnly<wxStaticBoxBase>()
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -33,6 +39,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString &name = wxStaticBoxNameStr)
+        : wxCompositeWindowSettersOnly<wxStaticBoxBase>()
     {
         Create(parent, id, label, pos, size, style, name);
     }
@@ -54,6 +61,9 @@ public:
     /// Implementation only
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
 
+    virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
+    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
+
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
 
     // returns true if the platform should explicitly apply a theme border
@@ -66,6 +76,8 @@ public:
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
 
 protected:
+    virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE;
+
     // return the region with all the windows inside this static box excluded
     virtual WXHRGN MSWGetRegionWithoutChildren();
 
@@ -80,6 +92,9 @@ protected:
 
     void OnPaint(wxPaintEvent& event);
 
+private:
+    void PositionLabelWindow();
+
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox);
 };
 
diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 9ca1b792bd..97a48d7bb6 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -123,11 +123,25 @@ bool wxStaticBox::Create(wxWindow* parent,
     m_labelWin = labelWin;
     m_labelWin->Reparent(this);
 
-    m_labelWin->Move(FromDIP(LABEL_HORZ_OFFSET), 0);
+    PositionLabelWindow();
 
     return true;
 }
 
+void wxStaticBox::PositionLabelWindow()
+{
+    m_labelWin->SetSize(m_labelWin->GetBestSize());
+    m_labelWin->Move(FromDIP(LABEL_HORZ_OFFSET), 0);
+}
+
+wxWindowList wxStaticBox::GetCompositeWindowParts() const
+{
+    wxWindowList parts;
+    if ( m_labelWin )
+        parts.push_back(m_labelWin);
+    return parts;
+}
+
 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
@@ -191,6 +205,30 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
     *borderTop += FromDIP(LABEL_VERT_BORDER);
 }
 
+bool wxStaticBox::SetBackgroundColour(const wxColour& colour)
+{
+    // Do _not_ call the immediate base class method, we don't need to set the
+    // label window (which is the only sub-window of this composite window)
+    // background explicitly because it will almost always be a wxCheckBox or
+    // wxRadioButton which inherits its background from the box anyhow, so
+    // setting it would be at best useless.
+    return wxStaticBoxBase::SetBackgroundColour(colour);
+}
+
+bool wxStaticBox::SetFont(const wxFont& font)
+{
+    if ( !wxCompositeWindowSettersOnly<wxStaticBoxBase>::SetFont(font) )
+        return false;
+
+    // We need to reposition the label as its size may depend on the font.
+    if ( m_labelWin )
+    {
+        PositionLabelWindow();
+    }
+
+    return true;
+}
+
 WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
     if ( nMsg == WM_NCHITTEST )

From ca1b76ba4966844dce30ef91b9ab630d5d77322e Mon Sep 17 00:00:00 2001
From: New Pagodi <NewPagodi@users.noreply.github.com>
Date: Sun, 24 Dec 2017 18:23:13 -0600
Subject: [PATCH 066/916] Set a minimum size for MyGestureFrame

---
 samples/event/gestures.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/samples/event/gestures.cpp b/samples/event/gestures.cpp
index f28c53dc89..669d5972dc 100644
--- a/samples/event/gestures.cpp
+++ b/samples/event/gestures.cpp
@@ -17,6 +17,10 @@ MyGestureFrame::MyGestureFrame()
     sizer->Add(m_logText, wxSizerFlags().Expand());
     SetSizer(sizer);
 
+    // Set a minimum size for the frame
+    wxSize dsplySz = wxGetDisplaySize();
+    SetSizeHints(wxMin(800,dsplySz.GetWidth()), wxMin(600,dsplySz.GetHeight()));
+
     // Log to the text control
     delete wxLog::SetActiveTarget(new wxLogTextCtrl(m_logText));
 

From d3fd17db0457a5dedf85819434dcff8e9e5d96da Mon Sep 17 00:00:00 2001
From: New Pagodi <NewPagodi@users.noreply.github.com>
Date: Sun, 24 Dec 2017 18:24:05 -0600
Subject: [PATCH 067/916] Use wxAutoBufferedPaintDC to reduce flicker with
 wxMSW

---
 samples/event/gestures.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/event/gestures.cpp b/samples/event/gestures.cpp
index 669d5972dc..711d702e83 100644
--- a/samples/event/gestures.cpp
+++ b/samples/event/gestures.cpp
@@ -1,5 +1,6 @@
 #include "gestures.h"
 #include "wx/dcgraph.h"
+#include "wx/dcbuffer.h"
 
 #include "../image/horse.xpm"
 
@@ -40,6 +41,7 @@ MyGesturePanel::MyGesturePanel(MyGestureFrame *parent)
     : wxPanel(parent, wxID_ANY),
       m_bitmap(horse_xpm)
 {
+    SetBackgroundStyle(wxBG_STYLE_PAINT);
     Bind(wxEVT_PAINT, &MyGesturePanel::OnPaint, this);
 
     if ( !EnableTouchEvents(wxTOUCH_ALL_GESTURES) )
@@ -75,12 +77,10 @@ void MyGestureFrame::OnGesture(wxGestureEvent& event)
 
 void MyGesturePanel::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-    wxPaintDC paintDC(this);
+    wxAutoBufferedPaintDC paintDC(this);
+    paintDC.Clear();
 
     wxGCDC dc(paintDC);
-
-    dc.Clear();
-
     dc.SetTransformMatrix(m_affineMatrix);
     dc.DrawBitmap(m_bitmap, wxRound(m_translateDistance.m_x), wxRound(m_translateDistance.m_y));
 }

From 0fa033df61666f025df5bf3d13fc9bdae773a264 Mon Sep 17 00:00:00 2001
From: New Pagodi <NewPagodi@users.noreply.github.com>
Date: Sun, 24 Dec 2017 18:24:45 -0600
Subject: [PATCH 068/916] Remove newline characters from log message strings

---
 samples/event/gestures.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/samples/event/gestures.cpp b/samples/event/gestures.cpp
index 711d702e83..2356b667bc 100644
--- a/samples/event/gestures.cpp
+++ b/samples/event/gestures.cpp
@@ -89,7 +89,7 @@ void MyGesturePanel::OnPan(wxPanGestureEvent& event)
 {
     if ( event.IsGestureStart() )
     {
-        wxLogMessage("Pan gesture started\n");
+        wxLogMessage("Pan gesture started");
     }
 
     const wxPoint delta = event.GetDelta();
@@ -111,7 +111,7 @@ void MyGesturePanel::OnPan(wxPanGestureEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Pan gesture Ended\n");
+        wxLogMessage("Pan gesture Ended");
     }
 
     Refresh();
@@ -121,12 +121,12 @@ void MyGesturePanel::OnZoom(wxZoomGestureEvent& event)
 {
     if ( event.IsGestureStart() )
     {
-        wxLogMessage("Zoom gesture started\n");
+        wxLogMessage("Zoom gesture started");
 
         m_lastZoomFactor = 1.0;
     }
 
-    wxLogMessage("Zoom gesture performed with zoom center at (%d, %d) and zoom Factor = %f\n",
+    wxLogMessage("Zoom gesture performed with zoom center at (%d, %d) and zoom Factor = %f",
         event.GetPosition().x, event.GetPosition().y, event.GetZoomFactor());
 
     const wxPoint& zoomCenter = event.GetPosition();
@@ -140,7 +140,7 @@ void MyGesturePanel::OnZoom(wxZoomGestureEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Zoom gesture Ended\n");
+        wxLogMessage("Zoom gesture Ended");
     }
 
     m_lastZoomFactor = event.GetZoomFactor();
@@ -152,12 +152,12 @@ void MyGesturePanel::OnRotate(wxRotateGestureEvent& event)
 {
     if ( event.IsGestureStart() )
     {
-        wxLogMessage("Rotate gesture started\n");
+        wxLogMessage("Rotate gesture started");
 
         m_lastRotationAngle = 0.0;
     }
 
-    wxLogMessage("Rotate gesture performed with rotation center at (%d, %d) and cumulative rotation angle = %f\n",
+    wxLogMessage("Rotate gesture performed with rotation center at (%d, %d) and cumulative rotation angle = %f",
         event.GetPosition().x, event.GetPosition().y, event.GetRotationAngle());
 
     const wxPoint& rotationCenter = event.GetPosition();
@@ -171,7 +171,7 @@ void MyGesturePanel::OnRotate(wxRotateGestureEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Rotate gesture Ended\n");
+        wxLogMessage("Rotate gesture Ended");
     }
 
     m_lastRotationAngle = event.GetRotationAngle();
@@ -183,14 +183,14 @@ void MyGesturePanel::OnTwoFingerTap(wxTwoFingerTapEvent& event)
 {
     if ( event.IsGestureStart() )
     {
-        wxLogMessage("Two Finger Tap gesture gesture started\n");
+        wxLogMessage("Two Finger Tap gesture gesture started");
     }
 
-    wxLogMessage("Two Finger Tap gesture performed at (%d, %d)\n", event.GetPosition().x, event.GetPosition().y);
+    wxLogMessage("Two Finger Tap gesture performed at (%d, %d)", event.GetPosition().x, event.GetPosition().y);
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Two Finger Tap gesture Ended\n");
+        wxLogMessage("Two Finger Tap gesture Ended");
     }
 }
 
@@ -198,14 +198,14 @@ void MyGesturePanel::OnLongPress(wxLongPressEvent& event)
 {
     if ( event.IsGestureStart() )
     {
-        wxLogMessage("Long Press gesture started\n");
+        wxLogMessage("Long Press gesture started");
     }
 
-    wxLogMessage("Long Press gesture performed at (%d,%d)\n", event.GetPosition().x, event.GetPosition().y);
+    wxLogMessage("Long Press gesture performed at (%d,%d)", event.GetPosition().x, event.GetPosition().y);
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Long Press gesture Ended\n");
+        wxLogMessage("Long Press gesture Ended");
     }
 }
 
@@ -213,13 +213,13 @@ void MyGesturePanel::OnPressAndTap(wxPressAndTapEvent& event)
 {
     if ( event.IsGestureStart() )
     {
-        wxLogMessage("Press and Tap gesture started\n");
+        wxLogMessage("Press and Tap gesture started");
     }
 
-    wxLogMessage("Press and Tap gesture performed at (%d,%d)\n", event.GetPosition().x, event.GetPosition().y);
+    wxLogMessage("Press and Tap gesture performed at (%d,%d)", event.GetPosition().x, event.GetPosition().y);
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Press and Tap gesture Ended\n");
+        wxLogMessage("Press and Tap gesture Ended");
     }
 }

From a636141b56dc2ad2b84b183321471b9f83faa099 Mon Sep 17 00:00:00 2001
From: New Pagodi <NewPagodi@users.noreply.github.com>
Date: Sun, 24 Dec 2017 18:25:26 -0600
Subject: [PATCH 069/916] Use consistent letter case in log message strings

---
 samples/event/gestures.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/event/gestures.cpp b/samples/event/gestures.cpp
index 2356b667bc..8a030bff3f 100644
--- a/samples/event/gestures.cpp
+++ b/samples/event/gestures.cpp
@@ -111,7 +111,7 @@ void MyGesturePanel::OnPan(wxPanGestureEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Pan gesture Ended");
+        wxLogMessage("Pan gesture ended");
     }
 
     Refresh();
@@ -140,7 +140,7 @@ void MyGesturePanel::OnZoom(wxZoomGestureEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Zoom gesture Ended");
+        wxLogMessage("Zoom gesture ended");
     }
 
     m_lastZoomFactor = event.GetZoomFactor();
@@ -171,7 +171,7 @@ void MyGesturePanel::OnRotate(wxRotateGestureEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Rotate gesture Ended");
+        wxLogMessage("Rotate gesture ended");
     }
 
     m_lastRotationAngle = event.GetRotationAngle();
@@ -190,7 +190,7 @@ void MyGesturePanel::OnTwoFingerTap(wxTwoFingerTapEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Two Finger Tap gesture Ended");
+        wxLogMessage("Two Finger Tap gesture ended");
     }
 }
 
@@ -205,7 +205,7 @@ void MyGesturePanel::OnLongPress(wxLongPressEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Long Press gesture Ended");
+        wxLogMessage("Long Press gesture ended");
     }
 }
 
@@ -220,6 +220,6 @@ void MyGesturePanel::OnPressAndTap(wxPressAndTapEvent& event)
 
     if ( event.IsGestureEnd() )
     {
-        wxLogMessage("Press and Tap gesture Ended");
+        wxLogMessage("Press and Tap gesture ended");
     }
 }

From 610c16498816cf007e96ded5c9ede866b08a1a74 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Dec 2017 17:14:56 +0100
Subject: [PATCH 070/916] Always let DefWndProc() process column resizing in
 wxListCtrl

If we don't pass these messages to it, the selected items highlight
rectangle doesn't get updated when the columns are resized when using
visual themes, as could be seen in the listctrl sample.

While this did work if the wxEVT_LIST_COL_DRAGGING event handler skipped
the event, prefer to not require doing this as things work without this
call to wxEvent::Skip() under the other platforms and even MSW with
themes disabled.

Closes #18032.
---
 src/msw/listctrl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 5896a1db7d..ad763145ba 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -2716,6 +2716,12 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     // ---------------
     switch ( nmhdr->code )
     {
+        case HDN_ITEMCHANGING:
+            // Always let the default handling of this event take place,
+            // otherwise the selected items are not redrawn to correspond to
+            // the new column widths, see #18032.
+            return false;
+
         case LVN_DELETEALLITEMS:
             // always return true to suppress all additional LVN_DELETEITEM
             // notifications - this makes deleting all items from a list ctrl

From f32edbe1fcd523b359a4fb11e320645997b5ceaa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Dec 2017 18:45:06 +0100
Subject: [PATCH 071/916] Test wxTE_PROCESS_TAB support on text page of widgets
 sample too

Do it for completeness and symmetry with the already existing checkbox
enabling wxTE_PROCESS_ENTER.
---
 samples/widgets/textctrl.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index dad4d87c2b..f903b8d267 100644
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -115,6 +115,7 @@ static const struct ControlValues
     bool password;
     bool readonly;
     bool processEnter;
+    bool processTab;
     bool filename;
     bool noVertScrollbar;
 
@@ -130,6 +131,7 @@ static const struct ControlValues
     false,              // not password
     false,              // not readonly
     true,               // do process enter
+    false,              // do not process Tab
     false,              // not filename
     false,              // don't hide vertical scrollbar
     WrapStyle_Word,     // wrap on word boundaries
@@ -225,6 +227,7 @@ protected:
     wxCheckBox *m_chkPassword,
                *m_chkReadonly,
                *m_chkProcessEnter,
+               *m_chkProcessTab,
                *m_chkFilename,
                *m_chkNoVertScrollbar;
 
@@ -389,6 +392,7 @@ TextWidgetsPage::TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist)
     m_chkPassword =
     m_chkReadonly =
     m_chkProcessEnter =
+    m_chkProcessTab =
     m_chkFilename =
     m_chkNoVertScrollbar = (wxCheckBox *)NULL;
 
@@ -439,6 +443,9 @@ void TextWidgetsPage::CreateContent()
     m_chkProcessEnter = CreateCheckBoxAndAddToSizer(
                         sizerLeft, wxT("Process &Enter")
                     );
+    m_chkProcessTab = CreateCheckBoxAndAddToSizer(
+                        sizerLeft, wxT("Process &Tab")
+                    );
     m_chkFilename = CreateCheckBoxAndAddToSizer(
                         sizerLeft, wxT("&Filename control")
                     );
@@ -657,6 +664,7 @@ void TextWidgetsPage::Reset()
     m_chkPassword->SetValue(DEFAULTS.password);
     m_chkReadonly->SetValue(DEFAULTS.readonly);
     m_chkProcessEnter->SetValue(DEFAULTS.processEnter);
+    m_chkProcessTab->SetValue(DEFAULTS.processTab);
     m_chkFilename->SetValue(DEFAULTS.filename);
     m_chkNoVertScrollbar->SetValue(DEFAULTS.noVertScrollbar);
 
@@ -691,6 +699,8 @@ void TextWidgetsPage::CreateText()
         flags |= wxTE_READONLY;
     if ( m_chkProcessEnter->GetValue() )
         flags |= wxTE_PROCESS_ENTER;
+    if ( m_chkProcessTab->GetValue() )
+        flags |= wxTE_PROCESS_TAB;
     if ( m_chkNoVertScrollbar->GetValue() )
         flags |= wxTE_NO_VSCROLL;
 
@@ -960,6 +970,7 @@ void TextWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
                   (m_chkPassword->GetValue() != DEFAULTS.password) ||
                   (m_chkReadonly->GetValue() != DEFAULTS.readonly) ||
                   (m_chkProcessEnter->GetValue() != DEFAULTS.processEnter) ||
+                  (m_chkProcessTab->GetValue() != DEFAULTS.processTab) ||
                   (m_chkFilename->GetValue() != DEFAULTS.filename) ||
                   (m_chkNoVertScrollbar->GetValue() != DEFAULTS.noVertScrollbar) ||
                   (m_radioWrap->GetSelection() != DEFAULTS.wrapStyle) );

From 5a949efc5c9ebe5e455d5a82492a6fd303f29991 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Dec 2017 19:29:25 +0100
Subject: [PATCH 072/916] Fix sending wxEVT_TEXT_ENTER when using
 auto-completion in wxMSW

We need to explicitly generate this event from the char hook handler as
we don't get the normal WM_CHAR for it, it is apparently intercepted by
the window proc installed by the auto-completing code, so check if
wxTE_PROCESS_ENTER is used for the text entry and call a special new
MSWProcessSpecialKey() method to do the right thing if it is.

Similarly, handle Tab presses correctly if wxTE_PROCESS_TAB is used.

Closes #12613.
---
 docs/changes.txt           |   1 +
 include/wx/msw/combobox.h  |   8 +++
 include/wx/msw/textctrl.h  |   4 ++
 include/wx/msw/textentry.h |  10 ++++
 src/msw/combobox.cpp       | 105 ++++++++++++++++++++++---------------
 src/msw/textctrl.cpp       |  13 +++++
 src/msw/textentry.cpp      |  54 ++++++++++++++++---
 7 files changed, 144 insertions(+), 51 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 676a77fc19..3f776b10b2 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -232,6 +232,7 @@ wxMSW:
 - Implement SetIcon(), SetPosition(), GetPosition() for native wxProgressDialog.
 - Fix focus-related problems when using native wxProgressDialog.
 - Fix crash when reparenting the currently focused window to another TLW.
+- Fix sending wxEVT_TEXT_ENTER when using auto-completion (Dubby).
 
 wxOSX:
 
diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 329c10adb1..027b7c277e 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -158,6 +158,14 @@ private:
     virtual wxWindow *GetEditableWindow() wxOVERRIDE;
     virtual WXHWND GetEditHWND() const wxOVERRIDE;
 
+    // Common part of MSWProcessEditMsg() and MSWProcessSpecialKey(), return
+    // true if the key was processed.
+    bool MSWProcessEditSpecialKey(WXWPARAM vkey);
+
+#if wxUSE_OLE
+    virtual void MSWProcessSpecialKey(wxKeyEvent& event) wxOVERRIDE;
+#endif // wxUSE_OLE
+
     // common part of all ctors
     void Init()
     {
diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index a3d5870532..4fe3a470e6 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -277,6 +277,10 @@ private:
     // the simple EDIT controls
     virtual WXHWND GetEditHWND() const wxOVERRIDE { return m_hWnd; }
 
+#if wxUSE_OLE
+    virtual void MSWProcessSpecialKey(wxKeyEvent& event) wxOVERRIDE;
+#endif // wxUSE_OLE
+
     void OnKeyDown(wxKeyEvent& event);
 
     // Used by EN_MAXTEXT handler to increase the size limit (will do nothing
diff --git a/include/wx/msw/textentry.h b/include/wx/msw/textentry.h
index 8f9d92ba95..5d3a0d9e8a 100644
--- a/include/wx/msw/textentry.h
+++ b/include/wx/msw/textentry.h
@@ -86,6 +86,16 @@ private:
     virtual WXHWND GetEditHWND() const = 0;
 
 #if wxUSE_OLE
+    // This method is called to process special keys such as Return and Tab
+    // before they're consumed by the auto-completer. Notice that it is only
+    // called if we do need to process the key, i.e. if the corresponding
+    // wxTE_PROCESS_XXX style is set in the associated object.
+    //
+    // It is not pure virtual because it won't get called if the derived class
+    // doesn't use auto-completer, but it does need to be overridden if it can
+    // be called and the default implementation asserts if this is not the case.
+    virtual void MSWProcessSpecialKey(wxKeyEvent& event);
+
     // Get the auto-complete object creating it if necessary. Returns NULL if
     // creating it failed.
     wxTextAutoCompleteData *GetOrCreateCompleter();
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 47b288f86b..999cac1717 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -218,54 +218,63 @@ WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
     return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
 }
 
+bool wxComboBox::MSWProcessEditSpecialKey(WXWPARAM vkey)
+{
+    // for compatibility with wxTextCtrl, generate a special message
+    // when Enter is pressed
+    switch ( vkey )
+    {
+        case VK_RETURN:
+            {
+                if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
+                    break;
+
+                wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
+
+                const int sel = GetSelection();
+                event.SetInt(sel);
+                event.SetString(GetValue());
+                InitCommandEventWithItems(event, sel);
+
+                if ( ProcessCommand(event) )
+                {
+                    // don't let the event through to the native control
+                    // because it doesn't need it and may generate an annoying
+                    // beep if it gets it
+                    return true;
+                }
+            }
+            break;
+
+        case VK_TAB:
+            // If we have wxTE_PROCESS_ENTER style, we get all char
+            // events, including those for TAB which are usually used
+            // for keyboard navigation, but we should not process them
+            // unless we also have wxTE_PROCESS_TAB style.
+            if ( !HasFlag(wxTE_PROCESS_TAB) )
+            {
+                int flags = 0;
+                if ( !wxIsShiftDown() )
+                    flags |= wxNavigationKeyEvent::IsForward;
+                if ( wxIsCtrlDown() )
+                    flags |= wxNavigationKeyEvent::WinChange;
+                if ( Navigate(flags) )
+                    return true;
+            }
+            break;
+    }
+
+    return false;
+}
+
 bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 {
     switch ( msg )
     {
         case WM_CHAR:
-            // for compatibility with wxTextCtrl, generate a special message
-            // when Enter is pressed
-            switch ( wParam )
-            {
-                case VK_RETURN:
-                    {
-                        if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
-                            return false;
-
-                        wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
-
-                        const int sel = GetSelection();
-                        event.SetInt(sel);
-                        event.SetString(GetValue());
-                        InitCommandEventWithItems(event, sel);
-
-                        if ( ProcessCommand(event) )
-                        {
-                            // don't let the event through to the native control
-                            // because it doesn't need it and may generate an annoying
-                            // beep if it gets it
-                            return true;
-                        }
-                    }
-                    break;
-
-                case VK_TAB:
-                    // If we have wxTE_PROCESS_ENTER style, we get all char
-                    // events, including those for TAB which are usually used
-                    // for keyboard navigation, but we should not process them
-                    // unless we also have wxTE_PROCESS_TAB style.
-                    if ( !HasFlag(wxTE_PROCESS_TAB) )
-                    {
-                        int flags = 0;
-                        if ( !wxIsShiftDown() )
-                            flags |= wxNavigationKeyEvent::IsForward;
-                        if ( wxIsCtrlDown() )
-                            flags |= wxNavigationKeyEvent::WinChange;
-                        if ( Navigate(flags) )
-                            return true;
-                    }
-                    break;
-            }
+            if ( MSWProcessEditSpecialKey(wParam) )
+                return true;
+            break;
     }
 
     if ( ShouldForwardFromEditToCombo(msg) )
@@ -383,6 +392,16 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
     return wxChoice::MSWShouldPreProcessMessage(pMsg);
 }
 
+#if wxUSE_OLE
+
+void wxComboBox::MSWProcessSpecialKey(wxKeyEvent& event)
+{
+    if ( !MSWProcessEditSpecialKey(event.GetRawKeyCode()) )
+        event.Skip();
+}
+
+#endif // wxUSE_OLE
+
 WXHWND wxComboBox::GetEditHWNDIfAvailable() const
 {
     WinStruct<COMBOBOXINFO> info;
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index ddc02dec39..2f7bc4d21a 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2103,6 +2103,19 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     event.Skip();
 }
 
+#if wxUSE_OLE
+
+void wxTextCtrl::MSWProcessSpecialKey(wxKeyEvent& event)
+{
+    // It is not a good idea, in general, to manually call another event
+    // handler, but here we need to do exactly the same thing as in OnChar()
+    // above, so it doesn't seem to make much sense to add another function to
+    // forward to when we can just call it directly.
+    OnChar(event);
+}
+
+#endif // wxUSE_OLE
+
 void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
 {
     // richedit control doesn't send WM_PASTE, WM_CUT and WM_COPY messages
diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index 97956296ab..46246846ca 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -573,21 +573,54 @@ private:
 
     void OnCharHook(wxKeyEvent& event)
     {
-        // If the autocomplete drop-down list is currently displayed when the
-        // user presses Escape, we need to dismiss it manually from here as
-        // Escape could be eaten by something else (e.g. EVT_CHAR_HOOK in the
-        // dialog that this control is found in) otherwise.
-        if ( event.GetKeyCode() == WXK_ESCAPE )
+        // We need to override the default handling of some keys here.
+        bool specialKey = false;
+        switch ( event.GetKeyCode() )
         {
+            case WXK_RETURN:
+                if ( m_win->HasFlag(wxTE_PROCESS_ENTER) )
+                    specialKey = true;
+                break;
+
+            case WXK_TAB:
+                if ( m_win->HasFlag(wxTE_PROCESS_TAB) )
+                    specialKey = true;
+                break;
+
+            case WXK_ESCAPE:
+                specialKey = true;
+                break;
+        }
+
+        if ( specialKey )
+        {
+            // Check if the drop down is currently open.
             DWORD dwFlags = 0;
             if ( SUCCEEDED(m_autoCompleteDropDown->GetDropDownStatus(&dwFlags,
                                                                      NULL))
                     && dwFlags == ACDD_VISIBLE )
             {
-                ::SendMessage(GetHwndOf(m_win), WM_KEYDOWN, WXK_ESCAPE, 0);
+                if ( event.GetKeyCode() == WXK_ESCAPE )
+                {
+                    // We need to dismiss the drop-down manually as Escape
+                    // could be eaten by something else (e.g. EVT_CHAR_HOOK in
+                    // the dialog that this control is found in) otherwise.
+                    ::SendMessage(GetHwndOf(m_win), WM_KEYDOWN, WXK_ESCAPE, 0);
 
-                // Do not skip the event in this case, we've already handled it.
-                return;
+                    // Do not skip the event in this case, we've already handled it.
+                    return;
+                }
+            }
+            else // Drop down is not open.
+            {
+                // In this case we need to handle Return and Tab as both of
+                // them are simply eaten by the auto completer and never reach
+                // us at all otherwise.
+                if ( event.GetKeyCode() != WXK_ESCAPE )
+                {
+                    m_entry->MSWProcessSpecialKey(event);
+                    return;
+                }
             }
         }
 
@@ -804,6 +837,11 @@ bool wxTextEntry::DoAutoCompleteFileNames(int flags)
 
 #endif // wxUSE_DYNLIB_CLASS
 
+void wxTextEntry::MSWProcessSpecialKey(wxKeyEvent& WXUNUSED(event))
+{
+    wxFAIL_MSG(wxS("Must be overridden if can be called"));
+}
+
 wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter()
 {
     if ( !m_autoCompleteData )

From 079069834514b86bc0fa3d64a3a5e680b89648ec Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Tue, 26 Dec 2017 00:25:52 +0100
Subject: [PATCH 073/916] Use postfix operator when iterating over containers.

---
 src/common/any.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/any.cpp b/src/common/any.cpp
index b4141c47e5..a8ba6577c8 100644
--- a/src/common/any.cpp
+++ b/src/common/any.cpp
@@ -102,7 +102,7 @@ public:
             return it->second;
 
         // Finally, attempt to find a compatible type
-        for ( it = anyToVariant.begin(); it != anyToVariant.end(); it++ )
+        for ( it = anyToVariant.begin(); it != anyToVariant.end(); ++it )
         {
             if ( type->IsSameType(it->first) )
             {

From c697b62d461fa3ba0794fac2387ad6b75a2f133f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Dec 2017 19:29:25 +0100
Subject: [PATCH 074/916] Compilation fix for PCH-less build after last commit

Include the headers required by the new code in src/msw/textentry.cpp.

See #12613.
---
 src/msw/textentry.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index 46246846ca..3acd21fff1 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -24,7 +24,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/arrstr.h"
+    #include "wx/event.h"
     #include "wx/string.h"
+    #include "wx/textctrl.h"    // Only for wxTE_PROCESS_XXX constants
 #endif // WX_PRECOMP
 
 #if wxUSE_TEXTCTRL || wxUSE_COMBOBOX

From f83d16aa460119d8788ac296612a228b4cebfc34 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 26 Dec 2017 04:29:42 +0100
Subject: [PATCH 075/916] Undefine min and max before using them in wx/valnum.h

Avoid problems when using this header in code also include <windows.h>
(and not doing it via wx/msw/wrapwin.h) by ensuring that min and max
used here are not defined as macros.
---
 include/wx/valnum.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/wx/valnum.h b/include/wx/valnum.h
index 166206138d..540f9d6b82 100644
--- a/include/wx/valnum.h
+++ b/include/wx/valnum.h
@@ -18,6 +18,12 @@
 #include "wx/textentry.h"
 #include "wx/validate.h"
 
+// This header uses std::numeric_limits<>::min/max, but these symbols are,
+// unfortunately, often defined as macros and the code here wouldn't compile in
+// this case, so preventively undefine them to avoid this problem.
+#undef min
+#undef max
+
 #include <limits>
 
 // Bit masks used for numeric validator styles.

From f423b88deda58d62a5b6f2f1db7b926aa10f6eda Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Wed, 27 Dec 2017 14:00:44 +0100
Subject: [PATCH 076/916] Replace post-increment on iterators with
 pre-increment

This is a micro-optimization, as pre-increment is at least as efficient
as post-increment and typically slightly more so because it doesn't need
to make a copy of the iterator, and better conforms to the prevailing
C++ style.

Closes https://github.com/wxWidgets/wxWidgets/pull/655
---
 src/common/datavcmn.cpp   | 4 ++--
 src/common/menucmn.cpp    | 2 +-
 src/common/tarstrm.cpp    | 2 +-
 src/generic/datavgen.cpp  | 2 +-
 src/generic/notifmsgg.cpp | 4 ++--
 src/msw/menu.cpp          | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 8e05377d40..0f2ccc24b8 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -2734,7 +2734,7 @@ unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDat
     if (!node) return 0;
 
     wxDataViewTreeStoreNodeList::iterator iter;
-    for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++)
+    for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); ++iter)
     {
         wxDataViewTreeStoreNode* child = *iter;
         children.Add( child->GetItem() );
@@ -2939,7 +2939,7 @@ void wxDataViewTreeCtrl::DeleteChildren( const wxDataViewItem& item )
 
     wxDataViewItemArray array;
     wxDataViewTreeStoreNodeList::iterator iter;
-    for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++)
+    for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); ++iter)
     {
         wxDataViewTreeStoreNode* child = *iter;
         array.Add( child->GetItem() );
diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 2808af69d6..7c12f30765 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -982,7 +982,7 @@ wxMenuItem *wxMenuBarBase::FindItem(int itemid, wxMenu **menu) const
     wxMenuItem *item = NULL;
     size_t count = GetMenuCount(), i;
     wxMenuList::const_iterator it;
-    for ( i = 0, it = m_menus.begin(); !item && (i < count); i++, it++ )
+    for ( i = 0, it = m_menus.begin(); !item && (i < count); i++, ++it )
     {
         item = (*it)->FindItem(itemid, menu);
     }
diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index f56a0d530b..f080e759de 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -903,7 +903,7 @@ wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const
         wxTarNumber n = 0;
         wxString::const_iterator p = value.begin();
         while (p != value.end() && *p == ' ')
-            p++;
+            ++p;
         while (isdigit(*p))
             n = n * 10 + (*p++ - '0');
         return n;
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 9cc10f4e0e..17a8e5bddb 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -3654,7 +3654,7 @@ public:
 
         if( node->GetItem() == *m_iter )
         {
-            m_iter++;
+            ++m_iter;
             return DoJob::CONTINUE;
         }
         else
diff --git a/src/generic/notifmsgg.cpp b/src/generic/notifmsgg.cpp
index c126948c6f..34ed4828ba 100644
--- a/src/generic/notifmsgg.cpp
+++ b/src/generic/notifmsgg.cpp
@@ -327,7 +327,7 @@ void wxNotificationMessageWindow::AddVisibleNotification(wxNotificationMessageWi
 {
     bool found = false;
     for ( wxVector<wxNotificationMessageWindow*>::iterator it = ms_visibleNotifications.begin();
-        it != ms_visibleNotifications.end(); it++ )
+        it != ms_visibleNotifications.end(); ++it )
     {
         if ( *it == notif )
         {
@@ -345,7 +345,7 @@ void wxNotificationMessageWindow::AddVisibleNotification(wxNotificationMessageWi
 void wxNotificationMessageWindow::RemoveVisibleNotification(wxNotificationMessageWindow* notif)
 {
     for ( wxVector<wxNotificationMessageWindow*>::iterator it = ms_visibleNotifications.begin();
-        it != ms_visibleNotifications.end(); it++ )
+        it != ms_visibleNotifications.end(); ++it )
     {
         if ( *it == notif )
         {
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 1f88d96a92..1378f51131 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -1195,7 +1195,7 @@ void wxMenuBar::RebuildAccelTable()
     size_t nAccelCount = 0;
     size_t i, count = GetMenuCount();
     wxMenuList::iterator it;
-    for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
+    for ( i = 0, it = m_menus.begin(); i < count; i++, ++it )
     {
         nAccelCount += (*it)->GetAccelCount();
     }
@@ -1205,7 +1205,7 @@ void wxMenuBar::RebuildAccelTable()
         wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
 
         nAccelCount = 0;
-        for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
+        for ( i = 0, it = m_menus.begin(); i < count; i++, ++it )
         {
             nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
         }

From f4b56f67ec3168d8b2cca7310dd4679a7c67a95b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bron?= <frederic.bron@m4x.org>
Date: Wed, 27 Dec 2017 16:56:50 +0100
Subject: [PATCH 077/916] Improve documentation of
 wxPropertyGrid::MakeColumnEditable()

Explain that column must be different from 1 in the documentation and in
the (already existing) assert checking it.

Closes https://github.com/wxWidgets/wxWidgets/pull/656
---
 interface/wx/propgrid/propgrid.h | 4 ++++
 src/propgrid/propgrid.cpp        | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/interface/wx/propgrid/propgrid.h b/interface/wx/propgrid/propgrid.h
index 226533c21c..2e7bf51563 100644
--- a/interface/wx/propgrid/propgrid.h
+++ b/interface/wx/propgrid/propgrid.h
@@ -942,6 +942,10 @@ public:
         @param editable
             Using @false here will disable column from being editable.
 
+        Note that @a column must not be equal to 1, as the second column is
+        always editable and can be made read-only only on cell-by-cell basis
+        using @code wxPGProperty::ChangeFlag(wxPG_PROP_READONLY, true) @endcode
+
         @see BeginLabelEdit(), EndLabelEdit()
     */
     void MakeColumnEditable( unsigned int column, bool editable = true );
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 6ced9091b7..3bc9611f1a 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -964,7 +964,13 @@ void wxPropertyGrid::DoSetSelection( const wxArrayPGProperty& newSelection,
 void wxPropertyGrid::MakeColumnEditable( unsigned int column,
                                          bool editable )
 {
-    wxASSERT( column != 1 );
+    // The second column is always editable. To make it read-only is a property
+    // by property decision by setting its wxPG_PROP_READONLY flag.
+    wxASSERT_MSG
+    (
+         column != 1,
+         wxS("Set wxPG_PROP_READONLY property flag instead")
+    );
 
     wxArrayInt& cols = m_pState->m_editableColumns;
 

From 6c7aaa9e95c4c0f3c73206b58595d1ecf60a9586 Mon Sep 17 00:00:00 2001
From: adrian5 <adrian5@users.noreply.github.com>
Date: Fri, 29 Dec 2017 19:28:03 +0100
Subject: [PATCH 078/916] Improve wording and formatting in "Hello World"
 example

Minor fixes to the "Hello World" example in the manual to make its style
more consistent and the text more readable.

Closes https://github.com/wxWidgets/wxWidgets/pull/657
---
 docs/doxygen/overviews/helloworld.h | 121 ++++++++++++++--------------
 1 file changed, 61 insertions(+), 60 deletions(-)

diff --git a/docs/doxygen/overviews/helloworld.h b/docs/doxygen/overviews/helloworld.h
index 8b2fefa5f7..ddb6c344ab 100644
--- a/docs/doxygen/overviews/helloworld.h
+++ b/docs/doxygen/overviews/helloworld.h
@@ -24,7 +24,7 @@ them). For the platforms with support for precompiled headers, as indicated by
 only include it for the other ones:
 
 @code
-// wxWidgets "Hello world" Program
+// wxWidgets "Hello World" Program
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
@@ -35,11 +35,11 @@ only include it for the other ones:
 @endcode
 
 Practically every app should define a new class derived from wxApp. By
-overriding wxApp's OnInit() virtual method the program can be initialized, e.g.
-by creating a new main window.
+overriding wxApp's OnInit() virtual method the program can be initialized,
+e.g. by creating a new main window.
 
 @code
-class MyApp: public wxApp
+class MyApp : public wxApp
 {
 public:
     virtual bool OnInit();
@@ -48,20 +48,20 @@ public:
 
 The main window is created by deriving a class from wxFrame and giving it a
 menu and a status bar in its constructor. Also, any class that wishes to
-respond to any "event" (such as mouse clicks or messages from the menu or a
+respond to an "event" (such as mouse clicks, messages from the menu, or a
 button) must declare an event table using the macro below.
 
-Finally, the way to react to such events must be done in "event handlers" which
-are just functions (or functors, including lambdas if you're using C++11)
+Finally, reacting to such events is done via "event handlers" which are
+just functions (or functors, including lambdas if you're using C++11)
 taking the @c event parameter of the type corresponding to the event being
 handled, e.g. wxCommandEvent for the events from simple controls such as
-buttons, text fields and also menu items. In our sample, we react to three menu
-items, one for our custom menu command and two for the standard "Exit" and
-"About" commands (any program should normally implement the latter two). Notice
-that these handlers don't need to be neither virtual nor public.
+buttons, text fields and also menu items. In our example, we react to three
+menu items: our custom "Hello", and the "Exit" and "About" items (any program
+should normally implement the latter two). Notice that these handlers don't
+need to be virtual or public.
 
 @code
-class MyFrame: public wxFrame
+class MyFrame : public wxFrame
 {
 public:
     MyFrame();
@@ -84,13 +84,13 @@ enum
 };
 @endcode
 
-Notice that you don't need to define identifiers for the "About" and "Exit" as
-wxWidgets already predefines and the standard values such as wxID_ABOUT and
-wxID_EXIT should be used whenever possible, as they can be handled in a special
+Notice that you don't need to define identifiers for "About" and "Exit", as
+wxWidgets already predefines standard values such as wxID_ABOUT and wxID_EXIT.
+You should use these whenever possible, as they can be handled in a special
 way by a particular platform.
 
-As in all programs there must be a "main" function. Under wxWidgets main is
-implemented inside ::wxIMPLEMENT_APP() macro, which creates an application
+As in all programs, there must be a "main" function. Under wxWidgets, main is
+implemented inside the ::wxIMPLEMENT_APP() macro, which creates an application
 instance of the specified class and starts running the GUI event loop. It is
 used simply as:
 
@@ -100,23 +100,23 @@ wxIMPLEMENT_APP(MyApp);
 
 As mentioned above, wxApp::OnInit() is called upon startup and should be used
 to initialize the program, maybe showing a "splash screen" and creating the
-main window (or several). As frames are created hidden by default, to allow
-creating their child windows before showing them, we also need to explicitly
-show it to make it appear on the screen. Finally, we return @true from this
-method to indicate successful initialization:
+main window (or several). Frames are created hidden by default, to allow the
+creation of child windows before displaying them. We thus need to explicitly
+show them. Finally, we return @true from this method to indicate successful
+initialization:
 
 @code
 bool MyApp::OnInit()
 {
     MyFrame *frame = new MyFrame();
-    frame->Show( true );
+    frame->Show(true);
     return true;
 }
 @endcode
 
-In the constructor of the main window (or later on) we create a menu with our
-menu items as well as a status bar to be shown at the bottom of the main
-window. Both have to be associated with the frame with respective calls.
+In the constructor of the main window (or later on), we create a menu with our
+menu items, as well as a status bar to be shown at the bottom of the main
+window. Both have to be bound to the frame with respective calls.
 
 @code
 MyFrame::MyFrame()
@@ -132,39 +132,40 @@ MyFrame::MyFrame()
     menuHelp->Append(wxID_ABOUT);
 
     wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append( menuFile, "&File" );
-    menuBar->Append( menuHelp, "&Help" );
+    menuBar->Append(menuFile, "&File");
+    menuBar->Append(menuHelp, "&Help");
 
-    SetMenuBar( menuBar );
+    SetMenuBar(menuBar);
 
     CreateStatusBar();
-    SetStatusText( "Welcome to wxWidgets!" );
+    SetStatusText("Welcome to wxWidgets!");
 
     ... continued below ...
 @endcode
 
 Notice that we don't need to specify the labels for the standard menu items
-@c wxID_ABOUT and @c wxID_EXIT, they will be given standard (even correctly
-translated) labels and also standard accelerators correct for the current
-platform making your program behaviour more native. For this reason you should
-prefer reusing the standard ids (see @ref page_stockitems) if possible.
+@c wxID_ABOUT and @c wxID_EXIT — they will be given standard (even correctly
+translated) labels and standard accelerators correct for the current
+platform, making our program behaviour more native. For this reason, you
+should prefer reusing the standard ids (see @ref page_stockitems) where
+possible.
 
-We also have to actually connect our event handlers to the events we want to
-handle in them, by calling Bind() to send all the menu events, identified by
-wxEVT_MENU event type, with the specified ID to the given function. The
+We also have to connect our event handlers to the events we want to handle in
+them. We do this by calling Bind() to send all the menu events (identified by
+wxEVT_MENU event type) with the specified ID to the given function. The
 parameters we pass to Bind() are
 
--# The event type, e.g. wxEVT_MENU or wxEVT_BUTTON or wxEVT_SIZE or one
+-# The event type, e.g. wxEVT_MENU, wxEVT_BUTTON, wxEVT_SIZE, or one
    of many other events used by wxWidgets.
--# Pointer to the member function to call and the object to call it on. In
-   this case we just call our own function, hence we pass `this` for this
-   object itself, but we could call a member function of another object too.
-   And we could could also use a non-member function here, and, in fact,
-   anything that can be called passing it a wxCommandEvent could be used here.
--# The optional identifier allowing to select just some events of wxEVT_MENU
+-# A Pointer to the method to call, and the object to call it on. In
+   this case, we just call our own function, and pass the `this` pointer
+   for the object itself. We could instead call the method of another object,
+   or a non-member function — in fact, any object that can be called with a
+   wxCommandEvent, can be used here.
+-# An optional identifier, allowing us to select just some events of wxEVT_MENU
    type, namely those from the menu item with the given ID, instead of handling
-   all of them in the provided handler. This is especially useful with the menu
-   items and rarely used with other kinds of events.
+   all of them in the provided handler. This is mainly useful with menu items
+   and rarely with other kinds of events.
 
 @code
     ... continued from above ...
@@ -183,7 +184,7 @@ If there is no other main window left, the application will quit.
 @code
 void MyFrame::OnExit(wxCommandEvent& event)
 {
-    Close( true );
+    Close(true);
 }
 @endcode
 
@@ -193,14 +194,14 @@ case a typical "About" window with information about the program.
 @code
 void MyFrame::OnAbout(wxCommandEvent& event)
 {
-    wxMessageBox( "This is a wxWidgets' Hello world sample",
-                  "About Hello World", wxOK | wxICON_INFORMATION );
+    wxMessageBox("This is a wxWidgets Hello World example",
+                 "About Hello World", wxOK | wxICON_INFORMATION);
 }
 @endcode
 
 The implementation of custom menu command handler may perform whatever task
 your program needs to do, in this case we will simply show a message from it as
-befits a hello world example:
+befits a Hello World example:
 
 @code
 void MyFrame::OnHello(wxCommandEvent& event)
@@ -223,7 +224,7 @@ void MyFrame::OnHello(wxCommandEvent& event)
 Here is the entire program that can be copied and pasted:
 
 @code
-// wxWidgets "Hello world" Program
+// wxWidgets "Hello World" Program
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
@@ -232,13 +233,13 @@ Here is the entire program that can be copied and pasted:
     #include <wx/wx.h>
 #endif
 
-class MyApp: public wxApp
+class MyApp : public wxApp
 {
 public:
     virtual bool OnInit();
 };
 
-class MyFrame: public wxFrame
+class MyFrame : public wxFrame
 {
 public:
     MyFrame();
@@ -259,12 +260,12 @@ wxIMPLEMENT_APP(MyApp);
 bool MyApp::OnInit()
 {
     MyFrame *frame = new MyFrame();
-    frame->Show( true );
+    frame->Show(true);
     return true;
 }
 
 MyFrame::MyFrame()
-        : wxFrame(NULL, wxID_ANY, "Hello World")
+    : wxFrame(NULL, wxID_ANY, "Hello World")
 {
     wxMenu *menuFile = new wxMenu;
     menuFile->Append(ID_Hello, "&Hello...\tCtrl-H",
@@ -276,13 +277,13 @@ MyFrame::MyFrame()
     menuHelp->Append(wxID_ABOUT);
 
     wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append( menuFile, "&File" );
-    menuBar->Append( menuHelp, "&Help" );
+    menuBar->Append(menuFile, "&File");
+    menuBar->Append(menuHelp, "&Help");
 
     SetMenuBar( menuBar );
 
     CreateStatusBar();
-    SetStatusText( "Welcome to wxWidgets!" );
+    SetStatusText("Welcome to wxWidgets!");
 
     Bind(wxEVT_MENU, &MyFrame::OnHello, this, ID_Hello);
     Bind(wxEVT_MENU, &MyFrame::OnAbout, this, wxID_ABOUT);
@@ -291,13 +292,13 @@ MyFrame::MyFrame()
 
 void MyFrame::OnExit(wxCommandEvent& event)
 {
-    Close( true );
+    Close(true);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& event)
 {
-    wxMessageBox( "This is a wxWidgets' Hello world sample",
-                  "About Hello World", wxOK | wxICON_INFORMATION );
+    wxMessageBox("This is a wxWidgets Hello World example",
+                 "About Hello World", wxOK | wxICON_INFORMATION);
 }
 
 void MyFrame::OnHello(wxCommandEvent& event)

From c65eaac529c623b1357b34e32b58b59137f5a2a5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Dec 2017 18:51:05 +0100
Subject: [PATCH 079/916] Fix harmless warning about comparing values of
 different enums

This avoids a bunch of -Wenum-compare-switch warnings from clang 6.
---
 src/generic/dcpsg.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index a6375b0c6b..295c7c7650 100644
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1097,8 +1097,8 @@ void wxPostScriptDCImpl::SetPSFont()
     wxString name;
     switch ( m_font.GetFamily() )
     {
-        case wxTELETYPE:
-        case wxMODERN:
+        case wxFONTFAMILY_TELETYPE:
+        case wxFONTFAMILY_MODERN:
         {
             if (Style == wxFONTSTYLE_ITALIC)
             {
@@ -1116,7 +1116,7 @@ void wxPostScriptDCImpl::SetPSFont()
             }
             break;
         }
-        case wxROMAN:
+        case wxFONTFAMILY_ROMAN:
         {
             if (Style == wxFONTSTYLE_ITALIC)
             {
@@ -1134,12 +1134,12 @@ void wxPostScriptDCImpl::SetPSFont()
             }
             break;
         }
-        case wxSCRIPT:
+        case wxFONTFAMILY_SCRIPT:
         {
             name = wxS("/ZapfChancery-MediumItalic");
             break;
         }
-        case wxSWISS:
+        case wxFONTFAMILY_SWISS:
         default:
         {
             if (Style == wxFONTSTYLE_ITALIC)

From 69cd6039eb3b1e5559121e9d2e7fe2299a814fb7 Mon Sep 17 00:00:00 2001
From: nowhere <nowhere@trac.wxwidgets.org>
Date: Sat, 30 Dec 2017 18:52:36 +0100
Subject: [PATCH 080/916] Make parsing WAV data more robust

Check that we have enough data in the input instead of happily reading
out of bounds memory.

This fixes the most common problem of crashing on bad data which doesn't
look like WAV at all, but doesn't fix problems with parsing input which
does look like WAV, but is incorrect -- this will be done in subsequent
commits.
---
 src/unix/sound.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index ae38289009..2227b117d1 100644
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -651,14 +651,6 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
     waveformat.uiBlockAlign = wxUINT16_SWAP_ON_BE(waveformat.uiBlockAlign);
     waveformat.uiBitsPerSample = wxUINT16_SWAP_ON_BE(waveformat.uiBitsPerSample);
 
-    // get the sound data size
-    wxUint32 ul;
-    memcpy(&ul, &data[FMT_INDEX + waveformat.uiSize + 12], 4);
-    ul = wxUINT32_SWAP_ON_BE(ul);
-
-    if ( length < ul + FMT_INDEX + waveformat.uiSize + 16 )
-        return false;
-
     if (memcmp(data, "RIFF", 4) != 0)
         return false;
     if (memcmp(&data[WAVE_INDEX], "WAVE", 4) != 0)
@@ -675,6 +667,24 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
         waveformat.ulAvgBytesPerSec / waveformat.uiBlockAlign)
         return false;
 
+    // get file size from header
+    wxUint32 chunkSize;
+    memcpy(&chunkSize, &data[4], 4);
+    chunkSize = wxUINT32_SWAP_ON_BE(chunkSize);
+
+    // ensure file length is at least length in header
+    if (chunkSize > length - 8)
+        return false;
+
+    // get the sound data size
+    wxUint32 ul;
+    memcpy(&ul, &data[FMT_INDEX + waveformat.uiSize + 12], 4);
+    ul = wxUINT32_SWAP_ON_BE(ul);
+
+    // ensure we actually have at least that much data in the input
+    if (ul > length - FMT_INDEX - waveformat.uiSize - 16)
+        return false;
+
     m_data = new wxSoundData;
     m_data->m_channels = waveformat.uiChannels;
     m_data->m_samplingRate = waveformat.ulSamplesPerSec;

From 45e8d13e1304f39fdf763ec06a9443d3a4df06f3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Dec 2017 17:28:27 +0100
Subject: [PATCH 081/916] Add format sub-chunk size check to WAV parsing

This fixes a crash due to reading beyond the buffer bounds when checking
for "data" if WAVEFORMAT::uiSize was too big.
---
 src/unix/sound.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index 2227b117d1..53e3f31240 100644
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -657,6 +657,12 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
         return false;
     if (memcmp(&data[FMT_INDEX], "fmt ", 4) != 0)
         return false;
+
+    // Check that the format chunk size is correct: it must be 16 for PCM,
+    // which is the only format we handle.
+    if (waveformat.uiSize != 16)
+        return false;
+
     if (memcmp(&data[FMT_INDEX + waveformat.uiSize + 8], "data", 4) != 0)
         return false;
 

From 932f384c87959790fc47fe1099c8ac54530c1b3d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Dec 2017 17:37:21 +0100
Subject: [PATCH 082/916] Avoid division by 0 when parsing WAV data

Don't divide by waveformat.uiBlockAlign which could be 0, but rather
multiply by it and verify that we get the expected result. This is more
robust, as it prevents crashes on malformed input and also slightly more
efficient even for correct input.
---
 src/unix/sound.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index 53e3f31240..e0913ee65d 100644
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -669,8 +669,8 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
     if (waveformat.uiFormatTag != WAVE_FORMAT_PCM)
         return false;
 
-    if (waveformat.ulSamplesPerSec !=
-        waveformat.ulAvgBytesPerSec / waveformat.uiBlockAlign)
+    if (waveformat.ulAvgBytesPerSec !=
+        waveformat.ulSamplesPerSec * waveformat.uiBlockAlign)
         return false;
 
     // get file size from header

From 61c7cf9a9c5d743fee16094f491fa83c03391eb8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Dec 2017 17:45:01 +0100
Subject: [PATCH 083/916] Fix yet another division by 0 when parsing WAV data

Ensure that the size of one sample (including all the channels) is non
zero before dividing by it.
---
 src/unix/sound.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index e0913ee65d..9697c36af4 100644
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -673,6 +673,13 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
         waveformat.ulSamplesPerSec * waveformat.uiBlockAlign)
         return false;
 
+    // We divide by this number below to obtain the number of samples, so it
+    // definitely can't be 0.
+    wxUint32 const sampleSize =
+        waveformat.uiChannels * waveformat.uiBitsPerSample / 8;
+    if (!sampleSize)
+        return false;
+
     // get file size from header
     wxUint32 chunkSize;
     memcpy(&chunkSize, &data[4], 4);
@@ -695,7 +702,7 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
     m_data->m_channels = waveformat.uiChannels;
     m_data->m_samplingRate = waveformat.ulSamplesPerSec;
     m_data->m_bitsPerSample = waveformat.uiBitsPerSample;
-    m_data->m_samples = ul / (m_data->m_channels * m_data->m_bitsPerSample / 8);
+    m_data->m_samples = ul / sampleSize;
     m_data->m_dataBytes = ul;
 
     if (copyData)

From c010efc172907253570126d5a13c70230b2abbda Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Dec 2017 18:47:43 +0100
Subject: [PATCH 084/916] Avoid integer overflow when computing the sample size

While it seems to be harmless in this particular case, it still prevents
testing this code with UBSAN by triggering it here, so check that
multiplication doesn't overflow.
---
 src/unix/sound.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index 9697c36af4..355fc8673d 100644
--- a/src/unix/sound.cpp
+++ b/src/unix/sound.cpp
@@ -673,10 +673,16 @@ bool wxSound::LoadWAV(const void* data_, size_t length, bool copyData)
         waveformat.ulSamplesPerSec * waveformat.uiBlockAlign)
         return false;
 
-    // We divide by this number below to obtain the number of samples, so it
-    // definitely can't be 0.
-    wxUint32 const sampleSize =
-        waveformat.uiChannels * waveformat.uiBitsPerSample / 8;
+    // We divide by the sample size below to obtain the number of samples, so
+    // it definitely can't be 0. Also take care to avoid integer overflow when
+    // computing it.
+    unsigned tmp = waveformat.uiChannels;
+    if (tmp >= 0x10000)
+        return false;
+
+    tmp *= waveformat.uiBitsPerSample;
+
+    wxUint32 const sampleSize = tmp / 8;
     if (!sampleSize)
         return false;
 

From bf09ff2320537ceabf55b3067afec16061c16cb9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 31 Dec 2017 02:26:22 +0100
Subject: [PATCH 085/916] Remove unused GTK_IS_WX_CELL_EDITOR_BIN* macros

No real changes, just don't define macros that we never use and don't
plan on using it (why would we need to test whether something is of this
type when we already know it).
---
 src/gtk/dataview.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 6e102ae7c4..f72a4518fc 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1151,8 +1151,6 @@ extern "C" {
 
 #define GTK_TYPE_WX_CELL_EDITOR_BIN               (gtk_wx_cell_editor_bin_get_type ())
 #define GTK_WX_CELL_EDITOR_BIN(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_EDITOR_BIN, GtkWxCellEditorBin))
-#define GTK_IS_WX_CELL_EDITOR_BIN(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WX_CELL_EDITOR_BIN))
-#define GTK_IS_WX_CELL_EDITOR_BIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WX_CELL_EDITOR_BIN))
 
 struct GtkWxCellEditorBin
 {

From bde62ce981271fdd93c94909ba2f543e6c75c568 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 31 Dec 2017 02:33:26 +0100
Subject: [PATCH 086/916] Get rid of unused renderer rect in
 gtk_wx_cell_renderer_new()

No real changes, just don't call gtk_wx_cell_renderer_get_size()
unnecessarily as we never use its result: the code using the returned
rectangle was commented out ever since it was added (more than 10 years
ago) in 1e510b1e2d0270caf227c3fc0cf34ae2e7dd6794
---
 src/gtk/dataview.cpp | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index f72a4518fc..edd9dbcd08 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1420,7 +1420,7 @@ gtk_wx_cell_renderer_new (void)
 static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
                         GtkCellRenderer         *renderer,
                         GdkEvent                *WXUNUSED(event),
-                        GtkWidget               *widget,
+                        GtkWidget               *WXUNUSED(widget),
                         const gchar             *path,
                         wxConstGdkRect          *WXUNUSED(background_area),
                         wxConstGdkRect          *cell_area,
@@ -1437,25 +1437,10 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
     if (cell->GetEditorCtrl())
         return NULL;
 
-    GdkRectangle rect;
-    gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
-                                   &rect.x,
-                                   &rect.y,
-                                   &rect.width,
-                                   &rect.height);
-
-    rect.x += cell_area->x;
-    rect.y += cell_area->y;
-//    rect.width  -= renderer->xpad * 2;
-//    rect.height -= renderer->ypad * 2;
-
-//    wxRect renderrect(wxRectFromGDKRect(&rect));
-    wxRect renderrect(wxRectFromGDKRect(cell_area));
-
     wxDataViewItem
         item(cell->GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(path)));
 
-    if (!cell->StartEditing(item, renderrect))
+    if (!cell->StartEditing(item, wxRectFromGDKRect(cell_area)))
         return NULL;
 
     wxrenderer->editor_bin = gtk_wx_cell_editor_bin_new(cell->GetEditorCtrl());

From 32fc7c368f26a3872670002932e4752d6a3a5cef Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 2 Jan 2018 16:53:43 +0100
Subject: [PATCH 087/916] Make it more clear that XRC version must be set

Omitting the version can result in difficult to diagnose problems, so
insist that it should be set in the format documentation.

See #18033.
---
 docs/doxygen/overviews/xrc_format.h | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 187d8677d1..7a1a25fe8e 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -48,20 +48,9 @@ be accessed using XRCCTRL().
 @section overview_xrcformat_root Resource Root Element
 
 The root element is always @c \<resource\>. It has one optional attribute, @c
-version. If set, it specifies version of the file. In absence of @c version
-attribute, the default is @c "0.0.0.0".
-
-The version consists of four integers separated by periods.  The first three
-components are major, minor and release number of the wxWidgets release when
-the change was introduced, the last one is revision number and is 0 for the
-first incompatible change in given wxWidgets release, 1 for the second and so
-on.  The version changes only if there was an incompatible change introduced;
-merely adding new kind of objects does not constitute incompatible change.
-
-At the time of writing, the latest version is @c "2.5.3.0".
-
-Note that even though @c version attribute is optional, it should always be
-specified to take advantage of the latest capabilities:
+version which, while optional, should always be set to the latest version. At
+the time of writing, it is @c "2.5.3.0", so all XRC documents should look like
+the following:
 
 @code
 <?xml version="1.0"?>
@@ -70,6 +59,13 @@ specified to take advantage of the latest capabilities:
 </resource>
 @endcode
 
+The version consists of four integers separated by periods.  The first three
+components are major, minor and release number of the wxWidgets release when
+the change was introduced, the last one is revision number and is 0 for the
+first incompatible change in given wxWidgets release, 1 for the second and so
+on.  The version changes only if there was an incompatible change introduced;
+merely adding new kind of objects does not constitute incompatible change.
+
 @c \<resource\> may have arbitrary number of
 @ref overview_xrcformat_objects "object elements" as its children; they are referred
 to as @em toplevel objects in the rest of this document. Unlike objects defined

From 0a2dfc7959305be706658f21c9590c8c633c68f0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 2 Jan 2018 17:06:58 +0100
Subject: [PATCH 088/916] Document wxClipboard::AddData() as synonym for
 SetData()

Don't pretend that AddData() allows to add multiple objects to the
clipboard because it doesn't work like this by default under any
platform and only MSW possibly supports this in the non-default build
with wxUSE_OLE==0 -- but mentioning it in the documentation would
arguably be more confusing than helpful.

See #17925.
---
 interface/wx/clipbrd.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/interface/wx/clipbrd.h b/interface/wx/clipbrd.h
index 3b1ca4d83e..14593e27cc 100644
--- a/interface/wx/clipbrd.h
+++ b/interface/wx/clipbrd.h
@@ -72,14 +72,9 @@ public:
     virtual ~wxClipboard();
 
     /**
-        Call this function to add the data object to the clipboard. You may
-        call this function repeatedly after having cleared the clipboard using
-        Clear().
+        Call this function to add the data object to the clipboard.
 
-        After this function has been called, the clipboard owns the data, so do
-        not delete the data explicitly.
-
-        @see SetData()
+        This is an obsolete synonym for SetData().
     */
     virtual bool AddData(wxDataObject* data);
 
@@ -149,14 +144,17 @@ public:
     virtual bool Open();
 
     /**
-        Call this function to set the data object to the clipboard. This
-        function will clear all previous contents in the clipboard, so calling
-        it several times does not make any sense.
+        Call this function to set the data object to the clipboard.
+
+        The new data object replaces any previously set one, so if the
+        application wants to provide clipboard data in several different
+        formats, it must use a composite data object supporting all of the
+        formats instead of calling this function several times with different
+        data objects as this would only leave data from the last one in the
+        clipboard.
 
         After this function has been called, the clipboard owns the data, so do
         not delete the data explicitly.
-
-        @see AddData()
     */
     virtual bool SetData(wxDataObject* data);
 

From 827e90e8deb2add5d10aec1fdb8730dcd05c1248 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 31 Dec 2017 02:28:14 +0100
Subject: [PATCH 089/916] Use GtkHBox as GtkWxCellEditorBin parent with GTK+ <
 4

Using GtkBin as widget parent didn't work without overriding its
size-related vfuncs until GTK+ 3.8 and, in particular, resulted in the
editor (which was the child of the bin) not being visible at all with
GTK+ 2.

Switch to using GtkHBox as parent, which does work with both GTK+ 2 and
any GTK+ 3 version, but keep using GtkBin with GTK+ 4 as GtkHBox is
removed in it.

This fixes bug introduced in c2821dcea0d88828149c9a1ffe50544564250aa8
since which custom wxDataViewCtrl editors were not visible any more.

Closes #17686.
---
 src/gtk/dataview.cpp | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index edd9dbcd08..e89c058c05 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1152,9 +1152,33 @@ extern "C" {
 #define GTK_TYPE_WX_CELL_EDITOR_BIN               (gtk_wx_cell_editor_bin_get_type ())
 #define GTK_WX_CELL_EDITOR_BIN(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_EDITOR_BIN, GtkWxCellEditorBin))
 
+// In GTK+ < 3.8 GtkBin can't be used as widget base type without defining our
+// own size_allocate and related (either size_request for GTK+ 2 or
+// get_preferred_height for GTK+ 3) vfuncs, so we use GtkHBox instead. But in
+// GTK+ 4, GtkHBox is removed, so we do use GtkBin with it.
+#ifdef __WXGTK4__
+    typedef GtkBin GtkWxCellEditorBinBase;
+    typedef GtkBinClass GtkWxCellEditorBinBaseClass;
+
+    // Notice that this can't be just a (const) variable as GTK+ type constants
+    // are actually macros expanding into function calls, which shouldn't be
+    // performed before the library is initialized, so we need to use either an
+    // inline function or a define, which is simpler.
+    #define GtkWxCellEditorBinBaseType GTK_TYPE_BIN
+#else // GTK+ < 4
+    // GtkHBox is deprecated since 3.2, so avoid warnings about using it.
+    wxGCC_WARNING_SUPPRESS(deprecated-declarations)
+
+    typedef GtkHBox GtkWxCellEditorBinBase;
+    typedef GtkHBoxClass GtkWxCellEditorBinBaseClass;
+    #define GtkWxCellEditorBinBaseType GTK_TYPE_HBOX
+
+    wxGCC_WARNING_RESTORE(deprecated-declarations)
+#endif // GTK+ version
+
 struct GtkWxCellEditorBin
 {
-    GtkBin parent;
+    GtkWxCellEditorBinBase parent;
 
     // The actual user-created editor.
     wxWindow* editor;
@@ -1182,7 +1206,7 @@ gtk_wx_cell_editor_bin_get_type()
     {
         const GTypeInfo cell_editor_bin_info =
         {
-            sizeof (GtkBinClass),
+            sizeof (GtkWxCellEditorBinBaseClass),
             NULL, /* base_init */
             NULL, /* base_finalize */
             gtk_wx_cell_editor_bin_class_init,
@@ -1194,7 +1218,8 @@ gtk_wx_cell_editor_bin_get_type()
             NULL
         };
 
-        cell_editor_bin_type = g_type_register_static( GTK_TYPE_BIN,
+        cell_editor_bin_type = g_type_register_static(
+            GtkWxCellEditorBinBaseType,
             "GtkWxCellEditorBin", &cell_editor_bin_info, (GTypeFlags)0 );
 
 

From da186a0713244d542c5b73019dfbe596e21e93bd Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 3 Jan 2018 09:16:06 -0800
Subject: [PATCH 090/916] Avoid trying to override non-existent property with
 GTK+ < 2.20

---
 src/gtk/dataview.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index e89c058c05..944f97f00a 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1252,9 +1252,12 @@ static void gtk_wx_cell_editor_bin_class_init(void* klass, void*)
     oclass->set_property = gtk_wx_cell_editor_bin_set_property;
     oclass->get_property = gtk_wx_cell_editor_bin_get_property;
 
-    g_object_class_override_property(oclass,
+    if (wx_is_at_least_gtk2(20))
+    {
+        g_object_class_override_property(oclass,
                                      CELL_EDITOR_BIN_PROP_EDITING_CANCELED,
                                      "editing-canceled");
+    }
 }
 
 // We need to provide these virtual methods as we must support the

From b02df5ea33ebe532812cc59b00380b396798756d Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 3 Jan 2018 09:26:12 -0800
Subject: [PATCH 091/916] Remove unneeded init function

GObject instances are already zero-initialized
---
 src/gtk/dataview.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 944f97f00a..d78d075559 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1150,7 +1150,6 @@ enum
 extern "C" {
 
 #define GTK_TYPE_WX_CELL_EDITOR_BIN               (gtk_wx_cell_editor_bin_get_type ())
-#define GTK_WX_CELL_EDITOR_BIN(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WX_CELL_EDITOR_BIN, GtkWxCellEditorBin))
 
 // In GTK+ < 3.8 GtkBin can't be used as widget base type without defining our
 // own size_allocate and related (either size_request for GTK+ 2 or
@@ -1185,7 +1184,6 @@ struct GtkWxCellEditorBin
 };
 
 static GtkWidget* gtk_wx_cell_editor_bin_new(wxWindow* editor);
-static void gtk_wx_cell_editor_bin_init(GTypeInstance* instance, void*);
 static void gtk_wx_cell_editor_bin_class_init(void* klass, void*);
 static void gtk_wx_cell_editor_bin_get_property(GObject*, guint, GValue*, GParamSpec*);
 static void gtk_wx_cell_editor_bin_set_property(GObject*, guint, const GValue*, GParamSpec*);
@@ -1214,7 +1212,7 @@ gtk_wx_cell_editor_bin_get_type()
             NULL, /* class_data */
             sizeof (GtkWxCellEditorBin),
             0,    /* n_preallocs */
-            gtk_wx_cell_editor_bin_init,
+            NULL, // init
             NULL
         };
 
@@ -1238,13 +1236,6 @@ gtk_wx_cell_editor_bin_get_type()
     return cell_editor_bin_type;
 }
 
-static void
-gtk_wx_cell_editor_bin_init(GTypeInstance* instance, void*)
-{
-    GtkWxCellEditorBin* const bin = GTK_WX_CELL_EDITOR_BIN(instance);
-    bin->editor = NULL;
-}
-
 static void gtk_wx_cell_editor_bin_class_init(void* klass, void*)
 {
     GObjectClass* const oclass = G_OBJECT_CLASS(klass);

From 5efba4ce470148c92b62e903c9d40f9a05702715 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 3 Jan 2018 20:22:12 -0800
Subject: [PATCH 092/916] Avoid invisible wxTextCtrl selection with GTK+3

See #18036
---
 src/gtk/window.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 4c7426756b..50973fcf02 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -5439,9 +5439,9 @@ void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle)
         }
         g_string_append_c(css, '}');
 
-        if (isFg && isBg)
+        if (isFg || isBg)
         {
-            // Selection will be invisible, so add textview selection colors.
+            // Selection may be invisible, so add textview selection colors.
             // This is specifically for wxTextCtrl, but may be useful for other
             // controls, and seems to do no harm to apply to all.
             const wxColour fg_sel(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));

From 48a5d6c5f835ce70d7b06a89a51a164b58c19dad Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Thu, 4 Jan 2018 16:12:15 +0200
Subject: [PATCH 093/916] Move wx/evtloopsrc.h to BASE_CMN_HDR from GUI_CMN_HDR

This header ends up being included by wx/apptrait.h, which is in
BASE_CMN_HDR, so it needs itself to be there too in order for
compilation to work when using non-GUI library build.

Closes #18038.
---
 Makefile.in                       | 3 ++-
 build/bakefiles/files.bkl         | 2 +-
 build/files                       | 2 +-
 build/msw/wx_base.vcxproj         | 1 +
 build/msw/wx_base.vcxproj.filters | 3 +++
 build/msw/wx_core.vcxproj         | 1 -
 build/msw/wx_core.vcxproj.filters | 3 ---
 build/msw/wx_vc7_base.vcproj      | 3 +++
 build/msw/wx_vc7_core.vcproj      | 3 ---
 build/msw/wx_vc8_base.vcproj      | 4 ++++
 build/msw/wx_vc8_core.vcproj      | 4 ----
 build/msw/wx_vc9_base.vcproj      | 4 ++++
 build/msw/wx_vc9_core.vcproj      | 4 ----
 13 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3a49998522..c00dbf1699 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -406,6 +406,7 @@ ALL_BASE_HEADERS =  \
 	wx/event.h \
 	wx/eventfilter.h \
 	wx/evtloop.h \
+	wx/evtloopsrc.h \
 	wx/except.h \
 	wx/features.h \
 	wx/flags.h \
@@ -588,6 +589,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/event.h \
 	wx/eventfilter.h \
 	wx/evtloop.h \
+	wx/evtloopsrc.h \
 	wx/except.h \
 	wx/features.h \
 	wx/flags.h \
@@ -3920,7 +3922,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/docmdi.h \
 	wx/docview.h \
 	wx/effects.h \
-	wx/evtloopsrc.h \
 	wx/fdrepdlg.h \
 	wx/filectrl.h \
 	wx/filehistory.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 850ba226f1..85658c2a8c 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -595,6 +595,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/event.h
     wx/eventfilter.h
     wx/evtloop.h
+    wx/evtloopsrc.h
     wx/except.h
     wx/features.h
     wx/flags.h
@@ -1101,7 +1102,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/docmdi.h
     wx/docview.h
     wx/effects.h
-    wx/evtloopsrc.h
     wx/fdrepdlg.h
     wx/filectrl.h
     wx/filehistory.h
diff --git a/build/files b/build/files
index 757ffab063..d450ec7464 100644
--- a/build/files
+++ b/build/files
@@ -526,6 +526,7 @@ BASE_CMN_HDR =
     wx/event.h
     wx/eventfilter.h
     wx/evtloop.h
+    wx/evtloopsrc.h
     wx/except.h
     wx/features.h
     wx/flags.h
@@ -1021,7 +1022,6 @@ GUI_CMN_HDR =
     wx/docmdi.h
     wx/docview.h
     wx/effects.h
-    wx/evtloopsrc.h
     wx/fdrepdlg.h
     wx/filectrl.h
     wx/filehistory.h
diff --git a/build/msw/wx_base.vcxproj b/build/msw/wx_base.vcxproj
index 7f5a03c6d4..bdf09a2b7d 100644
--- a/build/msw/wx_base.vcxproj
+++ b/build/msw/wx_base.vcxproj
@@ -821,6 +821,7 @@
     <ClInclude Include="..\..\include\wx\thrimpl.cpp" />
     <ClInclude Include="..\..\include\wx\arrimpl.cpp" />
     <ClInclude Include="..\..\include\wx\secretstore.h" />
+    <ClInclude Include="..\..\include\wx\evtloopsrc.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/msw/wx_base.vcxproj.filters b/build/msw/wx_base.vcxproj.filters
index b2a36fd44b..6e1b1cace5 100644
--- a/build/msw/wx_base.vcxproj.filters
+++ b/build/msw/wx_base.vcxproj.filters
@@ -499,6 +499,9 @@
     <ClInclude Include="..\..\include\wx\evtloop.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\evtloopsrc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\except.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index 40cf55da63..174b3d06f7 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -1235,7 +1235,6 @@
     <ClInclude Include="..\..\include\wx\dragimag.h" />
     <ClInclude Include="..\..\include\wx\effects.h" />
     <ClInclude Include="..\..\include\wx\encinfo.h" />
-    <ClInclude Include="..\..\include\wx\evtloopsrc.h" />
     <ClInclude Include="..\..\include\wx\fdrepdlg.h" />
     <ClInclude Include="..\..\include\wx\filectrl.h" />
     <ClInclude Include="..\..\include\wx\filedlg.h" />
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index d8057768a5..3d054e9e26 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -1090,9 +1090,6 @@
     <ClInclude Include="..\..\include\wx\encinfo.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\evtloopsrc.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\fdrepdlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 3a48f12db1..22993e476a 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -1027,6 +1027,9 @@
 			<File
 				RelativePath="..\..\include\wx\evtloop.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloopsrc.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\except.h">
 			</File>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 2427c2944c..117b6efbc3 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2147,9 +2147,6 @@
 			<File
 				RelativePath="..\..\include\wx\encinfo.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloopsrc.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h">
 			</File>
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index 88700558c6..d7bb2eb254 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1967,6 +1967,10 @@
 				RelativePath="..\..\include\wx\evtloop.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloopsrc.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\except.h"
 				>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index ec5944ffc8..d42bb1e612 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3364,10 +3364,6 @@
 				RelativePath="..\..\include\wx\encinfo.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloopsrc.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h"
 				>
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 9cecac72e4..ec52aebd6a 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1963,6 +1963,10 @@
 				RelativePath="..\..\include\wx\evtloop.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloopsrc.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\except.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 09e025ae63..cb6cbf6566 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3360,10 +3360,6 @@
 				RelativePath="..\..\include\wx\encinfo.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloopsrc.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\fdrepdlg.h"
 				>

From 48faeb65b3d1786a19359798f46b1d8a92d7e8d4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 4 Jan 2018 21:39:57 +0100
Subject: [PATCH 094/916] Fix copy ctor in numeric validators classes

wxFloatingPointValidator and wxIntegerValidator copy ctor didn't copy
the associated window, so it was lost when the validator was Clone()'d.

Fix this by correctly using wxValidator copy ctor, instead of the
default one, in the copy ctor of the common wxNumValidatorBase base
class.
---
 include/wx/valnum.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/valnum.h b/include/wx/valnum.h
index 540f9d6b82..f4436cb027 100644
--- a/include/wx/valnum.h
+++ b/include/wx/valnum.h
@@ -56,7 +56,7 @@ protected:
         m_style = style;
     }
 
-    wxNumValidatorBase(const wxNumValidatorBase& other) : wxValidator()
+    wxNumValidatorBase(const wxNumValidatorBase& other) : wxValidator(other)
     {
         m_style = other.m_style;
     }

From d332ccfd6f8fe82d439a35dc22b5c9f8e6efd421 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 4 Jan 2018 22:58:50 +0100
Subject: [PATCH 095/916] Add support for wxStaticBoxSizer "windowlabel"
 property to XRC

Allow specifying arbitrary windows as labels for the static boxes
created from XRC.

Note that wxStaticBox XRC handler itself wasn't updated to support this,
as this handler seems to be quite useless because it's impossible to
define any box children with it, so only wxStaticBoxSizer XRC handler
really matters, anyhow.
---
 docs/doxygen/overviews/xrc_format.h |  3 ++
 samples/xrc/rc/controls.xrc         | 52 +++++++++++++++++++++++
 src/xrc/xh_sizer.cpp                | 65 +++++++++++++++++++++++++----
 3 files changed, 112 insertions(+), 8 deletions(-)

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 187d8677d1..66dada62a6 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -2416,6 +2416,9 @@ support the following properties:
     Sizer orientation, "wxHORIZONTAL" or "wxVERTICAL" (default: wxHORIZONTAL).}
 @row3col{label, @ref overview_xrcformat_type_text,
     Label to be used for the static box around the sizer (default: empty).}
+@row3col{windowlabel, any window,
+    Window to be used instead of the plain text label (default: none).
+    This property is only available since wxWidgets 3.1.1.}}
 @endTable
 
 @subsection overview_xrcformat_wxgridsizer wxGridSizer
diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index bac4812e5e..8072505d22 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -983,6 +983,58 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                 <object class="wxStaticBoxSizer">
                                     <orient>wxVERTICAL</orient>
                                     <label>Internet options</label>
+                                    <object class="sizeritem">
+                                        <flag>wxALL</flag>
+                                        <border>5</border>
+                                        <object class="wxRadioButton">
+                                            <style>wxRB_GROUP</style>
+                                            <label>Use _proxy</label>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <flag>wxALL</flag>
+                                        <border>5</border>
+                                        <object class="wxRadioButton">
+                                            <label>Use _VPN</label>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <flag>wxALL</flag>
+                                        <border>5</border>
+                                        <object class="wxRadioButton">
+                                            <label>Use _Tor</label>
+                                            <value>1</value>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxGROW|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxStaticBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+                                    <windowlabel>
+                                        <object class="wxCheckBox">
+                                            <label>Enable quantum mechanics</label>
+                                            <checked>1</checked>
+                                        </object>
+                                    </windowlabel>
+                                    <object class="sizeritem">
+                                        <flag>wxALL</flag>
+                                        <border>5</border>
+                                        <object class="wxRadioButton">
+                                            <style>wxRB_GROUP</style>
+                                            <label>Cat is dead</label>
+                                        </object>
+                                    </object>
+                                    <object class="sizeritem">
+                                        <flag>wxALL</flag>
+                                        <border>5</border>
+                                        <object class="wxRadioButton">
+                                            <label>Cat is alive</label>
+                                            <value>1</value>
+                                        </object>
+                                    </object>
                                 </object>
                             </object>
                         </object>
diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 8a91eb91e9..2a17184a55 100644
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -320,14 +320,63 @@ wxSizer*  wxSizerXmlHandler::Handle_wxBoxSizer()
 #if wxUSE_STATBOX
 wxSizer*  wxSizerXmlHandler::Handle_wxStaticBoxSizer()
 {
-    return new wxStaticBoxSizer(
-            new wxStaticBox(m_parentAsWindow,
-                            GetID(),
-                            GetText(wxT("label")),
-                            wxDefaultPosition, wxDefaultSize,
-                            0/*style*/,
-                            GetName()),
-            GetStyle(wxT("orient"), wxHORIZONTAL));
+    wxXmlNode* nodeWindowLabel = GetParamNode(wxS("windowlabel"));
+    wxString const& labelText = GetText(wxS("label"));
+
+    wxStaticBox* box = NULL;
+    if ( nodeWindowLabel )
+    {
+        if ( !labelText.empty() )
+        {
+            ReportError("Either label or windowlabel can be used, but not both");
+            return NULL;
+        }
+
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+        wxXmlNode* n = nodeWindowLabel->GetChildren();
+        if ( !n )
+        {
+            ReportError("windowlabel must have a window child");
+            return NULL;
+        }
+
+        if ( n->GetNext() )
+        {
+            ReportError("windowlabel can only have a single child");
+            return NULL;
+        }
+
+        wxObject* const item = CreateResFromNode(n, m_parent, NULL);
+        wxWindow* const wndLabel = wxDynamicCast(item, wxWindow);
+        if ( !wndLabel )
+        {
+            ReportError(n, "windowlabel child must be a window");
+            return NULL;
+        }
+
+        box = new wxStaticBox(m_parentAsWindow,
+                              GetID(),
+                              wndLabel,
+                              wxDefaultPosition, wxDefaultSize,
+                              0/*style*/,
+                              GetName());
+#else // !wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+        ReportError("Support for using windows as wxStaticBox labels is "
+                    "missing in this build of wxWidgets.");
+        return NULL;
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX/!wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+    }
+    else // Using plain text label.
+    {
+        box = new wxStaticBox(m_parentAsWindow,
+                              GetID(),
+                              labelText,
+                              wxDefaultPosition, wxDefaultSize,
+                              0/*style*/,
+                              GetName());
+    }
+
+    return new wxStaticBoxSizer(box, GetStyle(wxS("orient"), wxHORIZONTAL));
 }
 #endif // wxUSE_STATBOX
 

From 00d8434156178e9e02cb733e4abb61d62a0dd913 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 5 Jan 2018 10:01:38 -0800
Subject: [PATCH 096/916] Avoid debug message when there is no session manager

See #16024
---
 src/gtk/utilsgtk.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 093db50437..7a43641e96 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -254,7 +254,11 @@ static wxString GetSM()
 
     if ( !smc_conn )
     {
-        wxLogDebug("Failed to connect to session manager: %s", smerr);
+        // Don't report error if there is no session manager at all
+        if (getenv("SESSION_MANAGER"))
+        {
+            wxLogDebug("Failed to connect to session manager: %s", smerr);
+        }
         return wxEmptyString;
     }
 

From c8b6ca308b69e8b7ed3d8a933520f01e0e6b4196 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Fri, 5 Jan 2018 19:51:47 +0100
Subject: [PATCH 097/916] Update year in copyright notices to 2018

Use 2018 instead of 2017 (mostly in version info files).

See https://github.com/wxWidgets/wxWidgets/pull/661
---
 CMakeLists.txt                     | 2 +-
 docs/doxygen/mainpages/copyright.h | 2 +-
 docs/doxygen/regen.sh              | 2 +-
 interface/wx/aboutdlg.h            | 2 +-
 interface/wx/generic/aboutdlgg.h   | 2 +-
 samples/Info.plist                 | 6 +++---
 samples/docview/Info.plist         | 6 +++---
 samples/minimal/Info_cocoa.plist   | 6 +++---
 src/common/utilscmn.cpp            | 2 +-
 src/msw/version.rc                 | 2 +-
 src/osx/carbon/Info.plist.in       | 6 +++---
 11 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e47eb01e7..42be0430e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ else()
 endif()
 
 set(wxVERSION ${wxMAJOR_VERSION}.${wxMINOR_VERSION}.${wxRELEASE_NUMBER})
-set(wxCOPYRIGHT "1992-2016 wxWidgets")
+set(wxCOPYRIGHT "1992-2018 wxWidgets")
 
 include(build/cmake/main.cmake)
 
diff --git a/docs/doxygen/mainpages/copyright.h b/docs/doxygen/mainpages/copyright.h
index 13fda6de6d..88eadadd8d 100644
--- a/docs/doxygen/mainpages/copyright.h
+++ b/docs/doxygen/mainpages/copyright.h
@@ -11,7 +11,7 @@
 
 @section section_copyright wxWidgets Copyrights and Licenses
 
-Copyright (c) 1992-2017 Julian Smart, Vadim Zeitlin, Stefan Csomor, Robert
+Copyright (c) 1992-2018 Julian Smart, Vadim Zeitlin, Stefan Csomor, Robert
 Roebling, and other members of the wxWidgets team, please see the
 acknowledgements section below.
 
diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh
index 0c108350ec..87462f9931 100755
--- a/docs/doxygen/regen.sh
+++ b/docs/doxygen/regen.sh
@@ -183,7 +183,7 @@ if [[ "$1" = "docset" ]]; then
     defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFeedURL $ATOMDIR/$ATOM
     defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFallbackURL http://docs.wxwidgets.org
     defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetDescription "API reference and conceptual documentation for wxWidgets 3.0"
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info NSHumanReadableCopyright "Copyright 1992-2017 wxWidgets team, Portions 1996 Artificial Intelligence Applications Institute"
+    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info NSHumanReadableCopyright "Copyright 1992-2018 wxWidgets team, Portions 1996 Artificial Intelligence Applications Institute"
     defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info isJavaScriptEnabled true
     defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info dashIndexFilePath index.html
     defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetPlatformFamily wx
diff --git a/interface/wx/aboutdlg.h b/interface/wx/aboutdlg.h
index f92ce60106..4d3bf6340f 100644
--- a/interface/wx/aboutdlg.h
+++ b/interface/wx/aboutdlg.h
@@ -37,7 +37,7 @@
         aboutInfo.SetName("MyApp");
         aboutInfo.SetVersion(MY_APP_VERSION_STRING);
         aboutInfo.SetDescription(_("My wxWidgets-based application!"));
-        aboutInfo.SetCopyright("(C) 1992-2017");
+        aboutInfo.SetCopyright("(C) 1992-2018");
         aboutInfo.SetWebSite("http://myapp.org");
         aboutInfo.AddDeveloper("My Self");
 
diff --git a/interface/wx/generic/aboutdlgg.h b/interface/wx/generic/aboutdlgg.h
index d201f22a03..c0fbab297b 100644
--- a/interface/wx/generic/aboutdlgg.h
+++ b/interface/wx/generic/aboutdlgg.h
@@ -34,7 +34,7 @@
         aboutInfo.SetName("MyApp");
         aboutInfo.SetVersion(MY_APP_VERSION_STRING);
         aboutInfo.SetDescription(_("My wxWidgets-based application!"));
-        aboutInfo.SetCopyright("(C) 1992-2017");
+        aboutInfo.SetCopyright("(C) 1992-2018");
         aboutInfo.SetWebSite("http://myapp.org");
         aboutInfo.AddDeveloper("My Self");
 
diff --git a/samples/Info.plist b/samples/Info.plist
index 3e57462ed4..1476b139d8 100644
--- a/samples/Info.plist
+++ b/samples/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2017 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -15,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>3.1.1, (c) 2005-2017 wxWidgets</string>
+	<string>3.1.1, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -31,6 +31,6 @@
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005-2017 wxWidgets</string>
+	<string>Copyright 2005-2018 wxWidgets</string>
 </dict>
 </plist>
diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist
index 195a02675a..b39ead40c6 100644
--- a/samples/docview/Info.plist
+++ b/samples/docview/Info.plist
@@ -51,7 +51,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2017 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>doc</string>
 	<key>CFBundleIdentifier</key>
@@ -66,7 +66,7 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>3.1.1, (c) 2005-2017 wxWidgets</string>
+	<string>3.1.1, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -82,6 +82,6 @@
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005-2017 wxWidgets</string>
+	<string>Copyright 2005-2018 wxWidgets</string>
 </dict>
 </plist>
diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist
index b8709b4d5b..561ee3ad00 100644
--- a/samples/minimal/Info_cocoa.plist
+++ b/samples/minimal/Info_cocoa.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2017 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -22,7 +22,7 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>3.1.1, (c) 2005-2017 wxWidgets</string>
+	<string>3.1.1, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -34,7 +34,7 @@
 	<key>CFBundleVersion</key>
 	<string>3.1.1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005-2017 wxWidgets</string>
+	<string>Copyright 2005-2018 wxWidgets</string>
 	<key>NSPrincipalClass</key>
 	<string>wxNSApplication</string>
 </dict>
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 8b31568fa5..81fddcc644 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -1415,7 +1415,7 @@ wxVersionInfo wxGetLibraryVersionInfo()
                          wxMINOR_VERSION,
                          wxRELEASE_NUMBER,
                          msg,
-                         wxS("Copyright (c) 1995-2017 wxWidgets team"));
+                         wxS("Copyright (c) 1995-2018 wxWidgets team"));
 }
 
 void wxInfoMessageBox(wxWindow* parent)
diff --git a/src/msw/version.rc b/src/msw/version.rc
index 561fe87fd3..f1ddd9dbcc 100644
--- a/src/msw/version.rc
+++ b/src/msw/version.rc
@@ -92,7 +92,7 @@ BEGIN
             VALUE "FileDescription", "wxWidgets " WXLIBDESC " library\0"
             VALUE "FileVersion", wxVERSION_NUM_DOT_STRING "\0"
             VALUE "InternalName", wxSTRINGIZE(WXDLLNAME) "\0"
-            VALUE "LegalCopyright", "Copyright © 1993-2017 wxWidgets development team\0"
+            VALUE "LegalCopyright", "Copyright © 1993-2018 wxWidgets development team\0"
             VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0"
             VALUE "ProductName", "wxWidgets\0"
             VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
diff --git a/src/osx/carbon/Info.plist.in b/src/osx/carbon/Info.plist.in
index 7007f6d8c0..5f9c8f0338 100644
--- a/src/osx/carbon/Info.plist.in
+++ b/src/osx/carbon/Info.plist.in
@@ -32,11 +32,11 @@
 	<key>CFBundleShortVersionString</key>
 	<string>VERSION</string>
 	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2017 wxWidgets</string>
+	<string>EXECUTABLE version VERSION, (c) 2002-2018 wxWidgets</string>
 	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2017 wxWidgets</string>
+	<string>VERSION, (c) 2002-2018 wxWidgets</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2017 wxWidgets</string>
+	<string>Copyright 2002-2018 wxWidgets</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>CSResourcesFileMapped</key>

From af56ccd46f777d7995bd426772acc66a46d96e67 Mon Sep 17 00:00:00 2001
From: rmpowell77 <rmpowell77@me.com>
Date: Sat, 6 Jan 2018 08:37:20 -0800
Subject: [PATCH 098/916] Use semicolons as statement separators in wxHTML code

This avoids (harmless in this, but not necessarily in the other, case)
clang warning: possible misuse of comma operator here [-Wcomma].

See https://github.com/wxWidgets/wxWidgets/pull/662
---
 include/wx/html/htmlcell.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 199768effd..6f726b2795 100644
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -232,7 +232,7 @@ public:
     virtual wxHtmlCell* GetFirstChild() const { return NULL; }
 
     // members writing methods
-    virtual void SetPos(int x, int y) {m_PosX = x, m_PosY = y;}
+    virtual void SetPos(int x, int y) {m_PosX = x; m_PosY = y;}
     void SetLink(const wxHtmlLinkInfo& link);
     void SetNext(wxHtmlCell *cell) {m_Next = cell;}
 
@@ -486,7 +486,7 @@ public:
     // returns background colour (of wxNullColour if none set), so that widgets can
     // adapt to it:
     wxColour GetBackgroundColour();
-    void SetBorder(const wxColour& clr1, const wxColour& clr2, int border = 1) {m_Border = border; m_BorderColour1 = clr1, m_BorderColour2 = clr2;}
+    void SetBorder(const wxColour& clr1, const wxColour& clr2, int border = 1) {m_Border = border; m_BorderColour1 = clr1; m_BorderColour2 = clr2;}
     virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const wxOVERRIDE;
     virtual const wxHtmlCell* Find(int condition, const void* param) const wxOVERRIDE;
 

From 572fe37898f8d4f8664849ec76483dd63ea13a13 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 6 Jan 2018 11:07:11 -0800
Subject: [PATCH 099/916] Avoid calling default "key-press-event" handler

We have already done everything it does, and doing it again seems to
cause an infinite loop with WebKitGTK. See #17932
---
 src/gtk/toplevel.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index f63fdd3e46..ae825d4039 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -215,16 +215,16 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey *event)
     // GTK+ gtk_window_key_press_event() handler.
 
     if ( gtk_window_propagate_key_event(window, event) )
-        return TRUE;
+        return true;
 
     if ( gtk_window_activate_key(window, event) )
-        return TRUE;
+        return true;
 
     void* parent_class = g_type_class_peek_parent(G_OBJECT_GET_CLASS(widget));
-    if (GTK_WIDGET_CLASS(parent_class)->key_press_event(widget, event))
-        return TRUE;
+    GTK_WIDGET_CLASS(parent_class)->key_press_event(widget, event);
 
-    return FALSE;
+    // Avoid calling the default handler, we have already done everything it does
+    return true;
 }
 }
 

From 1d037dd4c9d0096f1eb9493f88de4e239e3275fd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 01:14:17 +0100
Subject: [PATCH 100/916] Don't disable wxStaticBox window label when disabling
 the box

This behaviour might be not completely intuitive, but it makes it much
simpler to handle the box state using a checkbox as the label control
(which is by far the most common case of using box window labels).

Notice that while we could add a separate EnableWithoutLabel() method to
wxStaticBox to make it possible to set the state of the box directly
relatively easily, it wouldn't help with using wxEVT_UPDATE_UI for
managing the box state indirectly as it relies on calling Enable() only.
And this solution does allow wxEVT_UPDATE_UI handlers for the box itself
to work (provided the handler takes care to check for the event object
being the box itself, as otherwise it would still disable the child
checkbox when its wxEVT_UPDATE_UI bubbles up to the box).
---
 include/wx/statbox.h      |  1 +
 interface/wx/statbox.h    | 26 ++++++++++++++++++++++++++
 src/common/statboxcmn.cpp | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 0e6e4f3ac3..ecb07ed92f 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -31,6 +31,7 @@ public:
 
     // overridden base class virtuals
     virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
+    virtual bool Enable(bool enable = true) wxOVERRIDE;
 
     // implementation only: this is used by wxStaticBoxSizer to account for the
     // need for extra space taken by the static box
diff --git a/interface/wx/statbox.h b/interface/wx/statbox.h
index d7aae13cc0..c0fcac378e 100644
--- a/interface/wx/statbox.h
+++ b/interface/wx/statbox.h
@@ -158,4 +158,30 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
+
+    /**
+        Enables or disables the box without affecting its label window, if any.
+
+        wxStaticBox overrides wxWindow::Enable() in order to avoid disabling
+        the control used as a label, if this box is using one. This is done in
+        order to allow using a wxCheckBox, for example, label and enable or
+        disable the box according to the state of the checkbox: if disabling
+        the box also disabled the checkbox in this situation, it would make it
+        impossible for the user to re-enable the box after disabling it, so the
+        checkbox stays enabled even if @c box->Enable(false) is called.
+
+        However with the actual behaviour, implemented in this overridden
+        method, the following code (shown using C++11 only for convenience,
+        this behaviour is not C++11-specific):
+        @code
+            auto check = new wxCheckBox(parent, wxID_ANY, "Use the box");
+            auto box = new wxStaticBox(parent, wxID_ANY, check);
+            check->Bind(wxEVT_CHECKBOX,
+                        [box](wxCommandEvent& event) {
+                            box->Enable(event.IsChecked());
+                        });
+        @endcode
+        does work as expected.
+     */
+    virtual bool Enable(bool enable = true);
 };
diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 4db934146a..0e77dfe74f 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -78,6 +78,45 @@ void wxStaticBoxBase::WXDestroyWithoutChildren()
     delete this;
 }
 
+bool wxStaticBoxBase::Enable(bool enable)
+{
+#ifdef wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+    // We want to keep the window label enabled even if the static box is
+    // disabled because this label is often used to enable/disable the box
+    // (e.g. a checkbox or a radio button is commonly used for this purpose)
+    // and it would be impossible to re-enable the box back if disabling it
+    // also disabled the label control.
+    //
+    // Unfortunately it is _not_ enough to just disable the box and then enable
+    // the label window as it would still remain disabled under some platforms
+    // (those where wxHAS_NATIVE_ENABLED_MANAGEMENT is defined, e.g. wxGTK) for
+    // as long as its parent is disabled. So we avoid disabling the box at all
+    // in this case and only disable its children, but still pretend that the
+    // box is disabled by updating its m_isEnabled, as it would be surprising
+    // if IsEnabled() didn't return false after disabling the box, for example.
+    if ( m_labelWin )
+    {
+        if ( enable == IsThisEnabled() )
+            return false;
+
+        const wxWindowList& children = GetChildren();
+        for ( wxWindowList::const_iterator i = children.begin();
+              i != children.end();
+              ++i )
+        {
+            if ( *i != m_labelWin )
+                (*i)->Enable(enable);
+        }
+
+        m_isEnabled = enable;
+
+        return true;
+    }
+#endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX
+
+    return wxNavigationEnabled<wxControl>::Enable(enable);
+}
+
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------

From bfcd51cb6a51269fdae6d210b13b5ba5474f3e5f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 01:25:10 +0100
Subject: [PATCH 101/916] Make wxValidator::SetWindow() virtual

Allow overriding the method called when the validator is associated with
the window, this can be convenient to perform some initialization on the
validator instance actually used as it can't be done on the initially
created object itself because it will be cloned by SetValidator(),
creating a new instance.

Also change SetWindow() to take wxWindow instead of wxWindowBase, this
still requires the cast in wxWindow::SetValidator(), but it's better to
have it there rather than in wxValidator and use the simpler type in the
public function signature.
---
 include/wx/validate.h   |  9 ++++++---
 interface/wx/validate.h | 11 +++++++----
 src/common/wincmn.cpp   |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/include/wx/validate.h b/include/wx/validate.h
index 477af1019a..0fcc58e476 100644
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -62,9 +62,12 @@ public:
     // Called to transfer data from the window
     virtual bool TransferFromWindow() { return false; }
 
+    // Called when the validator is associated with a window, may be useful to
+    // override if it needs to somehow initialize the window.
+    virtual void SetWindow(wxWindow *win) { m_validatorWindow = win; }
+
     // accessors
-    wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
-    void SetWindow(wxWindowBase *win) { m_validatorWindow = win; }
+    wxWindow *GetWindow() const { return m_validatorWindow; }
 
     // validators beep by default if invalid key is pressed, this function
     // allows to change this
@@ -85,7 +88,7 @@ public:
 #endif
 
 protected:
-    wxWindowBase *m_validatorWindow;
+    wxWindow *m_validatorWindow;
 
 private:
     static bool ms_isSilent;
diff --git a/interface/wx/validate.h b/interface/wx/validate.h
index 5a1c4e81d9..1096077019 100644
--- a/interface/wx/validate.h
+++ b/interface/wx/validate.h
@@ -85,8 +85,11 @@ public:
     /**
         Associates a window with the validator.
 
-        This function is automatically called by wxWidgets when creating a wxWindow-derived
-        class instance which takes a wxValidator reference.
+        This function is automatically called by wxWidgets when creating a
+        wxWindow-derived class instance which takes a wxValidator reference.
+        Since wxWidgets 3.1.1, it can be overridden in custom validators in
+        order to perform any one-time initialization or checks of the window
+        when the validator is associated with it.
 
         E.g.
         @code
@@ -94,9 +97,9 @@ public:
                        wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
         @endcode
         will automatically link the wxTextValidator instance with the wxTextCtrl
-        instance.
+        instance and call SetWindow() method on the wxTextValidator object.
     */
-    void SetWindow(wxWindow* window);
+    virtual void SetWindow(wxWindow* window);
 
     /**
         This overridable function is called when the value in the window must
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index f07acd465d..b0e542a171 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1782,10 +1782,10 @@ void wxWindowBase::SetValidator(const wxValidator& validator)
     if ( m_windowValidator )
         delete m_windowValidator;
 
-    m_windowValidator = (wxValidator *)validator.Clone();
+    m_windowValidator = static_cast<wxValidator *>(validator.Clone());
 
     if ( m_windowValidator )
-        m_windowValidator->SetWindow(this);
+        m_windowValidator->SetWindow(static_cast<wxWindow*>(this));
 }
 #endif // wxUSE_VALIDATORS
 

From a6d677a0fec04b3aeae0fde2ed038b31b7c9ee0c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 01:26:53 +0100
Subject: [PATCH 102/916] Check for correct window in
 wxNumValidatorBase::SetWindow()

Override SetWindow() to check that the validator is being associated
with the window of the correct type, this allows to trigger an assert
immediately if this is not the case, making it simpler to find the error
as the call to SetValitator() on the wrong window will be in the call
stack when this happens, unlike before when the assert would happen only
at some later time.
---
 include/wx/valnum.h   |  4 ++++
 src/common/valnum.cpp | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/include/wx/valnum.h b/include/wx/valnum.h
index f4436cb027..42f7675a76 100644
--- a/include/wx/valnum.h
+++ b/include/wx/valnum.h
@@ -50,6 +50,10 @@ public:
     // we don't need this as we do our validation on the fly here.
     virtual bool Validate(wxWindow * WXUNUSED(parent)) wxOVERRIDE { return true; }
 
+    // Override base class method to check that the window is a text control or
+    // combobox.
+    virtual void SetWindow(wxWindow *win) wxOVERRIDE;
+
 protected:
     wxNumValidatorBase(int style)
     {
diff --git a/src/common/valnum.cpp b/src/common/valnum.cpp
index bb483502a6..4f11072b1c 100644
--- a/src/common/valnum.cpp
+++ b/src/common/valnum.cpp
@@ -52,6 +52,23 @@ int wxNumValidatorBase::GetFormatFlags() const
     return flags;
 }
 
+void wxNumValidatorBase::SetWindow(wxWindow *win)
+{
+    wxValidator::SetWindow(win);
+
+#if wxUSE_TEXTCTRL
+    if ( wxDynamicCast(m_validatorWindow, wxTextCtrl) )
+        return;
+#endif // wxUSE_TEXTCTRL
+
+#if wxUSE_COMBOBOX
+    if ( wxDynamicCast(m_validatorWindow, wxComboBox) )
+        return;
+#endif // wxUSE_COMBOBOX
+
+    wxFAIL_MSG("Can only be used with wxTextCtrl or wxComboBox");
+}
+
 wxTextEntry *wxNumValidatorBase::GetTextEntry() const
 {
 #if wxUSE_TEXTCTRL
@@ -64,8 +81,6 @@ wxTextEntry *wxNumValidatorBase::GetTextEntry() const
         return combo;
 #endif // wxUSE_COMBOBOX
 
-    wxFAIL_MSG("Can only be used with wxTextCtrl or wxComboBox");
-
     return NULL;
 }
 

From c1e097cc680733cd5fa7cc12faa6b3aa037c7950 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 17:03:46 +0100
Subject: [PATCH 103/916] Update CMake files list

Regenerate the file that was forgotten before by the changes of
48a5d6c5f835ce70d7b06a89a51a164b58c19dad (see #18038) and
95b28abfdf6ad32a62884112d495076f38ec6e5b (see
https://github.com/wxWidgets/wxWidgets/pull/541).
---
 build/cmake/files.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index ee77fecdb2..018fd0b30d 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -509,6 +509,7 @@ set(BASE_CMN_HDR
     wx/event.h
     wx/eventfilter.h
     wx/evtloop.h
+    wx/evtloopsrc.h
     wx/except.h
     wx/features.h
     wx/flags.h
@@ -1009,7 +1010,6 @@ set(GUI_CMN_HDR
     wx/docmdi.h
     wx/docview.h
     wx/effects.h
-    wx/evtloopsrc.h
     wx/fdrepdlg.h
     wx/filectrl.h
     wx/filehistory.h
@@ -1054,6 +1054,7 @@ set(GUI_CMN_HDR
     wx/paper.h
     wx/persist.h
     wx/persist/bookctrl.h
+    wx/persist/dataview.h
     wx/persist/splitter.h
     wx/persist/toplevel.h
     wx/persist/treebook.h

From 9a75103d9aa24620678f8cfac2c48d4cab9537bb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 18:33:26 +0100
Subject: [PATCH 104/916] Fix upmake bug with conditions in bakefile files

Don't strip the <if> tags from bakefile variables (this bug fix is
actually in Makefile::Update Perl module, but is incorporated here by
reference) and remove these tags which somehow made it into upmake input
file, as they make no sense there.

Note also that upmake was recreated using a different version of fatpack
(0.010007), which accounts for many other differences in this file.
---
 build/files  |   4 -
 build/upmake | 580 ++++++++++++++++++++-------------------------------
 2 files changed, 222 insertions(+), 362 deletions(-)

diff --git a/build/files b/build/files
index d450ec7464..e6d0c67a6d 100644
--- a/build/files
+++ b/build/files
@@ -2067,7 +2067,6 @@ DFB_LOWLEVEL_HDR =
 
 OSX_LOWLEVEL_SRC =
     # Shared wxMac and wxCocoa files
-    <if cond="PLATFORM_MACOSX=='1'">
     src/osx/artmac.cpp
     src/osx/brush.cpp
     src/osx/dialog_osx.cpp
@@ -2091,12 +2090,10 @@ OSX_LOWLEVEL_SRC =
     src/osx/core/printmac.cpp
     src/osx/core/timer.cpp
     src/osx/core/utilsexc_cf.cpp
-    </if>
 
 OSX_LOWLEVEL_HDR =
 
 OSX_COMMON_SRC =
-<if cond="PLATFORM_MACOSX=='1'">
     # Common controls implementation
     src/osx/anybutton_osx.cpp
     src/osx/bmpbuttn_osx.cpp
@@ -2169,7 +2166,6 @@ OSX_COMMON_SRC =
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/textmeasure.cpp
-</if>
 
 # Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h
 OSX_SHARED_HDR =
diff --git a/build/upmake b/build/upmake
index d74de1d71e..e6dffcd114 100755
--- a/build/upmake
+++ b/build/upmake
@@ -18,9 +18,44 @@ $fatpacked{"Makefile/Update.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<
   
   our @EXPORT = qw(read_files_list upmake);
   
-  our $VERSION = '0.3'; # VERSION
+  # VERSION
   
+  =head1 SYNOPSIS
   
+      use Makefile::Update;
+      my $vars = read_files_list('files.lst');
+      upmake('foo.vcxproj', $vars->{sources}, $vars->{headers});
+  
+  =cut
+  
+  =func read_files_list
+  
+  Reads the file containing the file lists definitions and returns a hash ref
+  with variable names as keys and refs to arrays of the file names as values.
+  
+  Takes an (open) file handle as argument.
+  
+  The file contents is supposed to have the following very simple format:
+  
+      # Comments are allowed and ignored.
+      #
+      # The variable definitions must always be in the format shown below,
+      # i.e. whitespace is significant and there should always be a single
+      # file per line.
+      sources =
+          file1.cpp
+          file2.cpp
+  
+      headers =
+          file1.h
+          file2.h
+  
+      # It is also possible to define variables in terms of other variables
+      # defined before it in the file (no forward references):
+      everything =
+          $sources
+          $headers
+  =cut
   
   sub read_files_list
   {
@@ -55,6 +90,41 @@ $fatpacked{"Makefile/Update.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<
       return \%vars;
   }
   
+  =func upmake
+  
+  Update a file in place using the specified function and passing it the rest of
+  the arguments.
+  
+  The first parameter is either just the file path or a hash reference which may
+  contain the following keys:
+  
+  =over
+  
+  =item C<file>
+  
+  The path to the file to be updated, required.
+  
+  =item C<verbose>
+  
+  If true, give more messages about what is being done.
+  
+  =item C<quiet>
+  
+  If true, don't output any non-error messages.
+  
+  =item C<dryrun>
+  
+  If true, don't really update the file but just output whether it would have
+  been updated or not. If C<verbose> is also true, also output the diff of the
+  changes that would have been done.
+  
+  =back
+  
+  This is meant to be used with C<update_xxx()> defined in different
+  Makefile::Update::Xxx modules.
+  
+  Returns 1 if the file was changed or 0 otherwise.
+  =cut
   
   sub upmake
   {
@@ -137,104 +207,6 @@ $fatpacked{"Makefile/Update.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<
   }
   
   1;
-  
-  __END__
-  
-  =pod
-  
-  =encoding UTF-8
-  
-  =head1 NAME
-  
-  Makefile::Update - Update make files.
-  
-  =head1 VERSION
-  
-  version 0.3
-  
-  =head1 SYNOPSIS
-  
-      use Makefile::Update;
-      my $vars = read_files_list('files.lst');
-      upmake('foo.vcxproj', $vars->{sources}, $vars->{headers});
-  
-  =head1 FUNCTIONS
-  
-  =head2 read_files_list
-  
-  Reads the file containing the file lists definitions and returns a hash ref
-  with variable names as keys and refs to arrays of the file names as values.
-  
-  Takes an (open) file handle as argument.
-  
-  The file contents is supposed to have the following very simple format:
-  
-      # Comments are allowed and ignored.
-      #
-      # The variable definitions must always be in the format shown below,
-      # i.e. whitespace is significant and there should always be a single
-      # file per line.
-      sources =
-          file1.cpp
-          file2.cpp
-  
-      headers =
-          file1.h
-          file2.h
-  
-      # It is also possible to define variables in terms of other variables
-      # defined before it in the file (no forward references):
-      everything =
-          $sources
-          $headers
-  
-  =head2 upmake
-  
-  Update a file in place using the specified function and passing it the rest of
-  the arguments.
-  
-  The first parameter is either just the file path or a hash reference which may
-  contain the following keys:
-  
-  =over
-  
-  =item C<file>
-  
-  The path to the file to be updated, required.
-  
-  =item C<verbose>
-  
-  If true, give more messages about what is being done.
-  
-  =item C<quiet>
-  
-  If true, don't output any non-error messages.
-  
-  =item C<dryrun>
-  
-  If true, don't really update the file but just output whether it would have
-  been updated or not. If C<verbose> is also true, also output the diff of the
-  changes that would have been done.
-  
-  =back
-  
-  This is meant to be used with C<update_xxx()> defined in different
-  Makefile::Update::Xxx modules.
-  
-  Returns 1 if the file was changed or 0 otherwise.
-  
-  =head1 AUTHOR
-  
-  Vadim Zeitlin <vz-cpan@zeitlins.org>
-  
-  =head1 COPYRIGHT AND LICENSE
-  
-  This software is copyright (c) 2015 by Vadim Zeitlin.
-  
-  This is free software; you can redistribute it and/or modify it under
-  the same terms as the Perl 5 programming language system itself.
-  
-  =cut
 MAKEFILE_UPDATE
 
 $fatpacked{"Makefile/Update/Bakefile0.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'MAKEFILE_UPDATE_BAKEFILE0';
@@ -247,9 +219,32 @@ $fatpacked{"Makefile/Update/Bakefile0.pm"} = '#line '.(1+__LINE__).' "'.__FILE__
   use strict;
   use warnings;
   
-  our $VERSION = '0.3'; # VERSION
+  # VERSION
   
+  =head1 SYNOPSIS
   
+  This is used exclusively to update wxWidgets C<files.bkl> and is probably not
+  useful outside of wxWidgets project.
+  
+      use Makefile::Update::Bakefile0;
+      Makefile::Update::upmake('bakefiles/files.bkl', \&update_bakefile_0, $vars);
+  
+  =head1 SEE ALSO
+  
+  Makefile::Update
+  
+  =cut
+  
+  =func update_bakefile_0
+  
+  Update file with variable definitions in bakefile-0 format with the data
+  from the hash ref containing all the file lists.
+  
+  Takes the (open) file handles of the files to read and to write and the file
+  lists hash ref as arguments.
+  
+  Returns 1 if any changes were made.
+  =cut
   
   sub update_bakefile_0
   {
@@ -275,6 +270,8 @@ $fatpacked{"Makefile/Update/Bakefile0.pm"} = '#line '.(1+__LINE__).' "'.__FILE__
               s/<!-- .* -->//;
               s/^\s+//;
               s/\s+$//;
+              s{<if [^>]+>}{};
+              s{</if>}{};
               if (m{</set>}) {
                   # Check if we have any new files.
                   #
@@ -311,57 +308,6 @@ $fatpacked{"Makefile/Update/Bakefile0.pm"} = '#line '.(1+__LINE__).' "'.__FILE__
   
       $changed
   }
-  
-  __END__
-  
-  =pod
-  
-  =encoding UTF-8
-  
-  =head1 NAME
-  
-  Makefile::Update::Bakefile0 - Update bakefile-0.x files list.
-  
-  =head1 VERSION
-  
-  version 0.3
-  
-  =head1 SYNOPSIS
-  
-  This is used exclusively to update wxWidgets C<files.bkl> and is probably not
-  useful outside of wxWidgets project.
-  
-      use Makefile::Update::Bakefile0;
-      Makefile::Update::upmake('bakefiles/files.bkl', \&update_bakefile_0, $vars);
-  
-  =head1 FUNCTIONS
-  
-  =head2 update_bakefile_0
-  
-  Update file with variable definitions in bakefile-0 format with the data
-  from the hash ref containing all the file lists.
-  
-  Takes the (open) file handles of the files to read and to write and the file
-  lists hash ref as arguments.
-  
-  Returns 1 if any changes were made.
-  
-  =head1 SEE ALSO
-  
-  Makefile::Update
-  
-  =head1 AUTHOR
-  
-  Vadim Zeitlin <vz-cpan@zeitlins.org>
-  
-  =head1 COPYRIGHT AND LICENSE
-  
-  This software is copyright (c) 2015 by Vadim Zeitlin.
-  
-  This is free software; you can redistribute it and/or modify it under
-  the same terms as the Perl 5 programming language system itself.
-  
-  =cut
 MAKEFILE_UPDATE_BAKEFILE0
 
 $fatpacked{"Makefile/Update/MSBuild.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'MAKEFILE_UPDATE_MSBUILD';
@@ -374,9 +320,34 @@ $fatpacked{"Makefile/Update/MSBuild.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."
   use strict;
   use warnings;
   
-  our $VERSION = '0.3'; # VERSION
+  # VERSION
   
+  =head1 SYNOPSIS
   
+  Given an MSBuild project C<project.vcxproj> and its associated filters file
+  C<projects.vcxproj.filters>, the functions in this module can be used to update
+  the list of files in them to correspond to the given ones.
+  
+      use Makefile::Update::MSBuild;
+      upmake_msbuild_project('project.vcxproj', \@sources, \@headers);
+  
+  =head1 SEE ALSO
+  
+  Makefile::Update, Makefile::Update::VCProj
+  
+  =cut
+  
+  =func update_msbuild_project
+  
+  Update sources and headers in an MSBuild project and filter files.
+  
+  Pass the path of the project to update or a hash with the same keys as used by
+  C<Makefile::Update::upmake> as the first parameter and the references to the
+  sources and headers arrays as the subsequent ones.
+  
+  Returns 1 if any changes were made, either to the project itself or to its
+  associated C<.filters> file.
+  =cut
   
   sub update_msbuild_project
   {
@@ -405,6 +376,15 @@ $fatpacked{"Makefile/Update/MSBuild.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."
   }
   
   
+  =func update_msbuild
+  
+  Update sources and headers in an MSBuild project.
+  
+  Parameters: input and output file handles and array references to the sources
+  and the headers to be used in this project.
+  
+  Returns 1 if any changes were made.
+  =cut
   
   sub update_msbuild
   {
@@ -508,6 +488,16 @@ $fatpacked{"Makefile/Update/MSBuild.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."
       $changed
   }
   
+  =func update_msbuild_filters
+  
+  Update sources and headers in an MSBuild filters file.
+  
+  Parameters: input and output file handles, array references to the sources
+  and the headers to be used in this project and a callback used to determine
+  the filter for the new files.
+  
+  Returns 1 if any changes were made.
+  =cut
   
   sub update_msbuild_filters
   {
@@ -635,78 +625,6 @@ $fatpacked{"Makefile/Update/MSBuild.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."
   
       $changed
   }
-  
-  __END__
-  
-  =pod
-  
-  =encoding UTF-8
-  
-  =head1 NAME
-  
-  Makefile::Update::MSBuild - Update list of sources and headers in MSBuild projects.
-  
-  =head1 VERSION
-  
-  version 0.3
-  
-  =head1 SYNOPSIS
-  
-  Given an MSBuild project C<project.vcxproj> and its associated filters file
-  C<projects.vcxproj.filters>, the functions in this module can be used to update
-  the list of files in them to correspond to the given ones.
-  
-      use Makefile::Update::MSBuild;
-      upmake_msbuild_project('project.vcxproj', \@sources, \@headers);
-  
-  =head1 FUNCTIONS
-  
-  =head2 update_msbuild_project
-  
-  Update sources and headers in an MSBuild project and filter files.
-  
-  Pass the path of the project to update or a hash with the same keys as used by
-  C<Makefile::Update::upmake> as the first parameter and the references to the
-  sources and headers arrays as the subsequent ones.
-  
-  Returns 1 if any changes were made, either to the project itself or to its
-  associated C<.filters> file.
-  
-  =head2 update_msbuild
-  
-  Update sources and headers in an MSBuild project.
-  
-  Parameters: input and output file handles and array references to the sources
-  and the headers to be used in this project.
-  
-  Returns 1 if any changes were made.
-  
-  =head2 update_msbuild_filters
-  
-  Update sources and headers in an MSBuild filters file.
-  
-  Parameters: input and output file handles, array references to the sources
-  and the headers to be used in this project and a callback used to determine
-  the filter for the new files.
-  
-  Returns 1 if any changes were made.
-  
-  =head1 SEE ALSO
-  
-  Makefile::Update, Makefile::Update::VCProj
-  
-  =head1 AUTHOR
-  
-  Vadim Zeitlin <vz-cpan@zeitlins.org>
-  
-  =head1 COPYRIGHT AND LICENSE
-  
-  This software is copyright (c) 2015 by Vadim Zeitlin.
-  
-  This is free software; you can redistribute it and/or modify it under
-  the same terms as the Perl 5 programming language system itself.
-  
-  =cut
 MAKEFILE_UPDATE_MSBUILD
 
 $fatpacked{"Makefile/Update/Makefile.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'MAKEFILE_UPDATE_MAKEFILE';
@@ -719,9 +637,53 @@ $fatpacked{"Makefile/Update/Makefile.pm"} = '#line '.(1+__LINE__).' "'.__FILE__.
   use strict;
   use warnings;
   
-  our $VERSION = '0.3'; # VERSION
+  # VERSION
   
+  =head1 SYNOPSIS
   
+  This can be used to update the contents of a variable containing a list of
+  files in a makefile.
+  
+      use Makefile::Update::Makefile;
+      Makefile::Update::upmake('GNUmakefile', \&update_makefile, $vars);
+  
+  =head1 SEE ALSO
+  
+  Makefile::Update
+  
+  =cut
+  
+  =func update_makefile
+  
+  Update variable definitions in a makefile format with the data from the hash
+  ref containing all the file lists.
+  
+  Only most straightforward cases of variable or target definitions are
+  recognized here, i.e. just "var := value", "var = value" or "target: value".
+  In particular we don't support any GNU make extensions such as "export" or
+  "override" without speaking of anything more complex.
+  
+  On top of it, currently the value should contain a single file per line with
+  none at all on the first line (but this restriction could be relaxed later if
+  needed), i.e. the only supported case is
+  
+      var = \
+            foo \
+            bar \
+            baz
+  
+  and it must be followed by an empty line, too.
+  
+  Notice that if any of the "files" in the variable value looks like a makefile
+  variable, i.e. has "$(foo)" form, it is ignored by this function, i.e. not
+  removed even if it doesn't appear in the list of files (which will never be
+  the case normally).
+  
+  Takes the (open) file handles of the files to read and to write and the file
+  lists hash ref as arguments.
+  
+  Returns 1 if any changes were made.
+  =cut
   
   sub update_makefile
   {
@@ -1002,78 +964,6 @@ $fatpacked{"Makefile/Update/Makefile.pm"} = '#line '.(1+__LINE__).' "'.__FILE__.
   
       $changed
   }
-  
-  __END__
-  
-  =pod
-  
-  =encoding UTF-8
-  
-  =head1 NAME
-  
-  Makefile::Update::Makefile - Update lists of files in makefile variables.
-  
-  =head1 VERSION
-  
-  version 0.3
-  
-  =head1 SYNOPSIS
-  
-  This can be used to update the contents of a variable containing a list of
-  files in a makefile.
-  
-      use Makefile::Update::Makefile;
-      Makefile::Update::upmake('GNUmakefile', \&update_makefile, $vars);
-  
-  =head1 FUNCTIONS
-  
-  =head2 update_makefile
-  
-  Update variable definitions in a makefile format with the data from the hash
-  ref containing all the file lists.
-  
-  Only most straightforward cases of variable or target definitions are
-  recognized here, i.e. just "var := value", "var = value" or "target: value".
-  In particular we don't support any GNU make extensions such as "export" or
-  "override" without speaking of anything more complex.
-  
-  On top of it, currently the value should contain a single file per line with
-  none at all on the first line (but this restriction could be relaxed later if
-  needed), i.e. the only supported case is
-  
-      var = \
-            foo \
-            bar \
-            baz
-  
-  and it must be followed by an empty line, too.
-  
-  Notice that if any of the "files" in the variable value looks like a makefile
-  variable, i.e. has "$(foo)" form, it is ignored by this function, i.e. not
-  removed even if it doesn't appear in the list of files (which will never be
-  the case normally).
-  
-  Takes the (open) file handles of the files to read and to write and the file
-  lists hash ref as arguments.
-  
-  Returns 1 if any changes were made.
-  
-  =head1 SEE ALSO
-  
-  Makefile::Update
-  
-  =head1 AUTHOR
-  
-  Vadim Zeitlin <vz-cpan@zeitlins.org>
-  
-  =head1 COPYRIGHT AND LICENSE
-  
-  This software is copyright (c) 2015 by Vadim Zeitlin.
-  
-  This is free software; you can redistribute it and/or modify it under
-  the same terms as the Perl 5 programming language system itself.
-  
-  =cut
 MAKEFILE_UPDATE_MAKEFILE
 
 $fatpacked{"Makefile/Update/VCProj.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'MAKEFILE_UPDATE_VCPROJ';
@@ -1086,9 +976,32 @@ $fatpacked{"Makefile/Update/VCProj.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\
   use strict;
   use warnings;
   
-  our $VERSION = '0.3'; # VERSION
+  # VERSION
   
+  =head1 SYNOPSIS
   
+  The function L<update_vcproj()> can be used to update the list of headers and
+  sources in the given Visual C++ project file C<project.vcproj>:
+  
+      use Makefile::Update::VCProj;
+      upmake_msbuild_project('project.vcproj', \@sources, \@headers);
+  
+  =head1 SEE ALSO
+  
+  Makefile::Update, Makefile::Update::MSBuild
+  
+  =cut
+  
+  =func update_vcproj
+  
+  Update sources and headers in a VC++ project.
+  
+  Parameters: input and output file handles, array references to the sources
+  and the headers to be used in this project and a callback used to determine
+  the filter for the new files.
+  
+  Returns 1 if any changes were made.
+  =cut
   
   sub update_vcproj
   {
@@ -1252,57 +1165,6 @@ $fatpacked{"Makefile/Update/VCProj.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\
   
       $changed
   }
-  
-  __END__
-  
-  =pod
-  
-  =encoding UTF-8
-  
-  =head1 NAME
-  
-  Makefile::Update::VCProj - Update list of sources and headers in Visual C++ projects.
-  
-  =head1 VERSION
-  
-  version 0.3
-  
-  =head1 SYNOPSIS
-  
-  The function L<update_vcproj()> can be used to update the list of headers and
-  sources in the given Visual C++ project file C<project.vcproj>:
-  
-      use Makefile::Update::VCProj;
-      upmake_msbuild_project('project.vcproj', \@sources, \@headers);
-  
-  =head1 FUNCTIONS
-  
-  =head2 update_vcproj
-  
-  Update sources and headers in a VC++ project.
-  
-  Parameters: input and output file handles, array references to the sources
-  and the headers to be used in this project and a callback used to determine
-  the filter for the new files.
-  
-  Returns 1 if any changes were made.
-  
-  =head1 SEE ALSO
-  
-  Makefile::Update, Makefile::Update::MSBuild
-  
-  =head1 AUTHOR
-  
-  Vadim Zeitlin <vz-cpan@zeitlins.org>
-  
-  =head1 COPYRIGHT AND LICENSE
-  
-  This software is copyright (c) 2015 by Vadim Zeitlin.
-  
-  This is free software; you can redistribute it and/or modify it under
-  the same terms as the Perl 5 programming language system itself.
-  
-  =cut
 MAKEFILE_UPDATE_VCPROJ
 
 s/^  //mg for values %fatpacked;
@@ -1313,15 +1175,17 @@ no strict 'refs';
 
 if ($] < 5.008) {
   *{"${class}::INC"} = sub {
-     if (my $fat = $_[0]{$_[1]}) {
-       return sub {
-         return 0 unless length $fat;
-         $fat =~ s/^([^\n]*\n?)//;
-         $_ = $1;
-         return 1;
-       };
-     }
-     return;
+    if (my $fat = $_[0]{$_[1]}) {
+      my $pos = 0;
+      my $last = length $fat;
+      return (sub {
+        return 0 if $pos == $last;
+        my $next = (1 + index $fat, "\n", $pos) || $last;
+        $_ .= substr $fat, $pos, $next - $pos;
+        $pos = $next;
+        return 1;
+      });
+    }
   };
 }
 

From d7fbf1f820778710277fa419dd76e2fa291ee4e3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 18:43:01 +0100
Subject: [PATCH 105/916] Output the message about bakefile_gen by default in
 upmake

This message shouldn't be given only when --verbose is given, it's
useful as a reminder and you shouldn't have to remember to give a
special option to get this reminder.
---
 build/upmake           | 2 +-
 build/upmake_script.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/upmake b/build/upmake
index e6dffcd114..c02001348d 100755
--- a/build/upmake
+++ b/build/upmake
@@ -1257,7 +1257,7 @@ my $vars = read_files_list($files);
 
 if (!$only_msvs) {
     if (call_upmake("$Bin/bakefiles/files.bkl", \&update_bakefile_0, $vars)) {
-        print qq{Don't forget to run "bakefile_gen -b wx.bkl".\n} if $verbose;
+        print qq{Don't forget to run "bakefile_gen -b wx.bkl".\n};
     }
 }
 
diff --git a/build/upmake_script.pl b/build/upmake_script.pl
index 75939c8407..a0855b04e6 100755
--- a/build/upmake_script.pl
+++ b/build/upmake_script.pl
@@ -53,7 +53,7 @@ my $vars = read_files_list($files);
 
 if (!$only_msvs) {
     if (call_upmake("$Bin/bakefiles/files.bkl", \&update_bakefile_0, $vars)) {
-        print qq{Don't forget to run "bakefile_gen -b wx.bkl".\n} if $verbose;
+        print qq{Don't forget to run "bakefile_gen -b wx.bkl".\n};
     }
 }
 

From b2a8c2188f00d4bb2dcb84f5ffab82395c3c9476 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 19:19:29 +0100
Subject: [PATCH 106/916] Remove duplicate wx/scrolbar.h from CMake files list

This will avoid warnings when regenerating it the next time.
---
 build/cmake/files.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 018fd0b30d..265b868059 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -952,7 +952,6 @@ set(GUI_CMN_HDR
     wx/renderer.h
     wx/richmsgdlg.h
     wx/scrolbar.h
-    wx/scrolbar.h
     wx/scrolwin.h
     wx/selstore.h
     wx/settings.h

From 267067aa8af98ff92ca79c33dcf4f570b8aa4df8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 22:29:42 +0100
Subject: [PATCH 107/916] Regenerate CMake files list from upmake too

Replace the specialized Python script used for it before (and which was
actually forgotten to run a couple of times already) with a newer
version of upmake, which can now update CMake variable definitions too.
---
 build/cmake/files.cmake     |   2 +-
 build/cmake/update_files.py |  77 ---------------------
 build/upmake                | 131 ++++++++++++++++++++++++++++++++++++
 build/upmake_script.pl      |   5 ++
 4 files changed, 137 insertions(+), 78 deletions(-)
 delete mode 100755 build/cmake/update_files.py

diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 265b868059..82690419f8 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -1,4 +1,4 @@
-# Automatically generated from build/files by update_files.py
+# Automatically generated from build/files by build/upmake
 # DO NOT MODIFY MANUALLY !
 
 set(BASE_UNIX_AND_DARWIN_SRC
diff --git a/build/cmake/update_files.py b/build/cmake/update_files.py
deleted file mode 100755
index aea703b253..0000000000
--- a/build/cmake/update_files.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-
-#############################################################################
-# Name:        build/cmake/update_files.py
-# Purpose:     Convert build/files to files.cmake
-# Author:      Tobias Taschner
-# Created:     2016-09-20
-# Copyright:   (c) 2016 wxWidgets development team
-# Licence:     wxWindows licence
-#############################################################################
-
-import os
-import re
-
-outpath = os.path.dirname(os.path.abspath(__file__))
-
-infile = open(outpath + "/../files", "r")
-outfile = open(outpath + "/files.cmake", "w")
-outfile.write("# Automatically generated from build/files by " + os.path.basename(__file__) + "\n")
-outfile.write("# DO NOT MODIFY MANUALLY !\n\n")
-
-# Compile regular expressions
-var_ex = re.compile('([\w]+)[\s]*=')
-comment_ex = re.compile('^[#]+')
-evar_ex = re.compile('\$\(([\w]+)\)')
-cmd_ex = re.compile('^<')
-
-files = None
-var_name = None
-
-def write_file_list():
-    # Write current list of files to output file
-    if not var_name:
-        return
-
-    outfile.write('set(' + var_name + '\n')
-    for file in files:
-        outfile.write('    ')
-        vm = evar_ex.match(file)
-        if vm:
-            # Convert variable reference to cmake variable reference
-            outfile.write('${'+vm.group(1)+'}')
-        else:
-            outfile.write(file)
-        outfile.write('\n')
-
-    outfile.write(')\n\n')
-
-for line in infile.readlines():
-    # Ignore comment lines
-    m = comment_ex.match(line)
-    if m:
-        continue
-    m = cmd_ex.match(line.strip())
-    if m:
-        # Ignore bake file commands but note them in the target file in
-        # case we might need them
-        line = '#TODO: ' + line
-
-    # Check for variable declaration
-    m = var_ex.match(line)
-    if m:
-        write_file_list()
-
-        var_name = m.group(1)
-        files = []
-    else:
-        # Collect every file entry
-        file = line.strip()
-        if file and var_name:
-            files.append(file)
-
-# Write last variable
-write_file_list()
-
-infile.close()
-outfile.close()
diff --git a/build/upmake b/build/upmake
index c02001348d..8a10b35d62 100755
--- a/build/upmake
+++ b/build/upmake
@@ -310,6 +310,132 @@ $fatpacked{"Makefile/Update/Bakefile0.pm"} = '#line '.(1+__LINE__).' "'.__FILE__
   }
 MAKEFILE_UPDATE_BAKEFILE0
 
+$fatpacked{"Makefile/Update/CMakefile.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'MAKEFILE_UPDATE_CMAKEFILE';
+  package Makefile::Update::CMakefile;
+  # ABSTRACT: Update lists of files in CMake variables.
+  
+  use Exporter qw(import);
+  our @EXPORT = qw(update_cmakefile);
+  
+  use strict;
+  use warnings;
+  
+  # VERSION
+  
+  =head1 SYNOPSIS
+  
+  This can be used to update the contents of a variable containing a list of
+  files in a CMake file.
+  
+      use Makefile::Update::CMakefile;
+      Makefile::Update::upmake('CMakeLists.txt', \&update_cmakefile, $vars);
+  
+  =head1 SEE ALSO
+  
+  Makefile::Update
+  
+  =cut
+  
+  # Variables in our input files use make-like $(var) syntax while CMake uses
+  # shell-like ${var}, so convert to the target format.
+  sub _var_to_cmake
+  {
+      my ($var) = @_;
+      $var =~ s/\((\w+)\)/{$1}/g;
+      $var;
+  }
+  
+  =func update_cmakefile
+  
+  Update variable definitions in a CMake file with the data from the hash
+  ref containing all the file lists.
+  
+  The variables are supposed to be defined in the following format:
+  
+      set(var
+          foo
+          bar
+          baz
+      )
+  
+  Notably, each file has to be on its own line, including the first one.
+  
+  Takes the (open) file handles of the files to read and to write and the file
+  lists hash ref as arguments.
+  
+  Returns 1 if any changes were made.
+  =cut
+  
+  sub update_cmakefile
+  {
+      my ($in, $out, $vars) = @_;
+  
+      # Variable whose contents is being currently replaced.
+      my $var;
+  
+      # Hash with files defined for the specified variable as keys and 0 or 1
+      # depending on whether we have seen them in the input file as values.
+      my %files;
+  
+      # Set to 1 if we made any changes.
+      my $changed = 0;
+      while (<$in>) {
+          # Preserve the original line to be able to output it with any comments
+          # that we strip below.
+          my $line_orig = $_;
+  
+          # Get rid of white space and comments.
+          chomp;
+          s/^\s+//;
+          s/\s+$//;
+          s/ *#.*$//;
+  
+          # Are we inside a variable definition?
+          if (defined $var) {
+              if (/^\)$/) {
+                  # End of variable definition, check if we have any new files.
+                  #
+                  # TODO Insert them in alphabetical order.
+                  while (my ($file, $seen) = each(%files)) {
+                      if (!$seen) {
+                          # This file wasn't present in the input, add it.
+                          # TODO Use proper indentation.
+                          print $out "    $file\n";
+  
+                          $changed = 1;
+                      }
+                  }
+  
+                  undef $var;
+              } elsif ($_) {
+                  # We're inside a variable definition.
+                  if (not exists $files{$_}) {
+                      # This file was removed.
+                      $changed = 1;
+                      next;
+                  }
+  
+                  if ($files{$_}) {
+                      warn qq{Duplicate file "$_" in the definition of the } .
+                           qq{variable "$var" at line $.\n}
+                  } else {
+                      $files{$_} = 1;
+                  }
+              }
+          } elsif (/^set *\( *(\w+)$/ && exists $vars->{$1}) {
+              # Start of a new variable definition.
+              $var = $1;
+  
+              %files = map { _var_to_cmake($_) => 0 } @{$vars->{$var}};
+          }
+  
+          print $out $line_orig;
+      }
+  
+      $changed
+  }
+MAKEFILE_UPDATE_CMAKEFILE
+
 $fatpacked{"Makefile/Update/MSBuild.pm"} = '#line '.(1+__LINE__).' "'.__FILE__."\"\n".<<'MAKEFILE_UPDATE_MSBUILD';
   package Makefile::Update::MSBuild;
   # ABSTRACT: Update list of sources and headers in MSBuild projects.
@@ -1214,6 +1340,7 @@ use FindBin qw($Bin);
 
 use Makefile::Update;
 use Makefile::Update::Bakefile0;
+use Makefile::Update::CMakefile;
 use Makefile::Update::MSBuild;
 use Makefile::Update::VCProj;
 
@@ -1261,6 +1388,10 @@ if (!$only_msvs) {
     }
 }
 
+if (!$only_msvs && !$only_bkl) {
+    call_upmake("$Bin/cmake/files.cmake", \&update_cmakefile, $vars);
+}
+
 if (!$only_bkl) {
     # Path to the project root directory from the directory containing the
     # projects.
diff --git a/build/upmake_script.pl b/build/upmake_script.pl
index a0855b04e6..f11bbeaf72 100755
--- a/build/upmake_script.pl
+++ b/build/upmake_script.pl
@@ -10,6 +10,7 @@ use FindBin qw($Bin);
 
 use Makefile::Update;
 use Makefile::Update::Bakefile0;
+use Makefile::Update::CMakefile;
 use Makefile::Update::MSBuild;
 use Makefile::Update::VCProj;
 
@@ -57,6 +58,10 @@ if (!$only_msvs) {
     }
 }
 
+if (!$only_msvs && !$only_bkl) {
+    call_upmake("$Bin/cmake/files.cmake", \&update_cmakefile, $vars);
+}
+
 if (!$only_bkl) {
     # Path to the project root directory from the directory containing the
     # projects.

From 5def115f284efc31fa6c480944cc6e4c1e090c08 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 7 Jan 2018 22:43:24 +0100
Subject: [PATCH 108/916] Extract common type definitions from wx/defs.h to
 wx/types.h

Fix the problem with compiling user code including wx/debug.h as the
first wxWidgets header under MSW. This ought to work, but didn't,
because wx/debug.h included wx/chartype.h without including wx/defs.h
(because there is already an inclusion in the other direction), which
defines SIZEOF_WCHAR_T required by wx/chartype.h, first.

Notice that we repurpose the existing but completely unused (no mentions
of it or the symbols defined in it anywhere neither in wxWidgets nor in
any of the code search engines) wx/types.h header as it has a fitting
name and this avoids having to add a new header and remove the existing
one.
---
 include/wx/chartype.h |   9 +-
 include/wx/defs.h     | 376 +---------------------------------
 include/wx/types.h    | 461 +++++++++++++++++++++++++++++++++++-------
 3 files changed, 391 insertions(+), 455 deletions(-)

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index cc65a8b3a8..9a3a805a21 100644
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -13,8 +13,13 @@
 #ifndef _WX_WXCHARTYPE_H_
 #define _WX_WXCHARTYPE_H_
 
-/* defs.h indirectly includes this file, so don't include it here */
-#include "wx/platform.h"
+/*
+    wx/defs.h indirectly includes this file, so we can't include it here,
+    include just its subset which defines SIZEOF_WCHAR_T that is used here
+    (under Unix it's in configure-generated setup.h, so including wx/platform.h
+    would have been enough, but this is not the case under other platforms).
+ */
+#include "wx/types.h"
 
 /* check whether we have wchar_t and which size it is if we do */
 #if !defined(wxUSE_WCHAR_T)
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 2c5cdeeeb6..b1d11474a0 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -836,381 +836,7 @@ typedef short int WXTYPE;
 #    define wxUSE_DEBUG_NEW_ALWAYS 0
 #endif
 
-/*  ---------------------------------------------------------------------------- */
-/*  standard wxWidgets types */
-/*  ---------------------------------------------------------------------------- */
-
-/*  the type for screen and DC coordinates */
-typedef int wxCoord;
-
-enum {  wxDefaultCoord = -1 };
-
-/*  ---------------------------------------------------------------------------- */
-/*  define fixed length types */
-/*  ---------------------------------------------------------------------------- */
-
-#if defined(__MINGW32__)
-    #include <sys/types.h>
-#endif
-
-/*  chars are always one byte (by definition), shorts are always two (in */
-/*  practice) */
-
-/*  8bit */
-typedef signed char wxInt8;
-typedef unsigned char wxUint8;
-typedef wxUint8 wxByte;
-
-
-/*  16bit */
-#ifdef SIZEOF_SHORT
-    #if SIZEOF_SHORT != 2
-        #error "wxWidgets assumes sizeof(short) == 2, please fix the code"
-    #endif
-#else
-    #define SIZEOF_SHORT 2
-#endif
-
-typedef signed short wxInt16;
-typedef unsigned short wxUint16;
-
-typedef wxUint16 wxWord;
-
-/*
-  things are getting more interesting with ints, longs and pointers
-
-  there are several different standard data models described by this table:
-
-  +-----------+----------------------------+
-  |type\model | LP64 ILP64 LLP64 ILP32 LP32|
-  +-----------+----------------------------+
-  |char       |  8     8     8     8     8 |
-  |short      | 16    16    16    16    16 |
-  |int        | 32    64    32    32    16 |
-  |long       | 64    64    32    32    32 |
-  |long long  | 64    64    64    --    -- |
-  |void *     | 64    64    64    32    32 |
-  +-----------+----------------------------+
-
-  Win16 used LP32 (but we don't support it any longer), Win32 obviously used
-  ILP32 and Win64 uses LLP64 (a.k.a. P64)
-
-  Under Unix LP64 is the most widely used (the only I've ever seen, in fact)
- */
-
-/*  32bit */
-#if defined(__WINDOWS__)
-    #if defined(__WIN32__)
-        typedef int wxInt32;
-        typedef unsigned int wxUint32;
-
-        /*
-            Win64 uses LLP64 model and so ints and longs have the same size as
-            in Win32.
-         */
-        #ifndef SIZEOF_INT
-            #define SIZEOF_INT 4
-        #endif
-
-        #ifndef SIZEOF_LONG
-            #define SIZEOF_LONG 4
-        #endif
-
-        #ifndef SIZEOF_LONG_LONG
-            #define SIZEOF_LONG_LONG 8
-        #endif
-
-        #ifndef SIZEOF_WCHAR_T
-            /* Windows uses UTF-16 */
-            #define SIZEOF_WCHAR_T 2
-        #endif
-
-        #ifndef SIZEOF_SIZE_T
-            /*
-               Under Win64 sizeof(size_t) == 8 and so it is neither unsigned
-               int nor unsigned long!
-             */
-            #ifdef __WIN64__
-                #define SIZEOF_SIZE_T 8
-
-                #undef wxSIZE_T_IS_UINT
-            #else /* Win32 */
-                #define SIZEOF_SIZE_T 4
-
-                #define wxSIZE_T_IS_UINT
-            #endif
-            #undef wxSIZE_T_IS_ULONG
-        #endif
-
-        #ifndef SIZEOF_VOID_P
-            #ifdef __WIN64__
-                #define SIZEOF_VOID_P 8
-            #else /*  Win32 */
-                #define SIZEOF_VOID_P 4
-            #endif /*  Win64/32 */
-        #endif
-    #else
-        #error "Unsupported Windows version"
-    #endif
-#else /*  !Windows */
-    /*  SIZEOF_XXX are normally defined by configure */
-    #ifdef SIZEOF_INT
-        #if SIZEOF_INT == 8
-            /*  must be ILP64 data model, there is normally a special 32 bit */
-            /*  type in it but we don't know what it is... */
-            #error "No 32bit int type on this platform"
-        #elif SIZEOF_INT == 4
-            typedef int wxInt32;
-            typedef unsigned int wxUint32;
-        #elif SIZEOF_INT == 2
-            /*  must be LP32 */
-            #if SIZEOF_LONG != 4
-                #error "No 32bit int type on this platform"
-            #endif
-
-            typedef long wxInt32;
-            typedef unsigned long wxUint32;
-        #else
-            /*  wxWidgets is not ready for 128bit systems yet... */
-            #error "Unknown sizeof(int) value, what are you compiling for?"
-        #endif
-    #else /*  !defined(SIZEOF_INT) */
-        /*  assume default 32bit machine -- what else can we do? */
-        wxCOMPILE_TIME_ASSERT( sizeof(int) == 4, IntMustBeExactly4Bytes);
-        wxCOMPILE_TIME_ASSERT( sizeof(size_t) == 4, SizeTMustBeExactly4Bytes);
-        wxCOMPILE_TIME_ASSERT( sizeof(void *) == 4, PtrMustBeExactly4Bytes);
-
-        #define SIZEOF_INT 4
-        #define SIZEOF_SIZE_T 4
-        #define SIZEOF_VOID_P 4
-
-        typedef int wxInt32;
-        typedef unsigned int wxUint32;
-
-        #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T)
-            #define SIZEOF_WCHAR_T 4
-        #endif
-        #if !defined(SIZEOF_WCHAR_T)
-            /*  also assume that sizeof(wchar_t) == 2 (under Unix the most */
-            /*  common case is 4 but there configure would have defined */
-            /*  SIZEOF_WCHAR_T for us) */
-            /*  the most common case */
-            wxCOMPILE_TIME_ASSERT( sizeof(wchar_t) == 2,
-                                    Wchar_tMustBeExactly2Bytes);
-
-            #define SIZEOF_WCHAR_T 2
-        #endif /*  !defined(SIZEOF_WCHAR_T) */
-    #endif
-#endif /*  Win/!Win */
-
-#ifndef SIZEOF_WCHAR_T
-    #error "SIZEOF_WCHAR_T must be defined, but isn't"
-#endif
-
-/* also define C99-like sized MIN/MAX constants */
-#define wxINT8_MIN CHAR_MIN
-#define wxINT8_MAX CHAR_MAX
-#define wxUINT8_MAX UCHAR_MAX
-
-#define wxINT16_MIN SHRT_MIN
-#define wxINT16_MAX SHRT_MAX
-#define wxUINT16_MAX USHRT_MAX
-
-#if SIZEOF_INT == 4
-    #define wxINT32_MIN INT_MIN
-    #define wxINT32_MAX INT_MAX
-    #define wxUINT32_MAX UINT_MAX
-#elif SIZEOF_LONG == 4
-    #define wxINT32_MIN LONG_MIN
-    #define wxINT32_MAX LONG_MAX
-    #define wxUINT32_MAX ULONG_MAX
-#else
-    #error "Unknown 32 bit type"
-#endif
-
-typedef wxUint32 wxDword;
-
-#ifdef LLONG_MAX
-    #define wxINT64_MIN LLONG_MIN
-    #define wxINT64_MAX LLONG_MAX
-    #define wxUINT64_MAX ULLONG_MAX
-#else
-    #define wxINT64_MIN (wxLL(-9223372036854775807)-1)
-    #define wxINT64_MAX wxLL(9223372036854775807)
-    #define wxUINT64_MAX wxULL(0xFFFFFFFFFFFFFFFF)
-#endif
-
-/*  64 bit */
-
-/*  NB: we #define and not typedef wxLongLong_t because we use "#ifdef */
-/*      wxLongLong_t" in wx/longlong.h */
-
-/*      wxULongLong_t is set later (usually to unsigned wxLongLong_t) */
-
-/*  to avoid compilation problems on 64bit machines with ambiguous method calls */
-/*  we will need to define this */
-#undef wxLongLongIsLong
-
-/*
-   First check for specific compilers which have known 64 bit integer types,
-   this avoids clashes with SIZEOF_LONG[_LONG] being defined incorrectly for
-   e.g. MSVC builds (Python.h defines it as 8 even for MSVC).
-
-   Also notice that we check for "long long" before checking for 64 bit long as
-   we still want to use "long long" and not "long" for wxLongLong_t on 64 bit
-   architectures to be able to pass wxLongLong_t to the standard functions
-   prototyped as taking "long long" such as strtoll().
- */
-#if (defined(__VISUALC__) || defined(__INTELC__)) && defined(__WIN32__)
-    #define wxLongLong_t __int64
-    #define wxLongLongSuffix i64
-    #define wxLongLongFmtSpec "I64"
-#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
-    #define wxLongLong_t __int64
-    #define wxLongLongSuffix i64
-    #define wxLongLongFmtSpec "L"
-#elif defined(__MINGW32__) && \
-    (defined(__USE_MINGW_ANSI_STDIO) && (__USE_MINGW_ANSI_STDIO != 1))
-    #define wxLongLong_t long long
-    #define wxLongLongSuffix ll
-    #define wxLongLongFmtSpec "I64"
-#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
-        defined(__GNUC__) || \
-        defined(__CYGWIN__)
-    #define wxLongLong_t long long
-    #define wxLongLongSuffix ll
-    #define wxLongLongFmtSpec "ll"
-#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
-    #define wxLongLong_t long
-    #define wxLongLongSuffix l
-    #define wxLongLongFmtSpec "l"
-    #define wxLongLongIsLong
-#endif
-
-
-#ifdef wxLongLong_t
-    #define wxULongLong_t unsigned wxLongLong_t
-
-    /*
-        wxLL() and wxULL() macros allow to define 64 bit constants in a
-        portable way.
-     */
-    #ifndef wxCOMPILER_BROKEN_CONCAT_OPER
-        #define wxLL(x) wxCONCAT(x, wxLongLongSuffix)
-        #define wxULL(x) wxCONCAT(x, wxCONCAT(u, wxLongLongSuffix))
-    #else
-        /*
-            Currently only Borland compiler has broken concatenation operator
-            and this compiler is known to use [u]i64 suffix.
-         */
-        #define wxLL(x) wxAPPEND_i64(x)
-        #define wxULL(x) wxAPPEND_ui64(x)
-    #endif
-
-    typedef wxLongLong_t wxInt64;
-    typedef wxULongLong_t wxUint64;
-
-    #define wxHAS_INT64 1
-
-    #ifndef wxLongLongIsLong
-        #define wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-    #endif
-#elif wxUSE_LONGLONG
-    /*  these macros allow to define 64 bit constants in a portable way */
-    #define wxLL(x) wxLongLong(x)
-    #define wxULL(x) wxULongLong(x)
-
-    #define wxInt64 wxLongLong
-    #define wxUint64 wxULongLong
-
-    #define wxHAS_INT64 1
-
-#else /* !wxUSE_LONGLONG */
-
-    #define wxHAS_INT64 0
-
-#endif
-
-/*
-    Helper macro for conditionally compiling some code only if wxLongLong_t is
-    available and is a type different from the other integer types (i.e. not
-    long).
- */
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-    #define wxIF_LONG_LONG_TYPE(x) x
-#else
-    #define wxIF_LONG_LONG_TYPE(x)
-#endif
-
-
-/* Make sure ssize_t is defined (a signed type the same size as size_t). */
-/* (HAVE_SSIZE_T is not already defined by configure) */
-#ifndef HAVE_SSIZE_T
-#ifdef __MINGW32__
-    #if defined(_SSIZE_T_) || defined(_SSIZE_T_DEFINED)
-        #define HAVE_SSIZE_T
-    #endif
-#endif
-#endif /* !HAVE_SSIZE_T */
-
-/* If we really don't have ssize_t, provide our own version. */
-#ifdef HAVE_SSIZE_T
-    #ifdef __UNIX__
-        #include <sys/types.h>
-    #endif
-#else /* !HAVE_SSIZE_T */
-    #if SIZEOF_SIZE_T == 4
-        typedef wxInt32 ssize_t;
-    #elif SIZEOF_SIZE_T == 8
-        typedef wxInt64 ssize_t;
-    #else
-        #error "error defining ssize_t, size_t is not 4 or 8 bytes"
-    #endif
-
-    /* prevent ssize_t redefinitions in other libraries */
-    #define HAVE_SSIZE_T
-#endif
-
-/*
-    We can't rely on Windows _W64 being defined as windows.h may not be
-    included so define our own equivalent: this should be used with types
-    like WXLPARAM or WXWPARAM which are 64 bit under Win64 to avoid warnings
-    each time we cast it to a pointer or a handle (which results in hundreds
-    of warnings as Win32 API often passes pointers in them)
- */
-#ifdef __VISUALC__
-    #define wxW64 __w64
-#else
-    #define wxW64
-#endif
-
-/*
-   Define signed and unsigned integral types big enough to contain all of long,
-   size_t and void *.
- */
-#if SIZEOF_LONG >= SIZEOF_VOID_P
-    /*
-       Normal case when long is the largest integral type.
-     */
-    typedef long wxIntPtr;
-    typedef unsigned long wxUIntPtr;
-#elif SIZEOF_SIZE_T >= SIZEOF_VOID_P
-    /*
-       Win64 case: size_t is the only integral type big enough for "void *".
-
-       Notice that we must use __w64 to avoid warnings about casting pointers
-       to wxIntPtr (which we do often as this is what it is defined for) in 32
-       bit build with MSVC.
-     */
-    typedef wxW64 ssize_t wxIntPtr;
-    typedef size_t wxUIntPtr;
-#else
-    /*
-       This should never happen for the current architectures but if you're
-       using one where it does, please contact wx-dev@googlegroups.com.
-     */
-    #error "Pointers can't be stored inside integer types."
-#endif
+#include "wx/types.h"
 
 #ifdef __cplusplus
 
diff --git a/include/wx/types.h b/include/wx/types.h
index 2e58582168..6e8d76b756 100644
--- a/include/wx/types.h
+++ b/include/wx/types.h
@@ -1,92 +1,397 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/types.h
-// Purpose:     Type identifiers, used by resource system
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
+/*
+ * Name:        wx/types.h
+ * Purpose:     Declarations of common wx types and related constants.
+ * Author:      Vadim Zeitlin (extracted from wx/defs.h)
+ * Created:     2018-01-07
+ * Copyright:   (c) 1997-2018 wxWidgets dev team
+ * Licence:     wxWindows licence
+ */
 
-#ifndef _WX_TYPESH__
-#define _WX_TYPESH__
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
-// Types of objects
-#define wxTYPE_ANY             0
-#define wxTYPE_OBJECT          wxTYPE_ANY
-#define wxTYPE_WINDOW          1
-#define wxTYPE_DIALOG_BOX      2
-#define wxTYPE_ITEM            3
-#define wxTYPE_PANEL           4
-#define wxTYPE_CANVAS          5
-#define wxTYPE_TEXT_WINDOW     6
-#define wxTYPE_FRAME           7
+#ifndef _WX_TYPES_H_
+#define _WX_TYPES_H_
 
-#define wxTYPE_BUTTON          8
-#define wxTYPE_TEXT            9
-#define wxTYPE_MESSAGE         10
-#define wxTYPE_CHOICE          11
-#define wxTYPE_LIST_BOX        12
-#define wxTYPE_SLIDER          13
-#define wxTYPE_CHECK_BOX       14
-#define wxTYPE_MENU            15
-#define wxTYPE_MENU_BAR        16
-#define wxTYPE_MULTI_TEXT      17
-#define wxTYPE_RADIO_BOX       18
-#define wxTYPE_GROUP_BOX       19
-#define wxTYPE_GAUGE           20
-#define wxTYPE_SCROLL_BAR      21
-#define wxTYPE_VIRT_LIST_BOX   22
-#define wxTYPE_COMBO_BOX       23
-#define wxTYPE_RADIO_BUTTON    24
+/*
+    Don't include wx/defs.h from here as we're included from it, but do include
+    wx/platform.h which will take care of including wx/setup.h too.
+ */
+#include "wx/platform.h"
 
-#define wxTYPE_EVENT           25
-#define wxTYPE_DC              26
-#define wxTYPE_DC_CANVAS       27
-#define wxTYPE_DC_POSTSCRIPT   28
-#define wxTYPE_DC_PRINTER      29
-#define wxTYPE_DC_METAFILE     30
-#define wxTYPE_DC_MEMORY       31
-#define wxTYPE_MOUSE_EVENT     32
-#define wxTYPE_KEY_EVENT       33
-#define wxTYPE_COMMAND_EVENT   34
-#define wxTYPE_DC_PANEL        35
+/*  ---------------------------------------------------------------------------- */
+/*  standard wxWidgets types */
+/*  ---------------------------------------------------------------------------- */
 
-#define wxTYPE_PEN             40
-#define wxTYPE_BRUSH           41
-#define wxTYPE_FONT            42
-#define wxTYPE_ICON            42
-#define wxTYPE_BITMAP          43
-#define wxTYPE_METAFILE        44
-#define wxTYPE_TIMER           45
-#define wxTYPE_COLOUR          46
-#define wxTYPE_COLOURMAP       47
-#define wxTYPE_CURSOR          48
+/*  the type for screen and DC coordinates */
+typedef int wxCoord;
 
-#define wxTYPE_DDE_CLIENT      60
-#define wxTYPE_DDE_SERVER      61
-#define wxTYPE_DDE_CONNECTION  62
+enum {  wxDefaultCoord = -1 };
 
-#define wxTYPE_HELP_INSTANCE   63
+/*  ---------------------------------------------------------------------------- */
+/*  define fixed length types */
+/*  ---------------------------------------------------------------------------- */
 
-#define wxTYPE_LIST            70
-#define wxTYPE_STRING_LIST     71
-#define wxTYPE_HASH_TABLE      72
-#define wxTYPE_NODE            73
-#define wxTYPE_APP             74
-#define wxTYPE_DATE            75
+#if defined(__MINGW32__)
+    #include <sys/types.h>
+#endif
 
-#define wxTYPE_ENHANCED_DIALOG 80
-#define wxTYPE_TOOLBAR         81
-#define wxTYPE_BUTTONBAR       82
+/*  chars are always one byte (by definition), shorts are always two (in */
+/*  practice) */
 
-#define wxTYPE_DATABASE        90
-#define wxTYPE_QUERY_FIELD     91
-#define wxTYPE_QUERY_COL       92
-#define wxTYPE_RECORDSET       93
+/*  8bit */
+typedef signed char wxInt8;
+typedef unsigned char wxUint8;
+typedef wxUint8 wxByte;
 
-#define wxTYPE_USER            500
+
+/*  16bit */
+#ifdef SIZEOF_SHORT
+    #if SIZEOF_SHORT != 2
+        #error "wxWidgets assumes sizeof(short) == 2, please fix the code"
+    #endif
+#else
+    #define SIZEOF_SHORT 2
+#endif
+
+typedef signed short wxInt16;
+typedef unsigned short wxUint16;
+
+typedef wxUint16 wxWord;
+
+/*
+  things are getting more interesting with ints, longs and pointers
+
+  there are several different standard data models described by this table:
+
+  +-----------+----------------------------+
+  |type\model | LP64 ILP64 LLP64 ILP32 LP32|
+  +-----------+----------------------------+
+  |char       |  8     8     8     8     8 |
+  |short      | 16    16    16    16    16 |
+  |int        | 32    64    32    32    16 |
+  |long       | 64    64    32    32    32 |
+  |long long  | 64    64    64    --    -- |
+  |void *     | 64    64    64    32    32 |
+  +-----------+----------------------------+
+
+  Win16 used LP32 (but we don't support it any longer), Win32 obviously used
+  ILP32 and Win64 uses LLP64 (a.k.a. P64)
+
+  Under Unix LP64 is the most widely used (the only I've ever seen, in fact)
+ */
+
+/*  32bit */
+#if defined(__WINDOWS__)
+    #if defined(__WIN32__)
+        typedef int wxInt32;
+        typedef unsigned int wxUint32;
+
+        /*
+            Win64 uses LLP64 model and so ints and longs have the same size as
+            in Win32.
+         */
+        #ifndef SIZEOF_INT
+            #define SIZEOF_INT 4
+        #endif
+
+        #ifndef SIZEOF_LONG
+            #define SIZEOF_LONG 4
+        #endif
+
+        #ifndef SIZEOF_LONG_LONG
+            #define SIZEOF_LONG_LONG 8
+        #endif
+
+        #ifndef SIZEOF_WCHAR_T
+            /* Windows uses UTF-16 */
+            #define SIZEOF_WCHAR_T 2
+        #endif
+
+        #ifndef SIZEOF_SIZE_T
+            /*
+               Under Win64 sizeof(size_t) == 8 and so it is neither unsigned
+               int nor unsigned long!
+             */
+            #ifdef __WIN64__
+                #define SIZEOF_SIZE_T 8
+
+                #undef wxSIZE_T_IS_UINT
+            #else /* Win32 */
+                #define SIZEOF_SIZE_T 4
+
+                #define wxSIZE_T_IS_UINT
+            #endif
+            #undef wxSIZE_T_IS_ULONG
+        #endif
+
+        #ifndef SIZEOF_VOID_P
+            #ifdef __WIN64__
+                #define SIZEOF_VOID_P 8
+            #else /*  Win32 */
+                #define SIZEOF_VOID_P 4
+            #endif /*  Win64/32 */
+        #endif
+    #else
+        #error "Unsupported Windows version"
+    #endif
+#else /*  !Windows */
+    /*  SIZEOF_XXX are normally defined by configure */
+    #ifdef SIZEOF_INT
+        #if SIZEOF_INT == 8
+            /*  must be ILP64 data model, there is normally a special 32 bit */
+            /*  type in it but we don't know what it is... */
+            #error "No 32bit int type on this platform"
+        #elif SIZEOF_INT == 4
+            typedef int wxInt32;
+            typedef unsigned int wxUint32;
+        #elif SIZEOF_INT == 2
+            /*  must be LP32 */
+            #if SIZEOF_LONG != 4
+                #error "No 32bit int type on this platform"
+            #endif
+
+            typedef long wxInt32;
+            typedef unsigned long wxUint32;
+        #else
+            /*  wxWidgets is not ready for 128bit systems yet... */
+            #error "Unknown sizeof(int) value, what are you compiling for?"
+        #endif
+    #else /*  !defined(SIZEOF_INT) */
+        /*  assume default 32bit machine -- what else can we do? */
+        wxCOMPILE_TIME_ASSERT( sizeof(int) == 4, IntMustBeExactly4Bytes);
+        wxCOMPILE_TIME_ASSERT( sizeof(size_t) == 4, SizeTMustBeExactly4Bytes);
+        wxCOMPILE_TIME_ASSERT( sizeof(void *) == 4, PtrMustBeExactly4Bytes);
+
+        #define SIZEOF_INT 4
+        #define SIZEOF_SIZE_T 4
+        #define SIZEOF_VOID_P 4
+
+        typedef int wxInt32;
+        typedef unsigned int wxUint32;
+
+        #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T)
+            #define SIZEOF_WCHAR_T 4
+        #endif
+        #if !defined(SIZEOF_WCHAR_T)
+            /*  also assume that sizeof(wchar_t) == 2 (under Unix the most */
+            /*  common case is 4 but there configure would have defined */
+            /*  SIZEOF_WCHAR_T for us) */
+            /*  the most common case */
+            wxCOMPILE_TIME_ASSERT( sizeof(wchar_t) == 2,
+                                    Wchar_tMustBeExactly2Bytes);
+
+            #define SIZEOF_WCHAR_T 2
+        #endif /*  !defined(SIZEOF_WCHAR_T) */
+    #endif
+#endif /*  Win/!Win */
+
+#ifndef SIZEOF_WCHAR_T
+    #error "SIZEOF_WCHAR_T must be defined, but isn't"
+#endif
+
+/* also define C99-like sized MIN/MAX constants */
+#define wxINT8_MIN CHAR_MIN
+#define wxINT8_MAX CHAR_MAX
+#define wxUINT8_MAX UCHAR_MAX
+
+#define wxINT16_MIN SHRT_MIN
+#define wxINT16_MAX SHRT_MAX
+#define wxUINT16_MAX USHRT_MAX
+
+#if SIZEOF_INT == 4
+    #define wxINT32_MIN INT_MIN
+    #define wxINT32_MAX INT_MAX
+    #define wxUINT32_MAX UINT_MAX
+#elif SIZEOF_LONG == 4
+    #define wxINT32_MIN LONG_MIN
+    #define wxINT32_MAX LONG_MAX
+    #define wxUINT32_MAX ULONG_MAX
+#else
+    #error "Unknown 32 bit type"
+#endif
+
+typedef wxUint32 wxDword;
+
+#ifdef LLONG_MAX
+    #define wxINT64_MIN LLONG_MIN
+    #define wxINT64_MAX LLONG_MAX
+    #define wxUINT64_MAX ULLONG_MAX
+#else
+    #define wxINT64_MIN (wxLL(-9223372036854775807)-1)
+    #define wxINT64_MAX wxLL(9223372036854775807)
+    #define wxUINT64_MAX wxULL(0xFFFFFFFFFFFFFFFF)
+#endif
+
+/*  64 bit */
+
+/*  NB: we #define and not typedef wxLongLong_t because we use "#ifdef */
+/*      wxLongLong_t" in wx/longlong.h */
+
+/*      wxULongLong_t is set later (usually to unsigned wxLongLong_t) */
+
+/*  to avoid compilation problems on 64bit machines with ambiguous method calls */
+/*  we will need to define this */
+#undef wxLongLongIsLong
+
+/*
+   First check for specific compilers which have known 64 bit integer types,
+   this avoids clashes with SIZEOF_LONG[_LONG] being defined incorrectly for
+   e.g. MSVC builds (Python.h defines it as 8 even for MSVC).
+
+   Also notice that we check for "long long" before checking for 64 bit long as
+   we still want to use "long long" and not "long" for wxLongLong_t on 64 bit
+   architectures to be able to pass wxLongLong_t to the standard functions
+   prototyped as taking "long long" such as strtoll().
+ */
+#if (defined(__VISUALC__) || defined(__INTELC__)) && defined(__WIN32__)
+    #define wxLongLong_t __int64
+    #define wxLongLongSuffix i64
+    #define wxLongLongFmtSpec "I64"
+#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
+    #define wxLongLong_t __int64
+    #define wxLongLongSuffix i64
+    #define wxLongLongFmtSpec "L"
+#elif defined(__MINGW32__) && \
+    (defined(__USE_MINGW_ANSI_STDIO) && (__USE_MINGW_ANSI_STDIO != 1))
+    #define wxLongLong_t long long
+    #define wxLongLongSuffix ll
+    #define wxLongLongFmtSpec "I64"
+#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
+        defined(__GNUC__) || \
+        defined(__CYGWIN__)
+    #define wxLongLong_t long long
+    #define wxLongLongSuffix ll
+    #define wxLongLongFmtSpec "ll"
+#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
+    #define wxLongLong_t long
+    #define wxLongLongSuffix l
+    #define wxLongLongFmtSpec "l"
+    #define wxLongLongIsLong
+#endif
+
+
+#ifdef wxLongLong_t
+    #define wxULongLong_t unsigned wxLongLong_t
+
+    /*
+        wxLL() and wxULL() macros allow to define 64 bit constants in a
+        portable way.
+     */
+    #ifndef wxCOMPILER_BROKEN_CONCAT_OPER
+        #define wxLL(x) wxCONCAT(x, wxLongLongSuffix)
+        #define wxULL(x) wxCONCAT(x, wxCONCAT(u, wxLongLongSuffix))
+    #else
+        /*
+            Currently only Borland compiler has broken concatenation operator
+            and this compiler is known to use [u]i64 suffix.
+         */
+        #define wxLL(x) wxAPPEND_i64(x)
+        #define wxULL(x) wxAPPEND_ui64(x)
+    #endif
+
+    typedef wxLongLong_t wxInt64;
+    typedef wxULongLong_t wxUint64;
+
+    #define wxHAS_INT64 1
+
+    #ifndef wxLongLongIsLong
+        #define wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+    #endif
+#elif wxUSE_LONGLONG
+    /*  these macros allow to define 64 bit constants in a portable way */
+    #define wxLL(x) wxLongLong(x)
+    #define wxULL(x) wxULongLong(x)
+
+    #define wxInt64 wxLongLong
+    #define wxUint64 wxULongLong
+
+    #define wxHAS_INT64 1
+
+#else /* !wxUSE_LONGLONG */
+
+    #define wxHAS_INT64 0
 
 #endif
-    // _WX_TYPESH__
 
+/*
+    Helper macro for conditionally compiling some code only if wxLongLong_t is
+    available and is a type different from the other integer types (i.e. not
+    long).
+ */
+#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+    #define wxIF_LONG_LONG_TYPE(x) x
+#else
+    #define wxIF_LONG_LONG_TYPE(x)
+#endif
+
+
+/* Make sure ssize_t is defined (a signed type the same size as size_t). */
+/* (HAVE_SSIZE_T is not already defined by configure) */
+#ifndef HAVE_SSIZE_T
+#ifdef __MINGW32__
+    #if defined(_SSIZE_T_) || defined(_SSIZE_T_DEFINED)
+        #define HAVE_SSIZE_T
+    #endif
+#endif
+#endif /* !HAVE_SSIZE_T */
+
+/* If we really don't have ssize_t, provide our own version. */
+#ifdef HAVE_SSIZE_T
+    #ifdef __UNIX__
+        #include <sys/types.h>
+    #endif
+#else /* !HAVE_SSIZE_T */
+    #if SIZEOF_SIZE_T == 4
+        typedef wxInt32 ssize_t;
+    #elif SIZEOF_SIZE_T == 8
+        typedef wxInt64 ssize_t;
+    #else
+        #error "error defining ssize_t, size_t is not 4 or 8 bytes"
+    #endif
+
+    /* prevent ssize_t redefinitions in other libraries */
+    #define HAVE_SSIZE_T
+#endif
+
+/*
+    We can't rely on Windows _W64 being defined as windows.h may not be
+    included so define our own equivalent: this should be used with types
+    like WXLPARAM or WXWPARAM which are 64 bit under Win64 to avoid warnings
+    each time we cast it to a pointer or a handle (which results in hundreds
+    of warnings as Win32 API often passes pointers in them)
+ */
+#ifdef __VISUALC__
+    #define wxW64 __w64
+#else
+    #define wxW64
+#endif
+
+/*
+   Define signed and unsigned integral types big enough to contain all of long,
+   size_t and void *.
+ */
+#if SIZEOF_LONG >= SIZEOF_VOID_P
+    /*
+       Normal case when long is the largest integral type.
+     */
+    typedef long wxIntPtr;
+    typedef unsigned long wxUIntPtr;
+#elif SIZEOF_SIZE_T >= SIZEOF_VOID_P
+    /*
+       Win64 case: size_t is the only integral type big enough for "void *".
+
+       Notice that we must use __w64 to avoid warnings about casting pointers
+       to wxIntPtr (which we do often as this is what it is defined for) in 32
+       bit build with MSVC.
+     */
+    typedef wxW64 ssize_t wxIntPtr;
+    typedef size_t wxUIntPtr;
+#else
+    /*
+       This should never happen for the current architectures but if you're
+       using one where it does, please contact wx-dev@googlegroups.com.
+     */
+    #error "Pointers can't be stored inside integer types."
+#endif
+
+#endif //  _WX_TYPES_H_

From 80f4c8cde3c1e9e042d850ef21a1859fdf213c21 Mon Sep 17 00:00:00 2001
From: Trylz <trylzengine@outlook.com>
Date: Wed, 10 Jan 2018 17:26:24 +0100
Subject: [PATCH 109/916] Add XRC handler for wxSpinCtrlDouble

Create wxSpinCtrlDoubleXmlHandler class similar to the existing
wxSpinCtrlXmlHandler and update the XRC schema to account for it.
---
 docs/changes.txt           |  1 +
 include/wx/xrc/xh_spin.h   | 13 ++++++++++--
 misc/schema/xrc_schema.rnc | 14 +++++++++++++
 src/xrc/xh_spin.cpp        | 42 ++++++++++++++++++++++++++++++++++++++
 src/xrc/xmlrsall.cpp       |  1 +
 5 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 801172be93..f4e42fb2d1 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -115,6 +115,7 @@ All (GUI):
 - Add support for loading fonts from external files (Arthur Norman).
 - Improve wxSVGFileDC to support more of wxDC API (Maarten Bent).
 - Add support for wxAuiManager and wxAuiPaneInfo to XRC (Andrea Zanellato).
+- Add XRC handler for wxSpinCtrlDouble (Trylz).
 - Add support for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL to XRC (ousnius).
 - Update Scintilla to v3.7.2 (NewPagodi, Paul Kulchenko).
 - Update bundled libpng to 1.6.28 (Catalin Raceanu).
diff --git a/include/wx/xrc/xh_spin.h b/include/wx/xrc/xh_spin.h
index 93762e0325..bf522e936f 100644
--- a/include/wx/xrc/xh_spin.h
+++ b/include/wx/xrc/xh_spin.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/xrc/xh_spin.h
-// Purpose:     XML resource handler for wxSpinButton and wxSpinCtrl
+// Purpose:     XML resource handler for wxSpinButton, wxSpinCtrl, wxSpinCtrlDouble
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
@@ -28,7 +28,6 @@ public:
 
 #endif // wxUSE_SPINBTN
 
-
 #if wxUSE_SPINCTRL
 
 class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
@@ -41,6 +40,16 @@ public:
     wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler);
 };
 
+class WXDLLIMPEXP_XRC wxSpinCtrlDoubleXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxSpinCtrlDoubleXmlHandler();
+    virtual wxObject *DoCreateResource() wxOVERRIDE;
+    virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
+
+    wxDECLARE_DYNAMIC_CLASS(wxSpinCtrlDoubleXmlHandler);
+};
+
 #endif // wxUSE_SPINCTRL
 
 #endif // wxUSE_XRC
diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index b298088e45..e4617452f6 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -214,6 +214,7 @@ builtinWindowClasses =
     | wxSlider
     | wxSpinButton
     | wxSpinCtrl
+    | wxSpinCtrlDouble
     | wxSplitterWindow
     | wxSearchCtrl
     | wxStatusBar
@@ -310,6 +311,7 @@ builtinClassesNames =
     | "wxSlider"
     | "wxSpinButton"
     | "wxSpinCtrl"
+    | "wxSpinCtrlDouble"
     | "wxSplitterWindow"
     | "wxSearchCtrl"
     | "wxStatusBar"
@@ -1413,6 +1415,18 @@ wxSpinCtrl =
     }
 
 
+wxSpinCtrlDouble =
+    element object {
+        attribute class { "wxSpinCtrlDouble" } &
+        stdObjectNodeAttributes &
+        stdWindowProperties &
+        [xrc:p="o"] element value {_, t_float }* &
+        [xrc:p="o"] element min   {_, t_float }* &
+        [xrc:p="o"] element max   {_, t_float }* &
+        [xrc:p="o"] element inc   {_, t_float}*
+    }
+
+
 wxSplitterWindow =
     element object {
         attribute class { "wxSplitterWindow" } &
diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index ebd452e7ae..1e7a04affc 100644
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -67,6 +67,8 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 
 #include "wx/spinctrl.h"
 
+static const float DEFAULT_INC = 1.;
+
 wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler);
 
 wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
@@ -109,6 +111,46 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSpinCtrl"));
 }
 
+
+wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDoubleXmlHandler, wxXmlResourceHandler);
+
+wxSpinCtrlDoubleXmlHandler::wxSpinCtrlDoubleXmlHandler()
+    : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxSP_HORIZONTAL);
+    XRC_ADD_STYLE(wxSP_VERTICAL);
+    XRC_ADD_STYLE(wxSP_ARROW_KEYS);
+    XRC_ADD_STYLE(wxSP_WRAP);
+    XRC_ADD_STYLE(wxALIGN_LEFT);
+    XRC_ADD_STYLE(wxALIGN_CENTER);
+    XRC_ADD_STYLE(wxALIGN_RIGHT);
+}
+
+wxObject *wxSpinCtrlDoubleXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(control, wxSpinCtrlDouble)
+
+    control->Create(m_parentAsWindow,
+                    GetID(),
+                    GetText(wxS("value")),
+                    GetPosition(), GetSize(),
+                    GetStyle(wxS("style"), wxSP_ARROW_KEYS | wxALIGN_RIGHT),
+                    GetFloat(wxS("min"), (float)DEFAULT_MIN),
+                    GetFloat(wxS("max"), (float)DEFAULT_MAX),
+                    GetFloat(wxS("value"), (float)DEFAULT_VALUE),
+                    GetFloat(wxS("inc"), DEFAULT_INC),
+                    GetName());
+
+    SetupWindow(control);
+
+    return control;
+}
+
+bool wxSpinCtrlDoubleXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxS("wxSpinCtrlDouble"));
+}
+
 #endif // wxUSE_SPINCTRL
 
 #endif // wxUSE_XRC
diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index 00c787a58f..0f67288385 100644
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -165,6 +165,7 @@ void wxXmlResource::InitAllHandlers()
 #endif
 #if wxUSE_SPINCTRL
     AddHandler(new wxSpinCtrlXmlHandler);
+    AddHandler(new wxSpinCtrlDoubleXmlHandler);
 #endif
 #if wxUSE_SPLITTER
     AddHandler(new wxSplitterWindowXmlHandler);

From 74cf8370ce6c617cb951af2ad0a6d532dbb8d017 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 10 Jan 2018 17:31:23 +0100
Subject: [PATCH 110/916] Avoid code duplication between wxSpinCtrl XRC
 handlers

Extract styles initialization into a function reused by both
wxSpinCtrlXmlHandler and wxSpinCtrlDoubleXmlHandler.

No real changes, this is a pure refactoring.
---
 src/xrc/xh_spin.cpp | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 1e7a04affc..314697d768 100644
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -69,18 +69,23 @@ bool wxSpinButtonXmlHandler::CanHandle(wxXmlNode *node)
 
 static const float DEFAULT_INC = 1.;
 
+static void AddSpinCtrlStyles(wxXmlResourceHandler& handler)
+{
+    handler.XRC_ADD_STYLE(wxSP_HORIZONTAL);
+    handler.XRC_ADD_STYLE(wxSP_VERTICAL);
+    handler.XRC_ADD_STYLE(wxSP_ARROW_KEYS);
+    handler.XRC_ADD_STYLE(wxSP_WRAP);
+    handler.XRC_ADD_STYLE(wxALIGN_LEFT);
+    handler.XRC_ADD_STYLE(wxALIGN_CENTER);
+    handler.XRC_ADD_STYLE(wxALIGN_RIGHT);
+}
+
 wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlXmlHandler, wxXmlResourceHandler);
 
 wxSpinCtrlXmlHandler::wxSpinCtrlXmlHandler()
-: wxXmlResourceHandler()
+    : wxXmlResourceHandler()
 {
-    XRC_ADD_STYLE(wxSP_HORIZONTAL);
-    XRC_ADD_STYLE(wxSP_VERTICAL);
-    XRC_ADD_STYLE(wxSP_ARROW_KEYS);
-    XRC_ADD_STYLE(wxSP_WRAP);
-    XRC_ADD_STYLE(wxALIGN_LEFT);
-    XRC_ADD_STYLE(wxALIGN_CENTER);
-    XRC_ADD_STYLE(wxALIGN_RIGHT);
+    AddSpinCtrlStyles(*this);
 }
 
 wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
@@ -117,13 +122,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDoubleXmlHandler, wxXmlResourceHandler);
 wxSpinCtrlDoubleXmlHandler::wxSpinCtrlDoubleXmlHandler()
     : wxXmlResourceHandler()
 {
-    XRC_ADD_STYLE(wxSP_HORIZONTAL);
-    XRC_ADD_STYLE(wxSP_VERTICAL);
-    XRC_ADD_STYLE(wxSP_ARROW_KEYS);
-    XRC_ADD_STYLE(wxSP_WRAP);
-    XRC_ADD_STYLE(wxALIGN_LEFT);
-    XRC_ADD_STYLE(wxALIGN_CENTER);
-    XRC_ADD_STYLE(wxALIGN_RIGHT);
+    AddSpinCtrlStyles(*this);
 }
 
 wxObject *wxSpinCtrlDoubleXmlHandler::DoCreateResource()

From c3c8a2198db04c00063979a467add3bee4353e41 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 10 Jan 2018 17:35:34 +0100
Subject: [PATCH 111/916] Document the recently added wxSpinCtrlDouble XRC
 handler

Update XRC reference documentation after adding a new handler too.
---
 docs/doxygen/overviews/xrc_format.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 7a1a25fe8e..abffacb471 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -1906,6 +1906,19 @@ wxWidgets 2.9.5, another one:
 @endTable
 
 
+@subsubsection xrc_wxspinctrldouble wxSpinCtrlDouble
+
+wxSpinCtrlDouble supports the same properties as @ref xrc_wxspinbutton but @c
+value, @c min and @a max are all of type float instead of int. There is one
+additional property:
+@beginTable
+@row3col{inc, float,
+    The amount by which the number is changed by a single arrow press.}
+@endTable
+
+This handler was added in wxWidgets 3.1.1.
+
+
 @subsubsection xrc_wxsplitterwindow wxSplitterWindow
 
 @beginTable

From 6bd8cb964bd625d7f974621cc9883ba52b58600a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 10 Jan 2018 23:44:07 +0100
Subject: [PATCH 112/916] Really remove removed files from the help sample

This does what 1c2e58cd85497f8ceb546c40487c7b246447c4af tried to do
manually correctly, by updating bakefile and rebaking, and so finally
completing the changes of 961a1c2b3931d64809b51a5042357817ace37677.

See #17962.
---
 samples/help/Makefile.in  | 2 +-
 samples/help/help.bkl     | 5 -----
 samples/help/makefile.bcc | 2 +-
 samples/help/makefile.gcc | 2 +-
 samples/help/makefile.vc  | 2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index baca165290..d43b20b770 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -194,7 +194,7 @@ data:
 
 data_doc: 
 	@mkdir -p ./doc
-	@for f in aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \
+	@for f in aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \
 	if test ! -f ./doc/$$f -a ! -d ./doc/$$f ; \
 	then x=yep ; \
 	else x=`find $(srcdir)/doc/$$f -newer ./doc/$$f -print` ; \
diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index 50af7881c2..14a7a735c3 100644
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -36,18 +36,13 @@
         <srcdir>$(SRCDIR)/doc</srcdir>
         <files>
             aindex.html
-            ClassGraph.class
-            ClassGraphPanel.class
-            ClassLayout.class
             down.gif
             dxxgifs.tex
             HIER.html
-            HIERjava.html
             icon1.gif
             icon2.gif
             index.html
             logo.gif
-            NavigatorButton.class
             USE_HELP.html
             wx204.htm
             wx34.htm
diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc
index e482238ff4..390126e43c 100644
--- a/samples/help/makefile.bcc
+++ b/samples/help/makefile.bcc
@@ -245,7 +245,7 @@ data:
 
 data_doc: 
 	if not exist $(OBJS)\doc mkdir $(OBJS)\doc
-	for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+	for %f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
 
 $(OBJS)\help_sample.res: .\..\..\samples\sample.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\samples\sample.rc
diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index 20ab94973a..e318d753ac 100644
--- a/samples/help/makefile.gcc
+++ b/samples/help/makefile.gcc
@@ -234,7 +234,7 @@ data:
 
 data_doc: 
 	if not exist $(OBJS)\doc mkdir $(OBJS)\doc
-	for %%f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc
+	for %%f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc
 
 $(OBJS)\help_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index debbb3c689..c38f41b88a 100644
--- a/samples/help/makefile.vc
+++ b/samples/help/makefile.vc
@@ -368,7 +368,7 @@ data:
 
 data_doc: 
 	if not exist $(OBJS)\doc mkdir $(OBJS)\doc
-	for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+	for %f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
 
 $(OBJS)\help_sample.res: .\..\..\samples\sample.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc

From 689704119a3a12110bf8842c76c6298c5e4d9d1d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 11 Jan 2018 00:27:08 +0100
Subject: [PATCH 113/916] Fix handling of underscores in <item> tags in "wxrc
 -g" output

Unlike all the other nodes containing translatable text, the contents of
the <item> tags, used for wxChoice, wxListBox etc items, is not escaped
(because it can't contain mnemonics), so don't unescape it when
outputting it from "wxrc --gettext" neither.

See #18033.
---
 utils/wxrc/wxrc.cpp | 89 +++++++++++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 32 deletions(-)

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 56f4c9799f..fb06278d07 100644
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -949,6 +949,46 @@ static wxString ConvertText(const wxString& str)
 }
 
 
+enum ContentsKind
+{
+    Contents_NotTrans,  // Not a translatable text at all.
+    Contents_TransOnly, // Translatable but not escaped text.
+    Contents_Text       // Text, i.e. both translatable and escaped.
+};
+
+// Check if the given node contains translatable text and, if it does, whether
+// it's escaped (i.e. parsed using GetText()) or not.
+ContentsKind
+GetNodeContentsKind(wxXmlNode& node, const wxString& contents)
+{
+    if ( node.GetName() == wxT("label") ||
+         (node.GetName() == wxT("value") && !contents.IsNumber()) ||
+         node.GetName() == wxT("help") ||
+         node.GetName() == wxT("hint") ||
+         node.GetName() == wxT("longhelp") ||
+         node.GetName() == wxT("tooltip") ||
+         node.GetName() == wxT("htmlcode") ||
+         node.GetName() == wxT("title") ||
+         node.GetName() == wxT("message") ||
+         node.GetName() == wxT("note") ||
+         node.GetName() == wxT("defaultdirectory") ||
+         node.GetName() == wxT("defaultfilename") ||
+         node.GetName() == wxT("defaultfolder") ||
+         node.GetName() == wxT("filter") ||
+         node.GetName() == wxT("caption") )
+    {
+        return Contents_Text;
+    }
+
+    // This one is special: it is translated in XRC, but its contents is not
+    // escaped.
+    if ( node.GetName() == wxT("item") )
+        return Contents_TransOnly;
+
+    return Contents_NotTrans;
+}
+
+
 ExtractedStrings
 XmlResApp::FindStrings(const wxString& filename, wxXmlNode *node)
 {
@@ -963,41 +1003,26 @@ XmlResApp::FindStrings(const wxString& filename, wxXmlNode *node)
         if ((node->GetType() == wxXML_ELEMENT_NODE) &&
             // parent is an element, i.e. has subnodes...
             (n->GetType() == wxXML_TEXT_NODE ||
-            n->GetType() == wxXML_CDATA_SECTION_NODE) &&
+            n->GetType() == wxXML_CDATA_SECTION_NODE))
             // ...it is textnode...
-            (
-                node/*not n!*/->GetName() == wxT("label") ||
-                (node/*not n!*/->GetName() == wxT("value") &&
-                               !n->GetContent().IsNumber()) ||
-                node/*not n!*/->GetName() == wxT("help") ||
-                node/*not n!*/->GetName() == wxT("hint") ||
-                node/*not n!*/->GetName() == wxT("longhelp") ||
-                node/*not n!*/->GetName() == wxT("tooltip") ||
-                node/*not n!*/->GetName() == wxT("htmlcode") ||
-                node/*not n!*/->GetName() == wxT("title") ||
-                node/*not n!*/->GetName() == wxT("item") ||
-                node/*not n!*/->GetName() == wxT("message") ||
-                node/*not n!*/->GetName() == wxT("note") ||
-                node/*not n!*/->GetName() == wxT("defaultdirectory") ||
-                node/*not n!*/->GetName() == wxT("defaultfilename") ||
-                node/*not n!*/->GetName() == wxT("defaultfolder") ||
-                node/*not n!*/->GetName() == wxT("filter") ||
-                node/*not n!*/->GetName() == wxT("caption")
-            ))
-            // ...and known to contain translatable string
         {
-            if (!flagGettext ||
-                node->GetAttribute(wxT("translate"), wxT("1")) != wxT("0"))
+            wxString s = n->GetContent();
+            switch ( GetNodeContentsKind(*node, s) )
             {
-                arr.push_back
-                    (
-                        ExtractedString
-                        (
-                            ConvertText(n->GetContent()),
-                            filename,
-                            n->GetLineNumber()
-                        )
-                    );
+                case Contents_NotTrans:
+                    break;
+
+                case Contents_Text:
+                    s = ConvertText(s);
+                    wxFALLTHROUGH;
+
+                case Contents_TransOnly:
+                    if (!flagGettext ||
+                        node->GetAttribute(wxT("translate"), wxT("1")) != wxT("0"))
+                    {
+                        arr.push_back(ExtractedString(s, filename, n->GetLineNumber()));
+                    }
+                    break;
             }
         }
 

From 52635cfc100380e7d182a771ad070c663afc8e0d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 11 Jan 2018 00:57:02 +0100
Subject: [PATCH 114/916] Reuse the same XRC function for all translations

Translate all strings in the new GetNodeText() function replacing the
old GetText() which was mostly used for translatable strings before --
except that <item> tag contents didn't use it because it also performed
string unescaping, not wanted for the control items, in addition to
translation.

Replace the old GetText() (while still keeping it for compatibility,
i.e. to avoid breaking any custom XRC handlers using it) with the new
function which is more flexible and can be used for all tags.

No real changes, this is just a refactoring.
---
 include/wx/xrc/xmlres.h        |   5 +-
 include/wx/xrc/xmlreshandler.h |  16 ++++-
 src/xrc/xh_chckl.cpp           |   5 +-
 src/xrc/xh_choic.cpp           |   5 +-
 src/xrc/xh_combo.cpp           |   5 +-
 src/xrc/xh_editlbox.cpp        |   5 +-
 src/xrc/xh_htmllbox.cpp        |   5 +-
 src/xrc/xh_listb.cpp           |   5 +-
 src/xrc/xh_odcombo.cpp         |   5 +-
 src/xrc/xh_radbx.cpp           |  27 ++------
 src/xrc/xmlres.cpp             | 120 ++++++++++++++++++---------------
 11 files changed, 96 insertions(+), 107 deletions(-)

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index de31ea27a4..bde64138a5 100644
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -513,7 +513,10 @@ public:
     // - replaces \n, \r, \t by respective chars (according to C syntax)
     // - replaces _ by & and __ by _ (needed for _File => &File because of XML)
     // - calls wxGetTranslations (unless disabled in wxXmlResource)
-    wxString GetText(const wxString& param, bool translate = true) wxOVERRIDE;
+    //
+    // The first two conversions can be disabled by using wxXRC_TEXT_NO_ESCAPE
+    // in flags and the last one -- by using wxXRC_TEXT_NO_TRANSLATE.
+    wxString GetNodeText(const wxXmlNode *node, int flags = 0) wxOVERRIDE;
 
     // Returns the XRCID.
     int GetID() wxOVERRIDE;
diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h
index 5c2f6b4be1..cdf7f0ab17 100644
--- a/include/wx/xrc/xmlreshandler.h
+++ b/include/wx/xrc/xmlreshandler.h
@@ -32,6 +32,13 @@ class WXDLLIMPEXP_FWD_CORE wxXmlResourceHandler;
 // by wxXmlResourceHandler implementation itself.
 #define XRC_ADD_STYLE(style) AddStyle(wxT(#style), style)
 
+// Flags for GetNodeText().
+enum
+{
+    wxXRC_TEXT_NO_TRANSLATE = 1,
+    wxXRC_TEXT_NO_ESCAPE    = 2
+};
+
 // Abstract base class for the implementation object used by
 // wxXmlResourceHandlerImpl. The real implementation is in
 // wxXmlResourceHandlerImpl class in the "xrc" library while this class is in
@@ -61,7 +68,7 @@ public:
     virtual wxString GetParamValue(const wxString& param) = 0;
     virtual wxString GetParamValue(const wxXmlNode* node) = 0;
     virtual int GetStyle(const wxString& param = wxT("style"), int defaults = 0) = 0;
-    virtual wxString GetText(const wxString& param, bool translate = true) = 0;
+    virtual wxString GetNodeText(const wxXmlNode *node, int flags = 0) = 0;
     virtual int GetID() = 0;
     virtual wxString GetName() = 0;
     virtual bool GetBool(const wxString& param, bool defaultv = false) = 0;
@@ -254,9 +261,14 @@ protected:
     {
         return GetImpl()->GetStyle(param, defaults);
     }
+    wxString GetNodeText(const wxXmlNode *node, int flags = 0)
+    {
+        return GetImpl()->GetNodeText(node, flags);
+    }
     wxString GetText(const wxString& param, bool translate = true)
     {
-        return GetImpl()->GetText(param, translate);
+        return GetImpl()->GetNodeText(GetImpl()->GetParamNode(param),
+                                      translate ? 0 : wxXRC_TEXT_NO_TRANSLATE);
     }
     int GetID() const
     {
diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index fddfcf97c2..61675db8f4 100644
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -94,10 +94,7 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
         // handle <item checked="boolean">Label</item>
 
         // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
+        strList.Add(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
         return NULL;
     }
 }
diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index 445ec6b43a..52a3358cac 100644
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -70,10 +70,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
+        strList.Add(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
 
         return NULL;
     }
diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index a11d24bef9..e0f672ebe4 100644
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -77,10 +77,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
+        strList.Add(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
 
         return NULL;
     }
diff --git a/src/xrc/xh_editlbox.cpp b/src/xrc/xh_editlbox.cpp
index 32ab05f525..48a57847d4 100644
--- a/src/xrc/xh_editlbox.cpp
+++ b/src/xrc/xh_editlbox.cpp
@@ -99,10 +99,7 @@ wxObject *wxEditableListBoxXmlHandler::DoCreateResource()
     }
     else if ( m_insideBox && m_node->GetName() == EDITLBOX_ITEM_NAME )
     {
-        wxString str = GetNodeContent(m_node);
-        if ( m_resource->GetFlags() & wxXRC_USE_LOCALE )
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        m_items.push_back(str);
+        m_items.push_back(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
 
         return NULL;
     }
diff --git a/src/xrc/xh_htmllbox.cpp b/src/xrc/xh_htmllbox.cpp
index 2b310e4c4e..82c01f10ad 100644
--- a/src/xrc/xh_htmllbox.cpp
+++ b/src/xrc/xh_htmllbox.cpp
@@ -69,10 +69,7 @@ wxObject *wxSimpleHtmlListBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
+        strList.Add(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
 
         return NULL;
     }
diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index f496023095..e74eb99e2c 100644
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -77,10 +77,7 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
+        strList.Add(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
 
         return NULL;
     }
diff --git a/src/xrc/xh_odcombo.cpp b/src/xrc/xh_odcombo.cpp
index 955ac1d826..293e7c5d30 100644
--- a/src/xrc/xh_odcombo.cpp
+++ b/src/xrc/xh_odcombo.cpp
@@ -85,10 +85,7 @@ wxObject *wxOwnerDrawnComboBoxXmlHandler::DoCreateResource()
         // handle <item>Label</item>
 
         // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
+        strList.Add(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
 
         return NULL;
     }
diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 12c9e02a25..762f31b2e0 100644
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -107,30 +107,15 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
         // we handle handle <item>Label</item> constructs here, and the item
         // tag can have tooltip, helptext, enabled and hidden attributes
 
-        wxString label = GetNodeContent(m_node);
-
-        wxString tooltip;
-        m_node->GetAttribute(wxT("tooltip"), &tooltip);
-
-        wxString helptext;
-        bool hasHelptext = m_node->GetAttribute(wxT("helptext"), &helptext);
-
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-        {
-            label = wxGetTranslation(label, m_resource->GetDomain());
-            if ( !tooltip.empty() )
-                tooltip = wxGetTranslation(tooltip, m_resource->GetDomain());
-            if ( hasHelptext )
-                helptext = wxGetTranslation(helptext, m_resource->GetDomain());
-        }
-
-        m_labels.push_back(label);
+        m_labels.push_back(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
 #if wxUSE_TOOLTIPS
-        m_tooltips.push_back(tooltip);
+        m_tooltips.push_back(GetNodeText(GetParamNode(wxT("tooltip")),
+                                         wxXRC_TEXT_NO_ESCAPE));
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_HELP
-        m_helptexts.push_back(helptext);
-        m_helptextSpecified.push_back(hasHelptext);
+        const wxXmlNode* const nodeHelp = GetParamNode(wxT("helptext"));
+        m_helptexts.push_back(GetNodeText(nodeHelp, wxXRC_TEXT_NO_ESCAPE));
+        m_helptextSpecified.push_back(nodeHelp != NULL);
 #endif // wxUSE_HELP
         m_isEnabled.push_back(GetBoolAttr("enabled", 1));
         m_isShown.push_back(!GetBoolAttr("hidden", 0));
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 6a1e813c26..1963ba9d73 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1506,73 +1506,83 @@ int wxXmlResourceHandlerImpl::GetStyle(const wxString& param, int defaults)
 
 
 
-wxString wxXmlResourceHandlerImpl::GetText(const wxString& param, bool translate)
+wxString wxXmlResourceHandlerImpl::GetNodeText(const wxXmlNode* node, int flags)
 {
-    wxXmlNode *parNode = GetParamNode(param);
-    wxString str1(GetNodeContent(parNode));
+    wxString str1(GetNodeContent(node));
+    if ( str1.empty() )
+        return str1;
+
     wxString str2;
 
-    // "\\" wasn't translated to "\" prior to 2.5.3.0:
-    const bool escapeBackslash = (m_handler->m_resource->CompareVersion(2,5,3,0) >= 0);
-
-    // VS: First version of XRC resources used $ instead of & (which is
-    //     illegal in XML), but later I realized that '_' fits this purpose
-    //     much better (because &File means "File with F underlined").
-    const wxChar amp_char = (m_handler->m_resource->CompareVersion(2,3,0,1) < 0)
-                            ? '$' : '_';
-
-    for ( wxString::const_iterator dt = str1.begin(); dt != str1.end(); ++dt )
+    if ( !(flags & wxXRC_TEXT_NO_ESCAPE) )
     {
-        // Remap amp_char to &, map double amp_char to amp_char (for things
-        // like "&File..." -- this is illegal in XML, so we use "_File..."):
-        if ( *dt == amp_char )
+        // "\\" wasn't translated to "\" prior to 2.5.3.0:
+        const bool escapeBackslash = (m_handler->m_resource->CompareVersion(2,5,3,0) >= 0);
+
+        // VS: First version of XRC resources used $ instead of & (which is
+        //     illegal in XML), but later I realized that '_' fits this purpose
+        //     much better (because &File means "File with F underlined").
+        const wxChar amp_char = (m_handler->m_resource->CompareVersion(2,3,0,1) < 0)
+                                ? '$' : '_';
+
+        for ( wxString::const_iterator dt = str1.begin(); dt != str1.end(); ++dt )
         {
-            if ( dt+1 == str1.end() || *(++dt) == amp_char )
-                str2 << amp_char;
-            else
-                str2 << wxT('&') << *dt;
-        }
-        // Remap \n to CR, \r to LF, \t to TAB, \\ to \:
-        else if ( *dt == wxT('\\') )
-        {
-            switch ( (*(++dt)).GetValue() )
+            // Remap amp_char to &, map double amp_char to amp_char (for things
+            // like "&File..." -- this is illegal in XML, so we use "_File..."):
+            if ( *dt == amp_char )
             {
-                case wxT('n'):
-                    str2 << wxT('\n');
-                    break;
-
-                case wxT('t'):
-                    str2 << wxT('\t');
-                    break;
-
-                case wxT('r'):
-                    str2 << wxT('\r');
-                    break;
-
-                case wxT('\\') :
-                    // "\\" wasn't translated to "\" prior to 2.5.3.0:
-                    if ( escapeBackslash )
-                    {
-                        str2 << wxT('\\');
+                if ( dt+1 == str1.end() || *(++dt) == amp_char )
+                    str2 << amp_char;
+                else
+                    str2 << wxT('&') << *dt;
+            }
+            // Remap \n to CR, \r to LF, \t to TAB, \\ to \:
+            else if ( *dt == wxT('\\') )
+            {
+                switch ( (*(++dt)).GetValue() )
+                {
+                    case wxT('n'):
+                        str2 << wxT('\n');
                         break;
-                    }
-                    wxFALLTHROUGH;// else fall-through to default: branch below
 
-                default:
-                    str2 << wxT('\\') << *dt;
-                    break;
+                    case wxT('t'):
+                        str2 << wxT('\t');
+                        break;
+
+                    case wxT('r'):
+                        str2 << wxT('\r');
+                        break;
+
+                    case wxT('\\') :
+                        // "\\" wasn't translated to "\" prior to 2.5.3.0:
+                        if ( escapeBackslash )
+                        {
+                            str2 << wxT('\\');
+                            break;
+                        }
+                        wxFALLTHROUGH;// else fall-through to default: branch below
+
+                    default:
+                        str2 << wxT('\\') << *dt;
+                        break;
+                }
+            }
+            else
+            {
+                str2 << *dt;
             }
         }
-        else
-        {
-            str2 << *dt;
-        }
+    }
+    else // Don't escape anything in this string.
+    {
+        // We won't use str1 at all, so move its contents to str2.
+        str2.swap(str1);
     }
 
     if (m_handler->m_resource->GetFlags() & wxXRC_USE_LOCALE)
     {
-        if (translate && parNode &&
-            parNode->GetAttribute(wxT("translate"), wxEmptyString) != wxT("0"))
+        if (!(flags & wxXRC_TEXT_NO_TRANSLATE) && node &&
+            node->GetAttribute(wxT("translate"), wxEmptyString) != wxT("0"))
         {
             return wxGetTranslation(str2, m_handler->m_resource->GetDomain());
         }
@@ -2508,14 +2518,14 @@ void wxXmlResourceHandlerImpl::SetupWindow(wxWindow *wnd)
         wnd->SetFocus();
 #if wxUSE_TOOLTIPS
     if (HasParam(wxT("tooltip")))
-        wnd->SetToolTip(GetText(wxT("tooltip")));
+        wnd->SetToolTip(GetNodeText(GetParamNode(wxT("tooltip"))));
 #endif
     if (HasParam(wxT("font")))
         wnd->SetFont(GetFont(wxT("font"), wnd));
     if (HasParam(wxT("ownfont")))
         wnd->SetOwnFont(GetFont(wxT("ownfont"), wnd));
     if (HasParam(wxT("help")))
-        wnd->SetHelpText(GetText(wxT("help")));
+        wnd->SetHelpText(GetNodeText(GetParamNode(wxT("help"))));
 }
 
 

From bc2c9ce2a3565cd774cbb56bc770833e6530cb11 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 11 Jan 2018 01:03:01 +0100
Subject: [PATCH 115/916] Fix misspelling of a label in XRC docs and example

It was spelt in 2 different ways, neither of which was actually correct.
---
 docs/doxygen/overviews/xrc_format.h | 2 +-
 samples/xrc/rc/controls.xrc         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index abffacb471..de2c1e0a27 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -1611,7 +1611,7 @@ Example:
         <item tooltip="E=mc^2">Energy 98.3</item>
         <item helptext="Favourite chukcha's radio">CHUM FM</item>
         <item>92FM</item>
-        <item hidden="1">Very quit station</item>
+        <item hidden="1">Very quiet station</item>
     </content>
 </object>
 @endcode
diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index bac4812e5e..a6c4406570 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -779,7 +779,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                         <item tooltip="E=mc^2">Energy 98.3</item>
                                         <item helptext="Favourite chukcha's radio">CHUM FM</item>
                                         <item>92FM</item>
-                                        <item hidden="1">Very quite station</item>
+                                        <item hidden="1">Very quiet station</item>
                                     </content>
                                 </object>
                             </object>

From 3357d46ccc8c53233b7089a042cbfe22d5417ca2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 11 Jan 2018 01:14:47 +0100
Subject: [PATCH 116/916] Make it simpler to use mnemonics for wxRadioBox items
 in XRC

Allow specifying label="1" attribute in wxRadioBox <item> tags to
indicate that the usual translation of "_" to "&" should be done, as for
all the other labels.

This is still not the default behaviour to avoid breaking any existing
XRC files using "_", even though using labels="1" by default would make
more sense.
---
 docs/doxygen/overviews/xrc_format.h | 5 +++++
 misc/schema/xrc_schema.rnc          | 1 +
 src/xrc/xh_radbx.cpp                | 8 +++++++-
 utils/wxrc/wxrc.cpp                 | 9 +++++++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index de2c1e0a27..ebc25b1513 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -1595,6 +1595,11 @@ can also have some optional XML @em attributes (not properties!):
      Is the button enabled (default: 1)?}
 @row3col{hidden, @ref overview_xrcformat_type_bool,
      Is the button hidden initially (default: 0)?}
+@row3col{label, @ref overview_xrcformat_type_bool,
+     Should this item text be interpreted as a label, i.e. escaping underscores
+     in it as done for the label properties of other controls? This attribute
+     exists since wxWidgets 3.1.1 and was always treated as having the value of
+     0, which still remains its default, until then.}
 @endTable
 
 Example:
diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index e4617452f6..ada4360591 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -1225,6 +1225,7 @@ wxRadioBox =
                 attribute helptext { t_string }?,
                 attribute enabled  { t_bool }?,
                 attribute hidden   { t_bool }?,
+                attribute label    { t_bool }?,
                 t_text
             }*
         }?
diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 762f31b2e0..5fd8a84287 100644
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -107,7 +107,13 @@ wxObject *wxRadioBoxXmlHandler::DoCreateResource()
         // we handle handle <item>Label</item> constructs here, and the item
         // tag can have tooltip, helptext, enabled and hidden attributes
 
-        m_labels.push_back(GetNodeText(m_node, wxXRC_TEXT_NO_ESCAPE));
+        // For compatibility, labels are not escaped in XRC by default and
+        // label="1" attribute needs to be explicitly specified to handle them
+        // consistently with the other labels.
+        m_labels.push_back(GetNodeText(m_node,
+                                       GetBoolAttr("label", 0)
+                                        ? 0
+                                        : wxXRC_TEXT_NO_ESCAPE));
 #if wxUSE_TOOLTIPS
         m_tooltips.push_back(GetNodeText(GetParamNode(wxT("tooltip")),
                                          wxXRC_TEXT_NO_ESCAPE));
diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index fb06278d07..72bfd49738 100644
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -981,9 +981,14 @@ GetNodeContentsKind(wxXmlNode& node, const wxString& contents)
     }
 
     // This one is special: it is translated in XRC, but its contents is not
-    // escaped.
+    // escaped, except for the special case of wxRadioBox when it can be, if
+    // "label" attribute is supplied.
     if ( node.GetName() == wxT("item") )
-        return Contents_TransOnly;
+    {
+        return node.GetAttribute(wxT("label"), wxT("0")) == wxT("1")
+                ? Contents_Text
+                : Contents_TransOnly;
+    }
 
     return Contents_NotTrans;
 }

From 4d35e8e54d22ae147295fb8510601afc4ea9d967 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 10 Jan 2018 22:48:39 +0100
Subject: [PATCH 117/916] CMake: Copy demo and sample data files to correct
 directory

Instead of 'lib/', copy it to directory where the executables are (e.g. 'lib/vc_x64_lib/').
---
 build/cmake/demos/CMakeLists.txt | 2 +-
 build/cmake/functions.cmake      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/cmake/demos/CMakeLists.txt b/build/cmake/demos/CMakeLists.txt
index ee5f973dc9..a905d3e857 100644
--- a/build/cmake/demos/CMakeLists.txt
+++ b/build/cmake/demos/CMakeLists.txt
@@ -26,7 +26,7 @@ function(wx_add_demo name)
         foreach(data_file ${DEMO_DATA})
             list(APPEND cmds COMMAND ${CMAKE_COMMAND}
                 -E copy ${wxSOURCE_DIR}/demos/${name}/${data_file}
-                ${wxOUTPUT_DIR}/${data_file})
+                ${wxOUTPUT_DIR}/${wxPLATFORM_LIB_DIR}/${data_file})
         endforeach()
         add_custom_command(
             TARGET ${DEMO_NAME} ${cmds}
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 4edd9c8ff2..1720672ea7 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -574,7 +574,7 @@ function(wx_add_sample name)
         foreach(data_file ${SAMPLE_DATA})
             list(APPEND cmds COMMAND ${CMAKE_COMMAND}
                 -E copy ${wxSOURCE_DIR}/samples/${wxSAMPLE_SUBDIR}${name}/${data_file}
-                ${wxOUTPUT_DIR}/${data_file})
+                ${wxOUTPUT_DIR}/${wxPLATFORM_LIB_DIR}/${data_file})
         endforeach()
         add_custom_command(
             TARGET ${target_name} ${cmds}

From 573e887a4c00bd3e050d7ca27a3546467969feba Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 10 Jan 2018 22:50:51 +0100
Subject: [PATCH 118/916] CMake: Fix building and running samples

Add missing header, source and resource files.
Add missing data files (font), remove deleted data files (help).
Fix specifying xrc sample data files.
Remove WXUSINGDLL check from dialogs sample, it is not defined in e.g. static gui build.
---
 build/cmake/samples/CMakeLists.txt | 35 +++++++++++++++---------------
 samples/dialogs/dialogs.h          | 16 ++++----------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index 9fbe640381..f8b7ac28fa 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -8,10 +8,10 @@
 #############################################################################
 
 wx_add_sample(access accesstest.cpp)
-wx_add_sample(animate anitest.cpp LIBRARIES adv DATA throbber.gif hourglass.ani)
+wx_add_sample(animate anitest.cpp anitest.h LIBRARIES adv DATA throbber.gif hourglass.ani)
 wx_add_sample(artprov arttest.cpp artbrows.cpp artbrows.h)
 wx_add_sample(aui auidemo.cpp LIBRARIES adv aui html NAME auidemo)
-wx_add_sample(calendar LIBRARIES adv)
+wx_add_sample(calendar RES calendar.rc LIBRARIES adv)
 wx_add_sample(caret)
 wx_add_sample(clipboard)
 wx_add_sample(collpane LIBRARIES adv)
@@ -30,20 +30,18 @@ wx_add_sample(dragimag dragimag.cpp dragimag.h RES dragimag.rc
     DATA backgrnd.png shape01.png shape02.png shape03.png)
 wx_add_sample(drawing DATA pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp)
 wx_add_sample(erase)
-wx_add_sample(event)
+wx_add_sample(event event.cpp gestures.cpp gestures.h)
 wx_add_sample(except)
 wx_add_sample(exec)
-wx_add_sample(font)
+wx_add_sample(font DATA wxprivate.ttf)
 wx_add_sample(fswatcher)
 wx_add_sample(grid griddemo.cpp griddemo.h LIBRARIES adv)
 
 wx_list_add_prefix(HELP_DOC_FILES doc/
-    aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class
-    down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif
-    index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm
-    wx34.htm wxExtHelpController.html wxhelp.map wx.htm
+    aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html
+    logo.gif wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm
     )
-wx_add_sample(help demo.cpp doc.h LIBRARIES html adv
+wx_add_sample(help demo.cpp LIBRARIES html adv
     DATA
     back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc
     doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif
@@ -52,7 +50,7 @@ wx_add_sample(help demo.cpp doc.h LIBRARIES html adv
     )
 wx_add_sample(htlbox LIBRARIES html)
 include(html.cmake)
-wx_add_sample(image image.cpp canvas.cpp canvas.h RES image.rc
+wx_add_sample(image image.cpp canvas.cpp canvas.h cursor_png.c RES image.rc
     DATA horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm
     horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur
     horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png)
@@ -105,7 +103,7 @@ wx_add_sample(render FOLDER render)
 wx_add_sample(render DLL renddll.cpp NAME renddll FOLDER render)
 wx_add_sample(ribbon ribbondemo.cpp LIBRARIES ribbon adv NAME ribbondemo)
 wx_add_sample(richtext LIBRARIES richtext adv html xml NAME richtextdemo)
-wx_add_sample(sashtest sashtest.cpp sashtest.h LIBRARIES adv)
+wx_add_sample(sashtest sashtest.cpp sashtest.h RES sashtest.rc LIBRARIES adv)
 wx_add_sample(scroll)
 wx_add_sample(secretstore CONSOLE DEPENDS wxUSE_SECRETSTORE)
 wx_add_sample(shaped DATA star.png)
@@ -122,7 +120,7 @@ wx_add_sample(splitter)
 wx_add_sample(statbar)
 wx_add_sample(stc stctest.cpp edit.cpp prefs.cpp edit.h defsext.h prefs.h
     DATA stctest.cpp NAME stctest LIBRARIES stc)
-wx_add_sample(svg svgtest.cpp)
+wx_add_sample(svg svgtest.cpp RES svgtest.rc)
 wx_add_sample(taborder)
 wx_add_sample(taskbar tbtest.cpp tbtest.h LIBRARIES adv DEPENDS wxUSE_TASKBARICON)
 wx_add_sample(text)
@@ -132,7 +130,7 @@ wx_add_sample(treectrl treetest.cpp treetest.h)
 wx_add_sample(treelist LIBRARIES adv)
 wx_add_sample(typetest typetest.cpp typetest.h)
 wx_add_sample(uiaction)
-wx_add_sample(validate)
+wx_add_sample(validate validate.cpp validate.h)
 wx_add_sample(vscroll vstest.cpp)
 wx_add_sample(webview LIBRARIES webview stc adv NAME webviewsample)
 # widgets Sample
@@ -210,26 +208,27 @@ wx_add_sample(xrc
     myframe.h
     custclas.h
     objrefdlg.h
-    ${XRC_RC_FILES}
+    DATA ${XRC_RC_FILES}
     LIBRARIES aui ribbon xrc html adv
     NAME xrcdemo
     )
-wx_add_sample(xti xti.cpp classlist.cpp codereadercallback.cpp LIBRARIES xml
+wx_add_sample(xti xti.cpp classlist.cpp codereadercallback.cpp
+    classlist.h codereadercallback.h LIBRARIES xml
     DEPENDS wxUSE_EXTENDED_RTTI)
 
 if(WIN32)
     # Windows only samples
 
     # DLL Sample
-    wx_add_sample(dll DLL my_dll.cpp NAME my_dll FOLDER dll
+    wx_add_sample(dll DLL my_dll.cpp my_dll.h NAME my_dll FOLDER dll
         DEFINITIONS MY_DLL_BUILDING)
     if(NOT wxBUILD_SHARED)
         # this test only makes sense with statically built wx, otherwise
         # the same copy of wx would be used
-        wx_add_sample(dll wx_exe.cpp NAME wx_exe FOLDER dll LIBRARIES my_dll)
+        wx_add_sample(dll wx_exe.cpp my_dll.h NAME wx_exe FOLDER dll LIBRARIES my_dll)
     endif()
 
-    wx_add_sample(dll sdk_exe.cpp NAME sdk_exe FOLDER dll LIBRARIES my_dll)
+    wx_add_sample(dll sdk_exe.cpp my_dll.h NAME sdk_exe FOLDER dll LIBRARIES my_dll)
     wx_add_sample(flash)
     #TODO: renable when sample is fixed
     #wx_add_sample(mfc mfctest.cpp mfctest.h resource.h stdafx.h RES mfctest.rc)
diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 482d636e3a..a7df5878b5 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -28,12 +28,6 @@ of MSW, MAC and OS2
     #define USE_WXUNIVERSAL 0
 #endif
 
-#ifdef WXUSINGDLL
-    #define USE_DLL 1
-#else
-    #define USE_DLL 0
-#endif
-
 #if defined(__WXMSW__)
     #define USE_WXMSW 1
 #else
@@ -58,16 +52,14 @@ of MSW, MAC and OS2
     #define USE_WXGTK 0
 #endif
 
-#define USE_GENERIC_DIALOGS (!USE_WXUNIVERSAL && !USE_DLL)
-
 #define USE_COLOURDLG_GENERIC \
-    ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_COLOURDLG)
+    ((USE_WXMSW || USE_WXMAC) && USE_WXUNIVERSAL && wxUSE_COLOURDLG)
 #define USE_DIRDLG_GENERIC \
-    ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
+    ((USE_WXMSW || USE_WXMAC) && USE_WXUNIVERSAL && wxUSE_DIRDLG)
 #define USE_FILEDLG_GENERIC \
-    ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS  && wxUSE_FILEDLG)
+    ((USE_WXMSW || USE_WXMAC) && USE_WXUNIVERSAL  && wxUSE_FILEDLG)
 #define USE_FONTDLG_GENERIC \
-    ((USE_WXMSW || USE_WXMACFONTDLG) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
+    ((USE_WXMSW || USE_WXMACFONTDLG) && USE_WXUNIVERSAL && wxUSE_FONTDLG)
 
 // Turn USE_MODAL_PRESENTATION to 0 if there is any reason for not presenting difference
 // between modal and modeless dialogs (ie. not implemented it in your port yet)

From db86112675d9867a650d06da41f60040602c32cc Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 10 Jan 2018 22:53:00 +0100
Subject: [PATCH 119/916] CMake: Disable crt and socket warnings from Windows
 headers

---
 build/cmake/functions.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 1720672ea7..c2c28b8c5a 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -175,6 +175,7 @@ function(wx_set_target_properties target_name is_base)
             _CRT_SECURE_NO_DEPRECATE=1
             _CRT_NON_CONFORMING_SWPRINTFS=1
             _SCL_SECURE_NO_WARNINGS=1
+            _WINSOCK_DEPRECATED_NO_WARNINGS=1
             )
     endif()
 
@@ -381,7 +382,10 @@ function(wx_set_builtin_target_properties target_name)
         # standard C functions in the 3rd party libraries (these warnings
         # are only given by VC8+ but it's simpler to just always define
         # this symbol which disables them, even for previous VC versions)
-        target_compile_definitions(${target_name} PRIVATE _CRT_SECURE_NO_WARNINGS)
+        target_compile_definitions(${target_name} PRIVATE
+            _CRT_SECURE_NO_DEPRECATE=1
+            _SCL_SECURE_NO_WARNINGS=1
+        )
     endif()
 
     set_target_properties(${target_name} PROPERTIES FOLDER "Third Party Libraries")

From 21615b16347e6ccb8380a4bc5344a16058d55427 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 10 Jan 2018 22:56:42 +0100
Subject: [PATCH 120/916] CMake: Set Visual Studio working directory

Use the executable output directory for samples and demos, use the source directory for tests.
---
 build/cmake/demos/CMakeLists.txt | 3 +++
 build/cmake/functions.cmake      | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/build/cmake/demos/CMakeLists.txt b/build/cmake/demos/CMakeLists.txt
index a905d3e857..e8f7f7d412 100644
--- a/build/cmake/demos/CMakeLists.txt
+++ b/build/cmake/demos/CMakeLists.txt
@@ -38,6 +38,9 @@ function(wx_add_demo name)
     target_link_libraries(${DEMO_NAME} core ${DEMO_LIBRARIES})
     wx_set_common_target_properties(${DEMO_NAME})
     set_target_properties(${DEMO_NAME} PROPERTIES FOLDER "Demos")
+    set_target_properties(${DEMO_NAME} PROPERTIES
+        VS_DEBUGGER_WORKING_DIRECTORY "${wxOUTPUT_DIR}/${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}"
+        )
 endfunction()
 
 wx_add_demo(bombs
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index c2c28b8c5a..75e0f1f2ba 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -610,6 +610,9 @@ function(wx_add_sample name)
     set_target_properties(${target_name} PROPERTIES
         FOLDER ${folder}
         )
+    set_target_properties(${target_name} PROPERTIES
+        VS_DEBUGGER_WORKING_DIRECTORY "${wxOUTPUT_DIR}/${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}"
+        )
 endfunction()
 
 # Link libraries to a sample
@@ -704,6 +707,9 @@ function(wx_add_test name)
     endif()
     wx_set_common_target_properties(${name})
     set_target_properties(${name} PROPERTIES FOLDER "Tests")
+    set_target_properties(${name} PROPERTIES
+        VS_DEBUGGER_WORKING_DIRECTORY "${wxSOURCE_DIR}/tests"
+        )
 
     add_test(NAME ${name}
         COMMAND ${name}

From f166d3b9c05e4fea3c6613e7fcc5d30fa06ed6b6 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 10 Jan 2018 22:58:53 +0100
Subject: [PATCH 121/916] CMake: Don't use external project for wxexpat

This simplifies things a lot. And it is also not used for png, tiff and zlib.
---
 build/cmake/lib/xml/CMakeLists.txt | 45 +++++-------------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/build/cmake/lib/xml/CMakeLists.txt b/build/cmake/lib/xml/CMakeLists.txt
index 718f5f64ad..4dfc9e4cc2 100644
--- a/build/cmake/lib/xml/CMakeLists.txt
+++ b/build/cmake/lib/xml/CMakeLists.txt
@@ -9,45 +9,14 @@
 
 include(../../source_groups.cmake)
 
-if(WIN32)
-    set(EXPAT_POSTFIX $<$<CONFIG:Debug>:d>)
-endif(WIN32)
-
 if(wxUSE_EXPAT STREQUAL "builtin")
-    ExternalProject_Add(wxexpat
-        DOWNLOAD_COMMAND ""
-        SOURCE_DIR ${wxSOURCE_DIR}/src/expat/expat
-        CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-            -DBUILD_tools=OFF
-            -DBUILD_examples=OFF
-            -DBUILD_tests=OFF
-            -DBUILD_shared=OFF
-        INSTALL_COMMAND
-            ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIGURATION> --target install
-        COMMAND
-            ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/wxlib
-        COMMAND
-            ${CMAKE_COMMAND} -E rename
-                <INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}expat${EXPAT_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
-                <INSTALL_DIR>/wxlib/${CMAKE_STATIC_LIBRARY_PREFIX}wxexpat$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-        )
-    ExternalProject_Get_Property(wxexpat INSTALL_DIR)
-    add_library(expat STATIC IMPORTED)
-    set_target_properties(expat PROPERTIES
-        IMPORTED_LOCATION "${INSTALL_DIR}/wxlib/${CMAKE_STATIC_LIBRARY_PREFIX}wxexpat${CMAKE_STATIC_LIBRARY_SUFFIX}"
-        IMPORTED_LOCATION_DEBUG "${INSTALL_DIR}/wxlib/${CMAKE_STATIC_LIBRARY_PREFIX}wxexpatd${CMAKE_STATIC_LIBRARY_SUFFIX}"
-        FOLDER "Third Party Libraries"
-        )
-    add_dependencies(expat wxexpat)
-    set(EXPAT_INCLUDE_DIRS "${INSTALL_DIR}/include")
-    set(EXPAT_LIBRARIES expat)
-    if(NOT wxBUILD_SHARED)
-        wx_install(
-            FILES ${INSTALL_DIR}/wxlib/${CMAKE_STATIC_LIBRARY_PREFIX}wxexpat$<$<CONFIG:Debug>:d>${CMAKE_STATIC_LIBRARY_SUFFIX}
-            DESTINATION "lib${wxPLATFORM_LIB_DIR}")
-    endif()
+    wx_add_builtin_library(wxexpat
+        src/expat/expat/lib/xmlparse.c
+        src/expat/expat/lib/xmlrole.c
+        src/expat/expat/lib/xmltok.c
+    )
+    set(EXPAT_LIBRARIES wxexpat)
+    set(EXPAT_INCLUDE_DIRS ${wxSOURCE_DIR}/src/expat/expat/lib)
 elseif(wxUSE_EXPAT)
     find_package(EXPAT)
 endif()

From 47fb2b612208e4fd53f5b2d27063b65401069312 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 11 Jan 2018 22:04:58 +0100
Subject: [PATCH 122/916] CMake: Update cotire to 1.7.10

---
 build/cmake/modules/cotire.cmake | 118 +++++++++++++++++++++----------
 1 file changed, 82 insertions(+), 36 deletions(-)

diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake
index ab611007dc..62cd23db98 100644
--- a/build/cmake/modules/cotire.cmake
+++ b/build/cmake/modules/cotire.cmake
@@ -3,7 +3,7 @@
 # See the cotire manual for usage hints.
 #
 #=============================================================================
-# Copyright 2012-2016 Sascha Kratky
+# Copyright 2012-2017 Sascha Kratky
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -43,7 +43,7 @@ if (NOT CMAKE_SCRIPT_MODE_FILE)
 endif()
 
 set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
-set (COTIRE_CMAKE_MODULE_VERSION "1.7.9")
+set (COTIRE_CMAKE_MODULE_VERSION "1.7.10")
 
 # activate select policies
 if (POLICY CMP0025)
@@ -106,6 +106,11 @@ if (POLICY CMP0054)
 	cmake_policy(SET CMP0054 NEW)
 endif()
 
+if (POLICY CMP0055)
+	# strict checking for break() command
+	cmake_policy(SET CMP0055 NEW)
+endif()
+
 include(CMakeParseArguments)
 include(ProcessorCount)
 
@@ -293,7 +298,7 @@ function (cotire_get_source_file_property_values _valuesVar _property)
 	set (${_valuesVar} ${_values} PARENT_SCOPE)
 endfunction()
 
-function (cotire_resolve_config_properites _configurations _propertiesVar)
+function (cotire_resolve_config_properties _configurations _propertiesVar)
 	set (_properties "")
 	foreach (_property ${ARGN})
 		if ("${_property}" MATCHES "<CONFIG>")
@@ -309,8 +314,8 @@ function (cotire_resolve_config_properites _configurations _propertiesVar)
 	set (${_propertiesVar} ${_properties} PARENT_SCOPE)
 endfunction()
 
-function (cotire_copy_set_properites _configurations _type _source _target)
-	cotire_resolve_config_properites("${_configurations}" _properties ${ARGN})
+function (cotire_copy_set_properties _configurations _type _source _target)
+	cotire_resolve_config_properties("${_configurations}" _properties ${ARGN})
 	foreach (_property ${_properties})
 		get_property(_isSet ${_type} ${_source} PROPERTY ${_property} SET)
 		if (_isSet)
@@ -320,13 +325,18 @@ function (cotire_copy_set_properites _configurations _type _source _target)
 	endforeach()
 endfunction()
 
-function (cotire_get_target_usage_requirements _target _targetRequirementsVar)
+function (cotire_get_target_usage_requirements _target _config _targetRequirementsVar)
 	set (_targetRequirements "")
 	get_target_property(_librariesToProcess ${_target} LINK_LIBRARIES)
 	while (_librariesToProcess)
 		# remove from head
 		list (GET _librariesToProcess 0 _library)
 		list (REMOVE_AT _librariesToProcess 0)
+		if (_library MATCHES "^\\$<\\$<CONFIG:${_config}>:([A-Za-z0-9_:-]+)>$")
+			set (_library "${CMAKE_MATCH_1}")
+		elseif (_config STREQUAL "None" AND _library MATCHES "^\\$<\\$<CONFIG:>:([A-Za-z0-9_:-]+)>$")
+			set (_library "${CMAKE_MATCH_1}")
+		endif()
 		if (TARGET ${_library})
 			list (FIND _targetRequirements ${_library} _index)
 			if (_index LESS 0)
@@ -441,7 +451,7 @@ function (cotire_get_target_compile_flags _config _language _target _flagsVar)
 	# interface compile options from linked library targets
 	if (_target)
 		set (_linkedTargets "")
-		cotire_get_target_usage_requirements(${_target} _linkedTargets)
+		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
 		foreach (_linkedTarget ${_linkedTargets})
 			get_target_property(_targetOptions ${_linkedTarget} INTERFACE_COMPILE_OPTIONS)
 			if (_targetOptions)
@@ -573,7 +583,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu
 	# interface include directories from linked library targets
 	if (_target)
 		set (_linkedTargets "")
-		cotire_get_target_usage_requirements(${_target} _linkedTargets)
+		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
 		foreach (_linkedTarget ${_linkedTargets})
 			get_target_property(_linkedTargetType ${_linkedTarget} TYPE)
 			if (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE AND NOT CMAKE_VERSION VERSION_LESS "3.4.0" AND
@@ -627,7 +637,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu
 	if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES)
 		list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES})
 	endif()
-	if (WIN32)
+	if (WIN32 AND NOT MINGW)
 		# convert Windows paths in include directories to CMake paths
 		if (_includeDirs)
 			set (_paths "")
@@ -703,7 +713,7 @@ function (cotire_get_target_compile_definitions _config _language _target _defin
 	endif()
 	# interface compile definitions from linked library targets
 	set (_linkedTargets "")
-	cotire_get_target_usage_requirements(${_target} _linkedTargets)
+	cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
 	foreach (_linkedTarget ${_linkedTargets})
 		get_target_property(_definitions ${_linkedTarget} INTERFACE_COMPILE_DEFINITIONS)
 		if (_definitions)
@@ -859,6 +869,9 @@ macro (cotire_set_cmd_to_prologue _cmdVar)
 		list (APPEND ${_cmdVar} "--warn-uninitialized")
 	endif()
 	list (APPEND ${_cmdVar} "-DCOTIRE_BUILD_TYPE:STRING=$<CONFIGURATION>")
+	if (XCODE)
+		list (APPEND ${_cmdVar} "-DXCODE:BOOL=TRUE")
+	endif()
 	if (COTIRE_VERBOSE)
 		list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=ON")
 	elseif("${CMAKE_GENERATOR}" MATCHES "Makefiles")
@@ -902,16 +915,16 @@ function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemInclu
 		foreach (_include ${_includeDirs})
 			if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
 				file (TO_NATIVE_PATH "${_include}" _include)
-				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}")
+				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
 			else()
 				set (_index -1)
 				if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+")
 					list (FIND ${_systemIncludesVar} "${_include}" _index)
 				endif()
 				if (_index GREATER -1)
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${_include}")
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
 				else()
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}")
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
 				endif()
 			endif()
 		endforeach()
@@ -1657,6 +1670,10 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 			get_filename_component(_pchName "${_pchFile}" NAME)
 			set (_xLanguage_C "c-header")
 			set (_xLanguage_CXX "c++-header")
+			set (_pchSuppressMessages FALSE)
+			if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
+				set(_pchSuppressMessages TRUE)
+			endif()
 			if (_flags)
 				# append to list
 				if ("${_language}" STREQUAL "CXX")
@@ -1664,13 +1681,17 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 				endif()
 				list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-create" "${_pchName}" "-fsyntax-only" "${_hostFile}")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-					list (APPEND _flags "-Wpch-messages")
+					if (NOT _pchSuppressMessages)
+						list (APPEND _flags "-Wpch-messages")
+					endif()
 				endif()
 			else()
 				# return as a flag string
 				set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-create \"${_pchName}\"")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-					set (_flags "${_flags} -Wpch-messages")
+					if (NOT _pchSuppressMessages)
+						set (_flags "${_flags} -Wpch-messages")
+					endif()
 				endif()
 			endif()
 		endif()
@@ -1781,17 +1802,25 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV
 			if (_pchFile)
 				get_filename_component(_pchDir "${_pchFile}" DIRECTORY)
 				get_filename_component(_pchName "${_pchFile}" NAME)
+				set (_pchSuppressMessages FALSE)
+				if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
+					set(_pchSuppressMessages TRUE)
+				endif()
 				if (_flags)
 					# append to list
 					list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-use" "${_pchName}")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-						list (APPEND _flags "-Wpch-messages")
+						if (NOT _pchSuppressMessages)
+							list (APPEND _flags "-Wpch-messages")
+						endif()
 					endif()
 				else()
 					# return as a flag string
 					set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-use \"${_pchName}\"")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-						set (_flags "${_flags} -Wpch-messages")
+						if (NOT _pchSuppressMessages)
+							set (_flags "${_flags} -Wpch-messages")
+						endif()
 					endif()
 				endif()
 			else()
@@ -1839,6 +1868,14 @@ function (cotire_precompile_prefix_header _prefixFile _pchFile _hostFile)
 	if (_option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
+	elseif (_option_COMPILER_ID MATCHES "GNU|Clang")
+		if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR
+			_option_COMPILER_EXECUTABLE MATCHES "ccache")
+			# Newer versions of Clang and GCC seem to embed a compilation timestamp into the precompiled header binary,
+			# which results in "file has been modified since the precompiled header was built" errors if ccache is used.
+			# We work around the problem by disabling ccache upon pre-compiling the prefix header.
+			set (ENV{CCACHE_DISABLE} "true")
+		endif()
 	endif()
 	execute_process(
 		COMMAND ${_cmd}
@@ -2191,7 +2228,7 @@ function (cotire_generate_target_script _language _configurations _target _targe
 		XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES
 		CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION
 		CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1
-		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_${_language}_SEP
+		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language}
 		CMAKE_INCLUDE_SYSTEM_FLAG_${_language}
 		CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG
 		CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG
@@ -2989,8 +3026,13 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 	if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
 		# if the original target sources are subject to CMake's automatic Qt processing,
 		# also include implicitly generated <targetname>_automoc.cpp file
-		list (APPEND _unityTargetSources "${_target}_automoc.cpp")
-		set_property (SOURCE "${_target}_automoc.cpp" PROPERTY GENERATED TRUE)
+		if (CMAKE_VERSION VERSION_LESS "3.8.0")
+			list (APPEND _unityTargetSources "${_target}_automoc.cpp")
+			set_property (SOURCE "${_target}_automoc.cpp" PROPERTY GENERATED TRUE)
+		else()
+			list (APPEND _unityTargetSources "${_target}_autogen/moc_compilation.cpp")
+			set_property (SOURCE "${_target}_autogen/moc_compilation.cpp" PROPERTY GENERATED TRUE)
+		endif()
 	endif()
 	# prevent AUTOMOC, AUTOUIC and AUTORCC properties from being set when the unity target is created
 	set (CMAKE_AUTOMOC OFF)
@@ -3013,7 +3055,11 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 	else()
 		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
 			# depend on the original target's implicity generated <targetname>_automoc target
-			add_dependencies(${_unityTargetName} ${_target}_automoc)
+			if (CMAKE_VERSION VERSION_LESS "3.8.0")
+				add_dependencies(${_unityTargetName} ${_target}_automoc)
+			else()
+				add_dependencies(${_unityTargetName} ${_target}_autogen)
+			endif()
 		endif()
 	endif()
 	# copy output location properties
@@ -3027,8 +3073,8 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 			set (_outputDir "${COTIRE_UNITY_OUTPUT_DIRECTORY}")
 		else()
 			# append relative COTIRE_UNITY_OUTPUT_DIRECTORY to target's actual output directory
-			cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
-			cotire_resolve_config_properites("${_configurations}" _properties ${_outputDirProperties})
+			cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
+			cotire_resolve_config_properties("${_configurations}" _properties ${_outputDirProperties})
 			foreach (_property ${_properties})
 				get_property(_outputDir TARGET ${_target} PROPERTY ${_property})
 				if (_outputDir)
@@ -3048,11 +3094,11 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 				RUNTIME_OUTPUT_DIRECTORY "${_outputDir}")
 		endif()
 	else()
-		cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 			${_outputDirProperties})
 	endif()
 	# copy output name
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_<CONFIG>
 		LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_<CONFIG>
 		OUTPUT_NAME OUTPUT_NAME_<CONFIG>
@@ -3060,7 +3106,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		PREFIX <CONFIG>_POSTFIX SUFFIX
 		IMPORT_PREFIX IMPORT_SUFFIX)
 	# copy compile stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		COMPILE_DEFINITIONS COMPILE_DEFINITIONS_<CONFIG>
 		COMPILE_FLAGS COMPILE_OPTIONS
 		Fortran_FORMAT Fortran_MODULE_DIRECTORY
@@ -3072,12 +3118,12 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		C_VISIBILITY_PRESET CXX_VISIBILITY_PRESET VISIBILITY_INLINES_HIDDEN
 		C_CLANG_TIDY CXX_CLANG_TIDY)
 	# copy compile features
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED
 		CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED
 		COMPILE_FEATURES)
 	# copy interface stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN
 		COMPATIBLE_INTERFACE_STRING
 		INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS
@@ -3085,7 +3131,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
 		INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED)
 	# copy link stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		BUILD_WITH_INSTALL_RPATH INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
 		LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED
 		LINK_FLAGS LINK_FLAGS_<CONFIG>
@@ -3094,18 +3140,18 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC
 		STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_<CONFIG>
 		NO_SONAME SOVERSION VERSION
-		LINK_WHAT_YOU_USE)
+		LINK_WHAT_YOU_USE BUILD_RPATH)
 	# copy cmake stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK)
 	# copy Apple platform specific stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR
 		MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH
 		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
-		IOS_INSTALL_COMBINED)
+		IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE)
 	# copy Windows platform specific stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		GNUtoMS
 		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
 		COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
@@ -3119,9 +3165,9 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES
 		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
 		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
-		VS_SDK_REFERENCES)
+		VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY)
 	# copy Android platform specific stuff
-	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ANDROID_API ANDROID_API_MIN ANDROID_GUI
 		ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES
 		ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR

From d26758044c55c0111ccd5e2c4d161f74c06d1771 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 12 Jan 2018 17:16:02 +0100
Subject: [PATCH 123/916] Don't call wxWakeUpIdle() with a lock in
 wxProgressDialog

This can result in deadlocks because wxWakeUpIdle(), admittedly rather
unexpectedly, can result in dispatching a message in the main thread,
which could reacquire the same lock again.
---
 src/msw/progdlg.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/msw/progdlg.cpp b/src/msw/progdlg.cpp
index 46416402c5..2f1131a5dc 100644
--- a/src/msw/progdlg.cpp
+++ b/src/msw/progdlg.cpp
@@ -1133,6 +1133,18 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
                                 LONG_PTR dwRefData
                             )
 {
+    if ( uNotification == TDN_CREATED )
+    {
+        // The main thread may be sitting in an event dispatching loop waiting
+        // for this dialog to be shown, so make sure it does wake up now that
+        // it is. Notice that we must do it from here and not from inside the
+        // block below in which sharedData is locked as otherwise we could
+        // deadlock if wxWakeUpIdle() dispatched some event which tried to call
+        // any of wxProgressDialog methods, which also lock this data, from the
+        // main thread.
+        wxWakeUpIdle();
+    }
+
     bool endDialog = false;
 
     // Block for shared data critical section.
@@ -1148,10 +1160,6 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
             // Store the HWND for the main thread use.
             sharedData->m_hwnd = hwnd;
 
-            // The main thread is sitting in an event dispatching loop waiting
-            // for this dialog to be shown, so make sure it does get an event.
-            wxWakeUpIdle();
-
             // Set the maximum value and disable Close button.
             ::SendMessage( hwnd,
                            TDM_SET_PROGRESS_BAR_RANGE,

From 91aed00288ec61275576121f957a35d7b98ad57f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 15:23:30 +0100
Subject: [PATCH 124/916] Revert "Revert using an event object for waking up
 event loop in wxMSW"

This reverts commit ebb3a791b96bcb26bcad9a4c97e8e62e2d6aa6ed,
effectively reapplying 6c40531fb763fcb850bfe275bdcac018b147be7c once
again.

This breaks wake up when not running our own event loop once again
(see #17579), but this will be fixed in the next commit.
---
 include/wx/msw/evtloop.h        |  1 -
 include/wx/msw/evtloopconsole.h | 19 ++++++-
 src/msw/app.cpp                 | 63 ++++++-----------------
 src/msw/evtloop.cpp             |  5 --
 src/msw/evtloopconsole.cpp      | 90 +++++++++++++++++++--------------
 5 files changed, 85 insertions(+), 93 deletions(-)

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index 43ef271a87..911d77d385 100644
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -53,7 +53,6 @@ public:
     // override/implement base class virtuals
     virtual bool Dispatch() wxOVERRIDE;
     virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE;
-    virtual void WakeUp() wxOVERRIDE;
 
 protected:
     virtual void OnNextIteration() wxOVERRIDE;
diff --git a/include/wx/msw/evtloopconsole.h b/include/wx/msw/evtloopconsole.h
index 32c411a50a..17df0a4e7a 100644
--- a/include/wx/msw/evtloopconsole.h
+++ b/include/wx/msw/evtloopconsole.h
@@ -15,9 +15,20 @@ class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
 {
 public:
     wxMSWEventLoopBase();
+    virtual ~wxMSWEventLoopBase();
 
     // implement base class pure virtuals
     virtual bool Pending() const wxOVERRIDE;
+    virtual void WakeUp() wxOVERRIDE;
+
+#if wxUSE_THREADS
+    // MSW-specific method to wait for the termination of the specified (by its
+    // native handle) thread or any input message arriving (in GUI case).
+    //
+    // Return value is WAIT_OBJECT_0 if the thread terminated, WAIT_OBJECT_0+1
+    // if a message arrived with anything else indicating an error.
+    WXDWORD MSWWaitForThread(WXHANDLE hThread);
+#endif // wxUSE_THREADS
 
 protected:
     // get the next message from queue and return true or return false if we
@@ -25,8 +36,13 @@ protected:
     bool GetNextMessage(WXMSG *msg);
 
     // same as above but with a timeout and return value can be -1 meaning that
-    // time out expired in addition to
+    // time out expired in addition to true/false
     int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
+
+private:
+    // An auto-reset Win32 event which is signalled when we need to wake up the
+    // main thread waiting in GetNextMessage[Timeout]().
+    WXHANDLE m_heventWake;
 };
 
 #if wxUSE_CONSOLE_EVENTLOOP
@@ -39,7 +55,6 @@ public:
     // override/implement base class virtuals
     virtual bool Dispatch() wxOVERRIDE;
     virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE;
-    virtual void WakeUp() wxOVERRIDE;
 
     // Windows-specific function to process a single message
     virtual void ProcessMessage(WXMSG *msg);
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 27a4ca23e7..866078a53a 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -248,23 +248,16 @@ WXDWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread, int flags)
     // have a running event loop as we would never remove them from the message
     // queue then and so we would enter an infinite loop as
     // MsgWaitForMultipleObjects() keeps returning WAIT_OBJECT_0 + 1.
-    if ( flags == wxTHREAD_WAIT_BLOCK ||
-            !wxIsMainThread() ||
-                !wxEventLoop::GetActive() )
+    if ( flags == wxTHREAD_WAIT_YIELD && wxIsMainThread() )
     {
-        // Simple blocking wait.
-        return DoSimpleWaitForThread(hThread);
+        wxMSWEventLoopBase* const
+            evtLoop = static_cast<wxMSWEventLoopBase *>(wxEventLoop::GetActive());
+        if ( evtLoop )
+            return evtLoop->MSWWaitForThread(hThread);
     }
 
-    return ::MsgWaitForMultipleObjects
-             (
-               1,                   // number of objects to wait for
-               (HANDLE *)&hThread,  // the objects
-               false,               // wait for any objects, not all
-               INFINITE,            // no timeout
-               QS_ALLINPUT |        // return as soon as there are any events
-               QS_ALLPOSTMESSAGE
-             );
+    // Simple blocking wait.
+    return DoSimpleWaitForThread(hThread);
 }
 #endif // wxUSE_THREADS
 
@@ -785,42 +778,16 @@ void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 void wxApp::WakeUpIdle()
 {
-    // Send the top window a dummy message so idle handler processing will
-    // start up again.  Doing it this way ensures that the idle handler
-    // wakes up in the right thread (see also wxWakeUpMainThread() which does
-    // the same for the main app thread only)
-    wxWindow * const topWindow = wxTheApp->GetTopWindow();
-    if ( topWindow )
+    wxEventLoopBase * const evtLoop = wxEventLoop::GetActive();
+    if ( !evtLoop )
     {
-        HWND hwndTop = GetHwndOf(topWindow);
-
-        // Do not post WM_NULL if there's already a pending WM_NULL to avoid
-        // overflowing the message queue.
-        //
-        // Notice that due to a limitation of PeekMessage() API (which handles
-        // 0,0 range specially), we have to check the range from 0-1 instead.
-        // This still makes it possible to overflow the queue with WM_NULLs by
-        // interspersing the calles to WakeUpIdle() with windows creation but
-        // it should be rather hard to do it accidentally.
-        MSG msg;
-        if ( !::PeekMessage(&msg, hwndTop, 0, 1, PM_NOREMOVE) ||
-              ::PeekMessage(&msg, hwndTop, 1, 1, PM_NOREMOVE) )
-        {
-            // If this fails too, there is really not much we can do, but then
-            // neither do we need to, as it normally indicates that the window
-            // queue is full to the brim with the messages and so the main loop
-            // is running and doesn't need to be woken up.
-            //
-            // Notice that we especially should not try use wxLogLastError()
-            // here as this would lead to another call to wxWakeUpIdle() from
-            // inside wxLog and stack overflow due to the resulting recursion.
-            ::PostMessage(hwndTop, WM_NULL, 0, 0);
-        }
+        // We can't wake up the event loop if there is none and there is just
+        // no need to do anything in this case, any pending events will be
+        // handled when the event loop starts.
+        return;
     }
-#if wxUSE_THREADS
-    else
-        wxWakeUpMainThread();
-#endif // wxUSE_THREADS
+
+    evtLoop->WakeUp();
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index bdfab07471..47b7972bc3 100644
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -248,11 +248,6 @@ void wxGUIEventLoop::OnNextIteration()
 #endif // wxUSE_THREADS
 }
 
-void wxGUIEventLoop::WakeUp()
-{
-    ::PostMessage(NULL, WM_NULL, 0, 0);
-}
-
 
 // ----------------------------------------------------------------------------
 // Yield to incoming messages
diff --git a/src/msw/evtloopconsole.cpp b/src/msw/evtloopconsole.cpp
index a746343609..c0ba2716fa 100644
--- a/src/msw/evtloopconsole.cpp
+++ b/src/msw/evtloopconsole.cpp
@@ -42,6 +42,17 @@ wxMSWEventLoopBase::wxMSWEventLoopBase()
 {
     m_shouldExit = false;
     m_exitcode = 0;
+
+    // Create initially not signalled auto-reset event object.
+    m_heventWake = ::CreateEvent(NULL, FALSE, FALSE, NULL);
+    if ( !m_heventWake )
+        wxLogLastError(wxS("CreateEvent(wake)"));
+}
+
+wxMSWEventLoopBase::~wxMSWEventLoopBase()
+{
+    if ( m_heventWake && !::CloseHandle(m_heventWake) )
+        wxLogLastError(wxS("CloseHandle(wake)"));
 }
 
 // ----------------------------------------------------------------------------
@@ -54,26 +65,36 @@ bool wxMSWEventLoopBase::Pending() const
     return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
 }
 
+void wxMSWEventLoopBase::WakeUp()
+{
+    if ( !::SetEvent(m_heventWake) )
+        wxLogLastError(wxS("SetEvent(wake)"));
+}
+
+#if wxUSE_THREADS
+
+WXDWORD wxMSWEventLoopBase::MSWWaitForThread(WXHANDLE hThread)
+{
+    // The order is important here, the code using this function assumes that
+    // WAIT_OBJECT_0 indicates the thread termination and anything else -- the
+    // availability of an input event. So the thread handle must come first.
+    HANDLE handles[2] = { hThread, m_heventWake };
+    return ::MsgWaitForMultipleObjects
+             (
+               WXSIZEOF(handles),   // number of objects to wait for
+               handles,             // the objects
+               false,               // wait for any objects, not all
+               INFINITE,            // no timeout
+               QS_ALLINPUT |        // return as soon as there are any events
+               QS_ALLPOSTMESSAGE
+             );
+}
+
+#endif // wxUSE_THREADS
+
 bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
 {
-    const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
-
-    if ( rc == 0 )
-    {
-        // got WM_QUIT
-        return false;
-    }
-
-    if ( rc == -1 )
-    {
-        // should never happen, but let's test for it nevertheless
-        wxLogLastError(wxT("GetMessage"));
-
-        // still break from the loop
-        return false;
-    }
-
-    return true;
+    return GetNextMessageTimeout(msg, INFINITE) == TRUE;
 }
 
 int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
@@ -81,16 +102,14 @@ int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
     // MsgWaitForMultipleObjects() won't notice any input which was already
     // examined (e.g. using PeekMessage()) but not yet removed from the queue
     // so we need to remove any immediately messages manually
-    if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
+    while ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
     {
-        // we use this function just in order to not block longer than the
-        // given timeout, so we don't pass any handles to it at all
         DWORD rc = ::MsgWaitForMultipleObjects
                      (
-                        0, NULL,
+                        1, &m_heventWake,
                         FALSE,
                         timeout,
-                        QS_ALLINPUT
+                        QS_ALLINPUT | QS_ALLPOSTMESSAGE
                      );
 
         switch ( rc )
@@ -104,13 +123,17 @@ int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
                 return -1;
 
             case WAIT_OBJECT_0:
-                if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-                {
-                    // somehow it may happen that MsgWaitForMultipleObjects()
-                    // returns true but there are no messages -- just treat it
-                    // the same as timeout then
-                    return -1;
-                }
+                // We were woken up by a background thread, which means there
+                // is no actual input message available, but we should still
+                // return to the event loop, so pretend there was WM_NULL in
+                // the queue.
+                wxZeroMemory(*msg);
+                return TRUE;
+
+            case WAIT_OBJECT_0 + 1:
+                // Some message is supposed to be available, but spurious
+                // wake ups are also possible, so just return to the loop:
+                // either we'll get the message or start waiting again.
                 break;
         }
     }
@@ -124,13 +147,6 @@ int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
 
 #if wxUSE_CONSOLE_EVENTLOOP
 
-void wxConsoleEventLoop::WakeUp()
-{
-#if wxUSE_THREADS
-    wxWakeUpMainThread();
-#endif
-}
-
 void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
 {
     ::DispatchMessage(msg);

From 9b4759d7b6dfc1ea016db543405c09ae2f0d49db Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 17:33:09 +0100
Subject: [PATCH 125/916] Don't rely on getting WM_NULL messages in
 wxIdleWakeUpModule

Since the switch to using an event object for idle handling wakeup,
WM_NULLs are not being sent any longer, so wxIdleWakeUpModule didn't do
anything, resulting in pending event dispatching being paused while our
event loop was not running, as it happened, for example, while the
window was resized.

See #17579.
---
 include/wx/msw/app.h            |  4 ++++
 include/wx/msw/evtloopconsole.h |  4 ++++
 src/msw/app.cpp                 | 10 ++++++++++
 src/msw/evtloopconsole.cpp      |  5 +++++
 src/msw/window.cpp              | 21 ++++++++-------------
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index cbd4c09a46..6a8c8baf0d 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -103,6 +103,10 @@ public:
     // use it.
     static wxLayoutDirection MSWGetDefaultLayout(wxWindow* parent = NULL);
 
+    // Call ProcessPendingEvents() but only if we need to do it, i.e. there was
+    // a recent call to WakeUpIdle().
+    void MSWProcessPendingEventsIfNeeded();
+
 protected:
     int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
diff --git a/include/wx/msw/evtloopconsole.h b/include/wx/msw/evtloopconsole.h
index 17df0a4e7a..87217bc64b 100644
--- a/include/wx/msw/evtloopconsole.h
+++ b/include/wx/msw/evtloopconsole.h
@@ -30,6 +30,10 @@ public:
     WXDWORD MSWWaitForThread(WXHANDLE hThread);
 #endif // wxUSE_THREADS
 
+    // Return true if wake up was requested and not handled yet, i.e. if
+    // m_heventWake is signaled.
+    bool MSWIsWakeUpRequested();
+
 protected:
     // get the next message from queue and return true or return false if we
     // got WM_QUIT or an error occurred
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 866078a53a..2c3d14273b 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -790,6 +790,16 @@ void wxApp::WakeUpIdle()
     evtLoop->WakeUp();
 }
 
+void wxApp::MSWProcessPendingEventsIfNeeded()
+{
+    // The cast below is safe as wxEventLoop derives from wxMSWEventLoopBase in
+    // both console and GUI applications.
+    wxMSWEventLoopBase * const evtLoop
+        = static_cast<wxMSWEventLoopBase *>(wxEventLoop::GetActive());
+    if ( evtLoop && evtLoop->MSWIsWakeUpRequested() )
+        ProcessPendingEvents();
+}
+
 // ----------------------------------------------------------------------------
 // other wxApp event handlers
 // ----------------------------------------------------------------------------
diff --git a/src/msw/evtloopconsole.cpp b/src/msw/evtloopconsole.cpp
index c0ba2716fa..869ea888fd 100644
--- a/src/msw/evtloopconsole.cpp
+++ b/src/msw/evtloopconsole.cpp
@@ -71,6 +71,11 @@ void wxMSWEventLoopBase::WakeUp()
         wxLogLastError(wxS("SetEvent(wake)"));
 }
 
+bool wxMSWEventLoopBase::MSWIsWakeUpRequested()
+{
+    return ::WaitForSingleObject(m_heventWake, 0) == WAIT_OBJECT_0;
+}
+
 #if wxUSE_THREADS
 
 WXDWORD wxMSWEventLoopBase::MSWWaitForThread(WXHANDLE hThread)
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ea92c52ed0..41e84b5559 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -7511,10 +7511,9 @@ bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
 #endif // wxUSE_HOTKEY
 
 // this class installs a message hook which really wakes up our idle processing
-// each time a WM_NULL is received (wxWakeUpIdle does this), even if we're
-// sitting inside a local modal loop (e.g. a menu is opened or scrollbar is
-// being dragged or even inside ::MessageBox()) and so don't control message
-// dispatching otherwise
+// each time a message is handled, even if we're sitting inside a local modal
+// loop (e.g. a menu is opened or scrollbar is being dragged or even inside
+// ::MessageBox()) and so don't control message dispatching otherwise
 class wxIdleWakeUpModule : public wxModule
 {
 public:
@@ -7545,15 +7544,11 @@ public:
 
     static LRESULT CALLBACK MsgHookProc(int nCode, WPARAM wParam, LPARAM lParam)
     {
-        MSG *msg = (MSG*)lParam;
-
-        // only process the message if it is actually going to be removed from
-        // the message queue, this prevents that the same event from being
-        // processed multiple times if now someone just called PeekMessage()
-        if ( msg->message == WM_NULL && wParam == PM_REMOVE )
-        {
-            wxTheApp->ProcessPendingEvents();
-        }
+        // Don't process idle events unless the message is going to be really
+        // handled, i.e. removed from the queue, as it seems wrong to do it
+        // just because someone called PeekMessage(PM_NOREMOVE).
+        if ( wParam == PM_REMOVE )
+            wxTheApp->MSWProcessPendingEventsIfNeeded();
 
         return CallNextHookEx(ms_hMsgHookProc, nCode, wParam, lParam);
     }

From d617834eb96b3c879d68f731c60231fdd49c2afe Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 17:39:40 +0100
Subject: [PATCH 126/916] Don't make wxEventLoop::WakeUpIdle() virtual

It just forwards to (virtual) WakeUp() and there should be no need to
ever override this method itself (nor even to keep it, except for
backwards compatibility).

No real changes.
---
 include/wx/evtloop.h      | 5 +++--
 src/common/evtloopcmn.cpp | 5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 00e6d097d5..bd50999509 100644
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -128,8 +128,9 @@ public:
     // idle handling
     // -------------
 
-        // make sure that idle events are sent again
-    virtual void WakeUpIdle();
+        // make sure that idle events are sent again: this is just an obsolete
+        // synonym for WakeUp()
+    void WakeUpIdle() { WakeUp(); }
 
         // this virtual function is called  when the application
         // becomes idle and by default it forwards to wxApp::ProcessIdle() and
diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index e8123f3caa..572c29626a 100644
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -88,11 +88,6 @@ void wxEventLoopBase::OnExit()
         wxTheApp->OnEventLoopExit(this);
 }
 
-void wxEventLoopBase::WakeUpIdle()
-{
-    WakeUp();
-}
-
 bool wxEventLoopBase::ProcessIdle()
 {
     return wxTheApp && wxTheApp->ProcessIdle();

From d1e57312c2be1637c8c52feff1b9f072d828ca48 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 17:41:16 +0100
Subject: [PATCH 127/916] Revert "Don't call wxWakeUpIdle() with a lock in
 wxProgressDialog"

This reverts commit d26758044c55c0111ccd5e2c4d161f74c06d1771 which was a
workaround for the problem of wxWakeUpIdle() dispatching events, as this
is not the case any more after the latest changes.
---
 src/msw/progdlg.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/msw/progdlg.cpp b/src/msw/progdlg.cpp
index 2f1131a5dc..46416402c5 100644
--- a/src/msw/progdlg.cpp
+++ b/src/msw/progdlg.cpp
@@ -1133,18 +1133,6 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
                                 LONG_PTR dwRefData
                             )
 {
-    if ( uNotification == TDN_CREATED )
-    {
-        // The main thread may be sitting in an event dispatching loop waiting
-        // for this dialog to be shown, so make sure it does wake up now that
-        // it is. Notice that we must do it from here and not from inside the
-        // block below in which sharedData is locked as otherwise we could
-        // deadlock if wxWakeUpIdle() dispatched some event which tried to call
-        // any of wxProgressDialog methods, which also lock this data, from the
-        // main thread.
-        wxWakeUpIdle();
-    }
-
     bool endDialog = false;
 
     // Block for shared data critical section.
@@ -1160,6 +1148,10 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
             // Store the HWND for the main thread use.
             sharedData->m_hwnd = hwnd;
 
+            // The main thread is sitting in an event dispatching loop waiting
+            // for this dialog to be shown, so make sure it does get an event.
+            wxWakeUpIdle();
+
             // Set the maximum value and disable Close button.
             ::SendMessage( hwnd,
                            TDM_SET_PROGRESS_BAR_RANGE,

From 564df77283e4f88f4e85c6592dcebd02b44285ac Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 22:26:07 +0100
Subject: [PATCH 128/916] Correct new wxStaticBox::Create() overload
 documentation

Fix the method name and update its description to mention that it's also
available in wxMSW.
---
 interface/wx/statbox.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/wx/statbox.h b/interface/wx/statbox.h
index c0fcac378e..f9174261d7 100644
--- a/interface/wx/statbox.h
+++ b/interface/wx/statbox.h
@@ -146,13 +146,13 @@ public:
 
         See the constructor documentation for more details.
 
-        Currently this overload is only available in wxGTK, use
+        Currently this overload is only available in wxGTK and wxMSW, use
         @c wxHAS_WINDOW_LABEL_IN_STATIC_BOX to check whether it can be used at
         compile-time.
 
         @since 3.1.1
      */
-    wxStaticBox(wxWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id,
                 wxWindow* label,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

From 2163b00b935a10804da08e8bd0f85d327f162343 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 22:44:44 +0100
Subject: [PATCH 129/916] Move wxHAS_NATIVE_ENABLED_MANAGEMENT definition to
 the source file

There doesn't seem to be any need to have this symbol in the header,
when it's only used in NotifyWindowOnEnableChange() in wincmn.cpp.

No real changes.
---
 include/wx/window.h   | 16 ----------------
 src/common/wincmn.cpp | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/include/wx/window.h b/include/wx/window.h
index 38d70ab7a8..8046223a4a 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -48,22 +48,6 @@
     #define wxUSE_MENUS_NATIVE wxUSE_MENUS
 #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
-
-// Define this macro if the corresponding operating system handles the state
-// of children windows automatically when the parent is enabled/disabled.
-// Otherwise wx itself must ensure that when the parent is disabled its
-// children are disabled too, and their initial state is restored when the
-// parent is enabled back.
-#if defined(__WXMSW__)
-    // must do everything ourselves
-    #undef wxHAS_NATIVE_ENABLED_MANAGEMENT
-#elif defined(__WXOSX__)
-    // must do everything ourselves
-    #undef wxHAS_NATIVE_ENABLED_MANAGEMENT
-#else
-    #define wxHAS_NATIVE_ENABLED_MANAGEMENT
-#endif
-
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index f07acd465d..d398f1f7b0 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1166,6 +1166,21 @@ bool wxWindowBase::IsEnabled() const
     return IsThisEnabled() && (IsTopLevel() || !GetParent() || GetParent()->IsEnabled());
 }
 
+// Define this macro if the corresponding operating system handles the state
+// of children windows automatically when the parent is enabled/disabled.
+// Otherwise wx itself must ensure that when the parent is disabled its
+// children are disabled too, and their initial state is restored when the
+// parent is enabled back.
+#if defined(__WXMSW__)
+    // must do everything ourselves
+    #undef wxHAS_NATIVE_ENABLED_MANAGEMENT
+#elif defined(__WXOSX__)
+    // must do everything ourselves
+    #undef wxHAS_NATIVE_ENABLED_MANAGEMENT
+#else
+    #define wxHAS_NATIVE_ENABLED_MANAGEMENT
+#endif
+
 void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
 {
     // Under some platforms there is no need to update the window state

From 967b4cdc1f848576be3b83fb07d59c9b670c3994 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 22:45:39 +0100
Subject: [PATCH 130/916] Always call DoEnable() from
 NotifyWindowOnEnableChange()

Simplify the code by replacing 2 conditionally-compiled DoEnable() calls
with a single unconditional one.

This doesn't change the behaviour of Enable(), as it always called
DoEnable() on the window itself and only did it for its children when
wxHAS_NATIVE_ENABLED_MANAGEMENT was not defined before and continues to
do the same thing now, but it should fix a small bug in Reparent() as it
didn't update the actual status of the window if it changed as the
result of reparenting before, even though it was supposed to.
---
 src/common/wincmn.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index d398f1f7b0..3daae78c26 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1183,13 +1183,9 @@ bool wxWindowBase::IsEnabled() const
 
 void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
 {
-    // Under some platforms there is no need to update the window state
-    // explicitly, it will become disabled when its parent is. On other ones we
-    // do need to disable all windows recursively though.
-#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT
     DoEnable(enabled);
-#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
 
+#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT
     // Disabling a top level window is typically done when showing a modal
     // dialog and we don't need to disable its children in this case, they will
     // be logically disabled anyhow (i.e. their IsEnabled() will return false)
@@ -1205,7 +1201,6 @@ void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
     // they would still show as enabled even though they wouldn't actually
     // accept any input (at least under MSW where children don't accept input
     // if any of the windows in their parent chain is enabled).
-#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT
     for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
           node;
           node = node->GetNext() )
@@ -1224,12 +1219,6 @@ bool wxWindowBase::Enable(bool enable)
 
     m_isEnabled = enable;
 
-    // If we call DoEnable() from NotifyWindowOnEnableChange(), we don't need
-    // to do it from here.
-#ifdef wxHAS_NATIVE_ENABLED_MANAGEMENT
-    DoEnable(enable);
-#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
-
     NotifyWindowOnEnableChange(enable);
 
     return true;

From 3c29b3d0ce20df8246a32e8eaa3ed612c4fd720e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 22:50:26 +0100
Subject: [PATCH 131/916] Don't disable wxStaticBox children at wx level when
 disabling it

Calling Enable() on all children from wxStaticBox::Enable() was wrong,
the actual status of the child, returned by wxWindow::IsThisEnabled(),
is not supposed to change just because its parent was disabled.

Call NotifyWindowOnEnableChange() to avoid this, while still disabling
the children visually.
---
 include/wx/window.h       | 10 +++++-----
 src/common/statboxcmn.cpp |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/wx/window.h b/include/wx/window.h
index 8046223a4a..b8d9e8d1a3 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1580,6 +1580,11 @@ public:
         return false;
     }
 
+    // Recursively call our own and our children DoEnable() when the
+    // enabled/disabled status changed because a parent window had been
+    // enabled/disabled. This is only used by the library implementation.
+    void NotifyWindowOnEnableChange(bool enabled);
+
 
 protected:
     // helper for the derived class Create() methods: the first overload, with
@@ -1891,11 +1896,6 @@ protected:
     static void NotifyCaptureLost();
 
 private:
-    // recursively call our own and our children DoEnable() when the
-    // enabled/disabled status changed because a parent window had been
-    // enabled/disabled
-    void NotifyWindowOnEnableChange(bool enabled);
-
 #if wxUSE_MENUS
     // temporary event handlers used by GetPopupMenuSelectionFromUser()
     void InternalOnPopupMenu(wxCommandEvent& event);
diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 0e77dfe74f..8620d4efd0 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -105,11 +105,15 @@ bool wxStaticBoxBase::Enable(bool enable)
               ++i )
         {
             if ( *i != m_labelWin )
-                (*i)->Enable(enable);
+                (*i)->NotifyWindowOnEnableChange(enable);
         }
 
         m_isEnabled = enable;
 
+        // Notice that we don't call DoEnable() on the box itself: under MSW it
+        // doesn't actually change anything and under GTK this would disable
+        // the label window.
+
         return true;
     }
 #endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX

From 88c6ce344e9b4adaef2ab7ec163ecfc051865dcf Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 23:23:54 +0100
Subject: [PATCH 132/916] Fix bug with not re-enabling wxStaticBox with label
 sometimes

In some specific scenario, described in the newly added comment in
wxStaticBoxBase::Enable(), the box and its label could remain disabled
after its parent was disabled and re-enabled.

Fix this by continuing to use the derived class version for disabling
the box children, but not when enabling them, as the base class version
already does the right thing in this case.
---
 src/common/statboxcmn.cpp | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 8620d4efd0..50f8a932e6 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -94,7 +94,26 @@ bool wxStaticBoxBase::Enable(bool enable)
     // in this case and only disable its children, but still pretend that the
     // box is disabled by updating its m_isEnabled, as it would be surprising
     // if IsEnabled() didn't return false after disabling the box, for example.
-    if ( m_labelWin )
+    //
+    // Finally note that this really needs to be done only when disabling the
+    // box and not when re-enabling it, at least for the platforms without
+    // native enabled state management (e.g. wxMSW) because otherwise we could
+    // have a bug in the following scenario:
+    //
+    //  0. The box is initially enabled
+    //  1. Its parent gets disabled, calling DoEnable(false) on the box and all
+    //     its children from its NotifyWindowOnEnableChange() (including the
+    //     label).
+    //  2. The box is itself disabled (for whatever app logic reason).
+    //  3. The parent gets enabled but this time doesn't do anything with the
+    //     box, because it should continue being disabled.
+    //  4. The box is re-enabled -- but remains actually disabled as
+    //     DoEnable(true) was never called on it (nor on the label).
+    //
+    // To avoid this possibility, we always call the base class version, which
+    // does call DoEnable(true) on the box itself and all its children,
+    // including the label, when re-enabling it.
+    if ( m_labelWin && !enable )
     {
         if ( enable == IsThisEnabled() )
             return false;
@@ -110,10 +129,6 @@ bool wxStaticBoxBase::Enable(bool enable)
 
         m_isEnabled = enable;
 
-        // Notice that we don't call DoEnable() on the box itself: under MSW it
-        // doesn't actually change anything and under GTK this would disable
-        // the label window.
-
         return true;
     }
 #endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX

From a5ae0685a05db49d34d11b6abc26e67c794b49b8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 12 Jan 2018 02:38:00 +0100
Subject: [PATCH 133/916] Fix wxFSVolume compilation with Cygwin in 64 bits

Use __LONG32, which is always 32 bits when using Cygwin, unlike long,
which is 64 bits there in 64 bit builds, and so can't be used as an
argument to InterlockedExchange().

Closes #16746.
---
 src/msw/volume.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index a2932bf3d4..32e62b4980 100644
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -68,7 +68,18 @@ static WNetCloseEnumPtr s_pWNetCloseEnum;
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // Globals/Statics
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-static long s_cancelSearch = FALSE;
+
+#if defined(__CYGWIN__) && defined(__LP64__)
+    // We can't use long in 64 bit Cygwin build because Cygwin uses LP64 model
+    // (unlike all the other MSW compilers) and long is 64 bits, while
+    // InterlockedExchange(), with which this variable is used, requires a 32
+    // bit-sized value, so use Cygwin-specific type with the right size.
+    typedef __LONG32 wxInterlockedArg_t;
+#else
+    typedef long wxInterlockedArg_t;
+#endif
+
+static wxInterlockedArg_t s_cancelSearch = FALSE;
 
 struct FileInfo
 {

From 1261139bcbbcfd9048682cc3116e529582d1f72c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 12 Jan 2018 17:13:35 +0100
Subject: [PATCH 134/916] Fix wxSocket code compilation with Cygwin in 64 bits

Use __ms_u_long instead of just u_long with Cygwin to avoid mismatch
between (64 bit) Cygwin long and (still 32 bit, even in 64 bit build)
Windows API long.
---
 include/wx/msw/private/sockmsw.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/include/wx/msw/private/sockmsw.h b/include/wx/msw/private/sockmsw.h
index bbcad77bca..91dbbede2a 100644
--- a/include/wx/msw/private/sockmsw.h
+++ b/include/wx/msw/private/sockmsw.h
@@ -23,6 +23,15 @@
 
 #if defined(__CYGWIN__)
     #include <winsock.h>
+    #ifdef __LP64__
+        // We can't use long in this case because it is 64 bits with Cygwin, so
+        // use their special type used for working around this instead.
+        #define wxIoctlSocketArg_t __ms_u_long
+    #endif
+#endif
+
+#ifndef wxIoctlSocketArg_t
+    #define wxIoctlSocketArg_t u_long
 #endif
 
 // ----------------------------------------------------------------------------
@@ -61,7 +70,7 @@ private:
             // just useless) as they would be dispatched by the main thread
             // while this blocking socket can be used from a worker one, so it
             // would result in data races and other unpleasantness.
-            unsigned long trueArg = 1;
+            wxIoctlSocketArg_t trueArg = 1;
             ioctlsocket(m_fd, FIONBIO, &trueArg);
         }
         else

From ebb06fbeafa0d50581823e3a372a1232b0bc736d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 13:43:28 +0100
Subject: [PATCH 135/916] Use wxTimeVal_t instead of timeval to fix 64 bit
 Cygwin problems

Due to the same problem with sizeof(long) mismatch as in the previous
commit, we can't use struct timeval, with its long fields, in 64 bit
Cygwin builds, and need to use __ms_timeval instead.

Add wxTimeVal_t type to hide this difference and update all code
compiled under MSW (there is no need to uglify Unix-only code using
timeval, as in wxSelectDispatcher, for example) to use it instead of
timeval.
---
 include/wx/private/socket.h | 13 +++++++++++--
 src/common/socket.cpp       |  8 ++++----
 src/msw/sockmsw.cpp         |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index 906c20c659..56a3cef528 100644
--- a/include/wx/private/socket.h
+++ b/include/wx/private/socket.h
@@ -62,6 +62,15 @@
     #include <sys/time.h>   // for timeval
 #endif
 
+// 64 bit Cygwin can't use the standard struct timeval because it has long
+// fields, which are supposed to be 32 bits in Win64 API, but long is 64 bits
+// in 64 bit Cygwin, so we need to use its special __ms_timeval instead.
+#if defined(__CYGWIN__) && defined(__LP64__)
+    typedef __ms_timeval wxTimeVal_t;
+#else
+    typedef timeval wxTimeVal_t;
+#endif
+
 // these definitions are for MSW when we don't use configure, otherwise these
 // symbols are defined by configure
 #ifndef WX_SOCKLEN_T
@@ -254,7 +263,7 @@ public:
     // flags defines what kind of conditions we're interested in, the return
     // value is composed of a (possibly empty) subset of the bits set in flags
     wxSocketEventFlags Select(wxSocketEventFlags flags,
-                              const timeval *timeout = NULL);
+                              wxTimeVal_t *timeout = NULL);
 
     // convenient wrapper calling Select() with our default timeout
     wxSocketEventFlags SelectWithTimeout(wxSocketEventFlags flags)
@@ -299,7 +308,7 @@ public:
     bool m_broadcast;
     bool m_dobind;
 
-    struct timeval m_timeout;
+    wxTimeVal_t m_timeout;
 
 protected:
     wxSocketImpl(wxSocketBase& wxsocket);
diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 5fb8c291ae..207b3c9751 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -135,7 +135,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent);
 namespace
 {
 
-void SetTimeValFromMS(timeval& tv, unsigned long ms)
+void SetTimeValFromMS(wxTimeVal_t& tv, unsigned long ms)
 {
     tv.tv_sec  = (ms / 1000);
     tv.tv_usec = (ms % 1000) * 1000;
@@ -1304,12 +1304,12 @@ wxSocketBase& wxSocketBase::Discard()
     and it will return a mask indicating which operations can be performed.
  */
 wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags,
-                                        const timeval *timeout)
+                                        wxTimeVal_t *timeout)
 {
     if ( m_fd == INVALID_SOCKET )
         return (wxSOCKET_LOST_FLAG & flags);
 
-    struct timeval tv;
+    wxTimeVal_t tv;
     if ( timeout )
         tv = *timeout;
     else
@@ -1502,7 +1502,7 @@ wxSocketBase::DoWait(long timeout, wxSocketEventFlags flags)
         else // no event loop or waiting in another thread
         {
             // as explained below, we should always check for wxSOCKET_LOST_FLAG
-            timeval tv;
+            wxTimeVal_t tv;
             SetTimeValFromMS(tv, timeLeft);
             events = m_impl->Select(flags | wxSOCKET_LOST_FLAG, &tv);
         }
diff --git a/src/msw/sockmsw.cpp b/src/msw/sockmsw.cpp
index 791f18a49b..2a66c8eda4 100644
--- a/src/msw/sockmsw.cpp
+++ b/src/msw/sockmsw.cpp
@@ -217,7 +217,7 @@ LRESULT CALLBACK wxSocket_Internal_WinProc(HWND hWnd,
                 // only then). Ignore such dummy notifications.
                 {
                     fd_set fds;
-                    timeval tv = { 0, 0 };
+                    wxTimeVal_t tv = { 0, 0 };
 
                     wxFD_ZERO(&fds);
                     wxFD_SET(socket->m_fd, &fds);

From d55d5b1dd76c5d787f6a382cdc2a068afbca11b7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 14:26:00 +0100
Subject: [PATCH 136/916] Use LONG for OLE IAccessible methods parameters

This is another fix for 64 bit Cygwin build: LONG is defined as a 32 bit
type in it, but not long, which is 64 bits, so use the former instead of
the latter.
---
 src/msw/ole/access.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 6dd3a7baa5..6620f74e6e 100644
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -47,7 +47,7 @@
 int wxConvertToWindowsRole(wxAccRole wxrole);
 
 // Convert to Windows state
-long wxConvertToWindowsState(long wxstate);
+LONG wxConvertToWindowsState(long wxstate);
 
 // Convert to Windows selection flag
 int wxConvertToWindowsSelFlag(wxAccSelectionFlags sel);
@@ -191,17 +191,17 @@ public:
         // Retrieves the child element or child object at a given point on the screen.
         // All visual objects support this method; sound objects do not support it.
 
-    STDMETHODIMP accHitTest(long xLeft, long yLeft, VARIANT* pVarID);
+    STDMETHODIMP accHitTest(LONG xLeft, LONG yLeft, VARIANT* pVarID);
 
         // Retrieves the specified object's current screen location. All visual objects must
         // support this method; sound objects do not support it.
 
-    STDMETHODIMP accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID);
+    STDMETHODIMP accLocation ( LONG* pxLeft, LONG* pyTop, LONG* pcxWidth, LONG* pcyHeight, VARIANT varID);
 
         // Traverses to another user interface element within a container and retrieves the object.
         // All visual objects must support this method.
 
-    STDMETHODIMP accNavigate ( long navDir, VARIANT varStart, VARIANT* pVarEnd);
+    STDMETHODIMP accNavigate ( LONG navDir, VARIANT varStart, VARIANT* pVarEnd);
 
         // Retrieves the address of an IDispatch interface for the specified child.
         // All objects must support this property.
@@ -211,7 +211,7 @@ public:
         // Retrieves the number of children that belong to this object.
         // All objects must support this property.
 
-    STDMETHODIMP get_accChildCount ( long* pCountChildren);
+    STDMETHODIMP get_accChildCount ( LONG* pCountChildren);
 
         // Retrieves the IDispatch interface of the object's parent.
         // All objects support this property.
@@ -244,7 +244,7 @@ public:
         // object and the identifier of the appropriate topic within that file.
         // Not all objects support this property.
 
-    STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic);
+    STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, LONG* pidTopic);
 
         // Retrieves the specified object's shortcut key or access key, also known as
         // the mnemonic. All objects that have a shortcut key or access key support
@@ -278,7 +278,7 @@ public:
         // specified object. All objects that select or receive the
         // keyboard focus must support this method.
 
-    STDMETHODIMP accSelect ( long flagsSelect, VARIANT varID );
+    STDMETHODIMP accSelect ( LONG flagsSelect, VARIANT varID );
 
         // Retrieves the object that has the keyboard focus. All objects
         // that receive the keyboard focus must support this property.
@@ -368,7 +368,7 @@ void wxIAccessible::Quiesce()
 // Retrieves the child element or child object at a given point on the screen.
 // All visual objects support this method; sound objects do not support it.
 
-STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
+STDMETHODIMP wxIAccessible::accHitTest(LONG xLeft, LONG yLeft, VARIANT* pVarID)
 {
     wxLogTrace(wxT("access"), wxT("accHitTest"));
     wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );
@@ -441,7 +441,7 @@ STDMETHODIMP wxIAccessible::accHitTest(long xLeft, long yLeft, VARIANT* pVarID)
 // Retrieves the specified object's current screen location. All visual objects must
 // support this method; sound objects do not support it.
 
-STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWidth, long* pcyHeight, VARIANT varID)
+STDMETHODIMP wxIAccessible::accLocation ( LONG* pxLeft, LONG* pyTop, LONG* pcxWidth, LONG* pcyHeight, VARIANT varID)
 {
     wxLogTrace(wxT("access"), wxT("accLocation"));
     wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );
@@ -492,7 +492,7 @@ STDMETHODIMP wxIAccessible::accLocation ( long* pxLeft, long* pyTop, long* pcxWi
 // Traverses to another user interface element within a container and retrieves the object.
 // All visual objects must support this method.
 
-STDMETHODIMP wxIAccessible::accNavigate ( long navDir, VARIANT varStart, VARIANT* pVarEnd)
+STDMETHODIMP wxIAccessible::accNavigate ( LONG navDir, VARIANT varStart, VARIANT* pVarEnd)
 {
     wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );
     if (!m_pAccessible)
@@ -727,7 +727,7 @@ STDMETHODIMP wxIAccessible::get_accChild ( VARIANT varChildID, IDispatch** ppDis
 // Retrieves the number of children that belong to this object.
 // All objects must support this property.
 
-STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
+STDMETHODIMP wxIAccessible::get_accChildCount ( LONG* pCountChildren)
 {
     wxLogTrace(wxT("access"), wxT("get_accChildCount"));
     wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );
@@ -757,7 +757,7 @@ STDMETHODIMP wxIAccessible::get_accChildCount ( long* pCountChildren)
     }
     else
     {
-        * pCountChildren = (long) childCount;
+        * pCountChildren = (LONG) childCount;
         return S_OK;
     }
 
@@ -1071,7 +1071,7 @@ STDMETHODIMP wxIAccessible::get_accHelp ( VARIANT varID, BSTR* pszHelp)
 // NOTE: not supported by wxWidgets at this time. Use
 // GetHelpText instead.
 
-STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, long* pidTopic)
+STDMETHODIMP wxIAccessible::get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, LONG* pidTopic)
 {
     wxLogTrace(wxT("access"), wxT("get_accHelpTopic"));
     wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );
@@ -1346,7 +1346,7 @@ STDMETHODIMP wxIAccessible::get_accState ( VARIANT varID, VARIANT* pVarState)
     }
     else
     {
-        long state = wxConvertToWindowsState(wxstate);
+        LONG state = wxConvertToWindowsState(wxstate);
         pVarState->lVal = state;
         pVarState->vt = VT_I4;
         return S_OK;
@@ -1422,7 +1422,7 @@ STDMETHODIMP wxIAccessible::get_accValue ( VARIANT varID, BSTR* pszValue)
 // specified object. All objects that select or receive the
 // keyboard focus must support this method.
 
-STDMETHODIMP wxIAccessible::accSelect ( long flagsSelect, VARIANT varID )
+STDMETHODIMP wxIAccessible::accSelect ( LONG flagsSelect, VARIANT varID )
 {
     wxLogTrace(wxT("access"), wxT("get_accSelect"));
     wxASSERT( ( m_pAccessible != NULL ) || ( m_bQuiescing == true ) );
@@ -1693,13 +1693,13 @@ IAccessible* wxIAccessible::GetChildStdAccessible(int id)
 #if 0
     {
         // Loop until we find the right id
-        long nChildren = 0;
+        LONG nChildren = 0;
         this->get_accChildCount(& nChildren);
 
         int i;
         for (i = 0; i < nChildren; i++)
         {
-            long obtained = 0;
+            LONG obtained = 0;
             VARIANT var;
             VariantInit(& var);
             var.vt = VT_I4;
@@ -1983,9 +1983,9 @@ int wxConvertToWindowsRole(wxAccRole wxrole)
 }
 
 // Convert to Windows state
-long wxConvertToWindowsState(long wxstate)
+LONG wxConvertToWindowsState(long wxstate)
 {
-    long state = 0;
+    LONG state = 0;
     if (wxstate & wxACC_STATE_SYSTEM_ALERT_HIGH)
         state |= STATE_SYSTEM_ALERT_HIGH;
 

From 277937b0c42955707d0136187d357ea3a985ff19 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 15:56:46 +0100
Subject: [PATCH 137/916] Always use stderr for wxMessageOutputBest in the
 tests

Avoid showing message boxes even if we don't have the associated console
as this prevents the test from completing on its own if an unknown
exception happens.
---
 tests/test.cpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/test.cpp b/tests/test.cpp
index e8628ac591..09ab1e8f4b 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -46,6 +46,7 @@ std::string wxTheCurrentTestClass, wxTheCurrentTestMethod;
     #include "wx/wx.h"
 #endif
 
+#include "wx/apptrait.h"
 #include "wx/cmdline.h"
 #include <exception>
 #include <iostream>
@@ -171,8 +172,10 @@ CATCH_TRANSLATE_EXCEPTION(TestAssertFailure& e)
 
 #if wxUSE_GUI
     typedef wxApp TestAppBase;
+    typedef wxGUIAppTraits TestAppTraitsBase;
 #else
     typedef wxAppConsole TestAppBase;
+    typedef wxConsoleAppTraits TestAppTraitsBase;
 #endif
 
 // The application class
@@ -186,6 +189,36 @@ public:
     virtual bool OnInit();
     virtual int  OnExit();
 
+#ifdef __WIN32__
+    virtual wxAppTraits *CreateTraits()
+    {
+        // Define a new class just to customize CanUseStderr() behaviour.
+        class TestAppTraits : public TestAppTraitsBase
+        {
+        public:
+            // We want to always use stderr, tests are also run unattended and
+            // in this case we really don't want to show any message boxes, as
+            // wxMessageOutputBest, used e.g. from the default implementation
+            // of wxApp::OnUnhandledException(), would do by default.
+            virtual bool CanUseStderr() { return true; }
+
+            // Overriding CanUseStderr() is not enough, we also need to
+            // override this one to avoid returning false from it.
+            virtual bool WriteToStderr(const wxString& text)
+            {
+                wxFputs(text, stderr);
+                fflush(stderr);
+
+                // Intentionally ignore any errors, we really don't want to
+                // show any message boxes in any case.
+                return true;
+            }
+        };
+
+        return new TestAppTraits;
+    }
+#endif // __WIN32__
+
     // used by events propagation test
     virtual int FilterEvent(wxEvent& event);
     virtual bool ProcessEvent(wxEvent& event);

From 9df5541c537778289028aaa8b006939eaeec2ed4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jan 2018 18:08:07 +0100
Subject: [PATCH 138/916] Don't show dialogs from OnExceptionInMainLoop() in
 the tests

Similarly to the previous commit, ensure that the tests can run
unattended under MSW even if an unhandled exception is thrown during
their execution.
---
 tests/test.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/test.cpp b/tests/test.cpp
index 09ab1e8f4b..7dbb44fb53 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -219,6 +219,16 @@ public:
     }
 #endif // __WIN32__
 
+    // Also override this method to avoid showing any dialogs from here -- and
+    // show some details about the exception along the way.
+    virtual bool OnExceptionInMainLoop()
+    {
+        wxFprintf(stderr, "Unhandled exception in the main loop: %s\n",
+                  Catch::translateActiveException());
+
+        throw;
+    }
+
     // used by events propagation test
     virtual int FilterEvent(wxEvent& event);
     virtual bool ProcessEvent(wxEvent& event);

From f6dddd92282c9db684c0cf75fd0714624ec73f4e Mon Sep 17 00:00:00 2001
From: Martin Koegler <martin.koegler@chello.at>
Date: Sat, 30 Dec 2017 09:51:25 +0000
Subject: [PATCH 139/916] Use unordered_xxx classes detected by configure

When using configure, use the same family of hash sets/maps when
building wxWidgets and the applications using it as doing otherwise
results in ABI incompatibility.
---
 include/wx/defs.h | 65 ++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 2c5cdeeeb6..5531948cef 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -378,40 +378,47 @@ typedef short int WXTYPE;
 #endif
 
 /*
-    Check for C++11 compilers, it is important to do it before the
-    __has_include() checks because at least g++ 4.9.2+ __has_include() returns
-    true for C++11 headers which can't be compiled in non-C++11 mode.
- */
-#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10)
-    #ifndef HAVE_TYPE_TRAITS
-        #define HAVE_TYPE_TRAITS
-    #endif
-    #ifndef HAVE_STD_UNORDERED_MAP
-        #define HAVE_STD_UNORDERED_MAP
-    #endif
-    #ifndef HAVE_STD_UNORDERED_SET
-        #define HAVE_STD_UNORDERED_SET
-    #endif
-#elif defined(__has_include)
+    If using configure, stick to the options detected by it even if different
+    compiler options could result in detecting something different here, as it
+    would cause ABI issues otherwise (see #18034).
+*/
+#ifndef __WX_SETUP_H__
     /*
-        We're in non-C++11 mode here, so only test for pre-C++11 headers. As
-        mentioned above, using __has_include() to test for C++11 would wrongly
-        detect them even though they can't be used in this case, don't do it.
+        Check for C++11 compilers, it is important to do it before the
+        __has_include() checks because at least g++ 4.9.2+ __has_include() returns
+        true for C++11 headers which can't be compiled in non-C++11 mode.
      */
-    #if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include(<tr1/type_traits>)
-        #define HAVE_TR1_TYPE_TRAITS
-    #endif
+    #if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10)
+        #ifndef HAVE_TYPE_TRAITS
+            #define HAVE_TYPE_TRAITS
+        #endif
+        #ifndef HAVE_STD_UNORDERED_MAP
+            #define HAVE_STD_UNORDERED_MAP
+        #endif
+        #ifndef HAVE_STD_UNORDERED_SET
+            #define HAVE_STD_UNORDERED_SET
+        #endif
+    #elif defined(__has_include)
+        /*
+            We're in non-C++11 mode here, so only test for pre-C++11 headers. As
+            mentioned above, using __has_include() to test for C++11 would wrongly
+            detect them even though they can't be used in this case, don't do it.
+         */
+        #if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include(<tr1/type_traits>)
+            #define HAVE_TR1_TYPE_TRAITS
+        #endif
 
-    #if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include(<tr1/unordered_map>)
-        #define HAVE_TR1_UNORDERED_MAP
-    #endif
+        #if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include(<tr1/unordered_map>)
+            #define HAVE_TR1_UNORDERED_MAP
+        #endif
 
-    #if !defined(HAVE_TR1_UNORDERED_SET) && __has_include(<tr1/unordered_set>)
-        #define HAVE_TR1_UNORDERED_SET
-    #endif
-#endif /* defined(__has_include) */
+        #if !defined(HAVE_TR1_UNORDERED_SET) && __has_include(<tr1/unordered_set>)
+            #define HAVE_TR1_UNORDERED_SET
+        #endif
+    #endif /* defined(__has_include) */
 
-#endif /* __cplusplus */
+    #endif /* __cplusplus */
+#endif /* __WX_SETUP_H__ */
 
 /* provide replacement for C99 va_copy() if the compiler doesn't have it */
 

From 00b3b323de0843d83b7a87c8fe7c7375488438e2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Dec 2017 22:45:24 +0100
Subject: [PATCH 140/916] Define std-related symbols in configure when using
 C++11 too

Even though we don't need to perform the checks for the availability of
<unordered_map> or <type_traits> headers when using C++11 because we can
safely assume they're indeed available, we still need to define the
corresponding symbols, as if the checks were performed, so that the code
inside and outside the library could test them in any case, whether
we're using C++11 or not.
---
 configure    | 14 +++++++++++++-
 configure.in | 13 +++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 4b10f91843..552ae5d62e 100755
--- a/configure
+++ b/configure
@@ -19111,8 +19111,20 @@ if test "x$COMPAQCXX" = "xyes"; then
                                 CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
 fi
 
-if test "$HAVE_CXX11" != "1" ; then
+if test "$HAVE_CXX11" = "1" ; then
 
+$as_echo "#define HAVE_STD_WSTRING 1" >>confdefs.h
+
+$as_echo "#define HAVE_STD_STRING_COMPARE 1" >>confdefs.h
+
+$as_echo "#define HAVE_STD_UNORDERED_MAP 1" >>confdefs.h
+
+$as_echo "#define HAVE_STD_UNORDERED_SET 1" >>confdefs.h
+
+$as_echo "#define HAVE_TYPE_TRAITS 1" >>confdefs.h
+
+
+else
 
 
     ac_ext=cpp
diff --git a/configure.in b/configure.in
index 7b20dff46f..6da04e5510 100644
--- a/configure.in
+++ b/configure.in
@@ -1818,8 +1818,17 @@ if test "x$COMPAQCXX" = "xyes"; then
 fi
 
 dnl The checks below are for ancient compilers and are unnecessary when using
-dnl C++11.
-if test "$HAVE_CXX11" != "1" ; then
+dnl C++11, but we still need to define the symbols that would have been defined
+dnl by them if we did run them.
+if test "$HAVE_CXX11" = "1" ; then
+
+AC_DEFINE(HAVE_STD_WSTRING)
+AC_DEFINE(HAVE_STD_STRING_COMPARE)
+AC_DEFINE(HAVE_STD_UNORDERED_MAP)
+AC_DEFINE(HAVE_STD_UNORDERED_SET)
+AC_DEFINE(HAVE_TYPE_TRAITS)
+
+else dnl Not using C++11, so we do need to run the checks.
 
 dnl check for iostream (as opposed to iostream.h) standard header
 WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))

From 27c399adbe5dba23d6851ed5e54a7803a8d45d23 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 14 Jan 2018 18:27:10 +0100
Subject: [PATCH 141/916] Remove wxALWAYS_SHOW_SB-related code from wxScrolled

There is no need to handle this style specially here, it's supposed to
be handled at wxWindow level and is, indeed, at least in all the major
ports.

So revert 2119b213e378d69b8d13f4c8f6012b3aa381efe9 (see #13616) and the
workaround for it applied later for macOS (see #14856). And this also
removes the need for handling wx[HV]SCROLL in wxScrolled (see #17846).

Closes #14856, #17846.
---
 include/wx/scrolwin.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index e904ed3922..029b0cb4b9 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -415,17 +415,7 @@ public:
         if ( !(style & (wxHSCROLL | wxVSCROLL)) )
             style |= wxHSCROLL | wxVSCROLL;
 
-#ifdef __WXOSX__
-        bool retval = T::Create(parent, winid, pos, size, style, name);
-        if ( retval && (style & wxALWAYS_SHOW_SB) )
-            ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS);
-        return retval;
-#else
-        if ( style & wxALWAYS_SHOW_SB )
-            ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS);
-
         return T::Create(parent, winid, pos, size, style, name);
-#endif
     }
 
 #ifdef __WXMSW__

From 673ea072843a00b001a67944ced04ff9a7a2da54 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 14 Jan 2018 18:31:29 +0100
Subject: [PATCH 142/916] Document that window must be created in
 ShowScrollbars()

Calling it before creating the window actually works under MSW, but not
under the other platforms.
---
 interface/wx/scrolwin.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/interface/wx/scrolwin.h b/interface/wx/scrolwin.h
index e1ecdc44a4..7b44ae250c 100644
--- a/interface/wx/scrolwin.h
+++ b/interface/wx/scrolwin.h
@@ -332,6 +332,8 @@ public:
             - wxSHOW_SB_DEFAULT: To restore the default behaviour described
                 above.
 
+        Note that the window must be created before calling this method.
+
         @param horz
             The desired visibility for the horizontal scrollbar.
         @param vert

From 5920c7edb15844a11748eccbe886cb66381fb995 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 14 Jan 2018 18:34:51 +0100
Subject: [PATCH 143/916] Mention wxMessageQueue<> in the thread overview

This class should be used in almost all programs using detached threads.
---
 docs/doxygen/overviews/thread.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/doxygen/overviews/thread.h b/docs/doxygen/overviews/thread.h
index bfa01c31d4..fcbb8895dc 100644
--- a/docs/doxygen/overviews/thread.h
+++ b/docs/doxygen/overviews/thread.h
@@ -72,6 +72,10 @@ from wxThread and wxEvtHandler to send messages to it: in fact, this does not
 work at all. You're instead encouraged to use wxThreadHelper as it greatly
 simplifies the communication and the sharing of resources.
 
+For communication between the main thread and worker threads, you can use
+wxMessageQueue<> class that allows to send any kind of custom messages. It is
+often convenient to have a special message asking the thread to terminate.
+
 You should also look at the wxThread docs for important notes about secondary
 threads and their deletion.
 

From 3380a2438d724f6525e0bb947e780735bf8824af Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 2 Dec 2017 22:33:53 +0100
Subject: [PATCH 144/916] Fix scale factor confusion in wxMac wxBitmap
 implementation

Merge ctors from (width, height) and (width, height, scale) into a
single one because the former really should be just a special case of
the latter for scale == 1 but, surprisingly and confusingly it wasn't,
because the latter also multiplied the size by scale, meaning that width
and height parameters had different meanings.

This resulted in at least 3 bugs when using scale factors different from
1: first, copying bitmaps wasn't done correctly because as
wxBitmapRefData copy ctor incorrectly scaled its size by scale again.
And second, creating bitmap from wxImage whose size wasn't divisible by
scale not just didn't work correctly but crashed when accessing memory
outside of the image because (unnecessarily) dividing and multiplying
the image size by scale wasn't idempotent. Finally, even for the images
of even size (assuming scale factor of 2), bitmaps created from them
used incorrect width and height, corresponding to the half of the image
dimensions, instead of the same ones, as they're supposed to be (the
scaled dimensions are supposed to be returned by GetScale{Width,Height}
methods).

Closes #17505.
---
 src/osx/core/bitmap.cpp | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index 16bec10892..52d161b17b 100644
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -49,8 +49,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
     friend class WXDLLIMPEXP_FWD_CORE wxIcon;
     friend class WXDLLIMPEXP_FWD_CORE wxCursor;
 public:
-    wxBitmapRefData(int width , int height , int depth, double logicalscale);
-    wxBitmapRefData(int width , int height , int depth);
+    wxBitmapRefData(int width , int height , int depth, double logicalscale = 1.0);
     wxBitmapRefData(CGContextRef context);
     wxBitmapRefData(CGImageRef image, double scale);
     wxBitmapRefData();
@@ -106,8 +105,7 @@ public:
 
     int           GetBytesPerRow() const { return m_bytesPerRow; }
     private :
-    bool Create(int width , int height , int depth);
-    bool Create(int width , int height , int depth, double logicalScale);
+    bool Create(int width , int height , int depth, double logicalscale);
     bool Create( CGImageRef image, double scale );
     bool Create( CGContextRef bitmapcontext);
     void Init();
@@ -269,13 +267,7 @@ wxBitmapRefData::wxBitmapRefData()
     Init() ;
 }
 
-wxBitmapRefData::wxBitmapRefData( int w , int h , int d )
-{
-    Init() ;
-    Create( w , h , d ) ;
-}
-
-wxBitmapRefData::wxBitmapRefData(int w , int h , int d, double logicalscale)
+wxBitmapRefData::wxBitmapRefData( int w , int h , int d , double logicalscale)
 {
     Init() ;
     Create( w , h , d, logicalscale ) ;
@@ -370,11 +362,12 @@ bool wxBitmapRefData::Create(CGContextRef context)
     return m_ok ;
 }
 
-bool wxBitmapRefData::Create( int w , int h , int d )
+bool wxBitmapRefData::Create( int w , int h , int d, double logicalscale )
 {
     m_width = wxMax(1, w);
     m_height = wxMax(1, h);
     m_depth = d ;
+    m_scaleFactor = logicalscale;
     m_hBitmap = NULL ;
 
     m_bytesPerRow = GetBestBytesPerRow( m_width * 4 ) ;
@@ -395,12 +388,6 @@ bool wxBitmapRefData::Create( int w , int h , int d )
     return m_ok ;
 }
 
-bool wxBitmapRefData::Create( int w , int h , int d, double logicalScale )
-{
-    m_scaleFactor = logicalScale;
-    return Create(w*logicalScale,h*logicalScale,d);
-}
-
 void wxBitmapRefData::UseAlpha( bool use )
 {
     if ( m_hasAlpha == use )
@@ -1125,7 +1112,7 @@ bool wxBitmap::CreateScaled(int w, int h, int d, double logicalScale)
     if ( d < 0 )
         d = wxDisplayDepth() ;
     
-    m_refData = new wxBitmapRefData( w , h , d, logicalScale );
+    m_refData = new wxBitmapRefData( w*logicalScale , h*logicalScale , d, logicalScale );
     
     return M_BITMAPDATA->IsOk() ;
 }
@@ -1220,7 +1207,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth, double scale)
     
     wxBitmapRefData* bitmapRefData;
 
-    m_refData = bitmapRefData = new wxBitmapRefData( width/scale, height/scale, depth, scale) ;
+    m_refData = bitmapRefData = new wxBitmapRefData( width, height, depth, scale) ;
 
     if ( bitmapRefData->IsOk())
     {

From ad8d73cb15e39c4787a0ea71cb1759dc9921909f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 2 Dec 2017 23:11:10 +0100
Subject: [PATCH 145/916] Work around missing expanders in wxTreeListCtrl under
 Mac

Re-indent the column containing the expanders explicitly if the control
has just switched from "list" to "tree" mode.

Closes #17409.
---
 src/generic/treelist.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/generic/treelist.cpp b/src/generic/treelist.cpp
index 1880bee6a3..6dd3f275cb 100644
--- a/src/generic/treelist.cpp
+++ b/src/generic/treelist.cpp
@@ -482,6 +482,13 @@ wxTreeListModel::InsertItem(Node* parent,
     {
         // Not flat any more, this is a second level child.
         m_isFlat = false;
+
+        // This is a hack needed to work around wxOSX wxDataViewCtrl
+        // implementation which removes the indent if it thinks that the model
+        // is flat. We need to re-add the indent back if it turns out that it
+        // isn't flat, in fact.
+        wxDataViewCtrl* const dvc = m_treelist->GetDataView();
+        dvc->SetIndent(dvc->GetIndent());
     }
 
     wxScopedPtr<Node>

From 0eb456f08e7f6322232bfeb33c392a0c91913ea1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 2 Dec 2017 23:07:46 +0100
Subject: [PATCH 146/916] Revert "Fix wxTreeListCtrl under wxOSX"

This reverts commit 28f96bdff022da758beb802b34b5bcda77d8031d as it isn't
necessary any more after the fix in the previous commit.

See #17409.
---
 include/wx/osx/cocoa/dataview.h |  2 --
 src/osx/cocoa/dataview.mm       | 30 ++++++++----------------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h
index 6587f97bd9..ffe1ac2e5d 100644
--- a/include/wx/osx/cocoa/dataview.h
+++ b/include/wx/osx/cocoa/dataview.h
@@ -551,8 +551,6 @@ private:
     wxCocoaOutlineDataSource* m_DataSource;
 
     wxCocoaOutlineView* m_OutlineView;
-
-    bool m_removeIndentIfNecessary;
 };
 
 #endif // _WX_DATAVIEWCTRL_COCOOA_H_
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 9b0207eb92..c48c9c976e 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -2033,8 +2033,7 @@ wxCocoaDataViewControl::wxCocoaDataViewControl(wxWindow* peer,
         [[NSScrollView alloc] initWithFrame:wxOSXGetFrameForControl(peer,pos,size)]
       ),
       m_DataSource(NULL),
-      m_OutlineView([[wxCocoaOutlineView alloc] init]),
-      m_removeIndentIfNecessary(false)
+      m_OutlineView([[wxCocoaOutlineView alloc] init])
 {
     // initialize scrollview (the outline view is part of a scrollview):
     NSScrollView* scrollview = (NSScrollView*) GetWXWidget();
@@ -2408,11 +2407,13 @@ bool wxCocoaDataViewControl::AssociateModel(wxDataViewModel* model)
         m_DataSource = NULL;
     [m_OutlineView setDataSource:m_DataSource]; // if there is a data source the data is immediately going to be requested
 
-    // Set this to true to check if we need to remove the indent in the next
-    // OnSize() call: we can't do it directly here because the model might not
-    // be fully initialized yet and so might not know whether it has any items
-    // with children or not.
-    m_removeIndentIfNecessary = true;
+    // By default, the first column is indented to leave enough place for the
+    // expanders, but this looks bad if there are no expanders, so don't use
+    // indent in this case.
+    if ( model && model->IsListModel() )
+    {
+        DoSetIndent(0);
+    }
 
     return true;
 }
@@ -2577,21 +2578,6 @@ void wxCocoaDataViewControl::SetRowHeight(const wxDataViewItem& WXUNUSED(item),
 
 void wxCocoaDataViewControl::OnSize()
 {
-    if ( m_removeIndentIfNecessary )
-    {
-        m_removeIndentIfNecessary = false;
-
-        const wxDataViewModel* const model = GetDataViewCtrl()->GetModel();
-
-        // By default, the first column is indented to leave enough place for the
-        // expanders, but this looks bad if there are no expanders, so don't use
-        // indent in this case.
-        if ( model && model->IsListModel() )
-        {
-            DoSetIndent(0);
-        }
-    }
-
     if ([m_OutlineView numberOfColumns] == 1)
         [m_OutlineView sizeLastColumnToFit];
 }

From d3f20c3837533c6a54c82694a4ed6e5cbb020c4f Mon Sep 17 00:00:00 2001
From: sbrowne <sbrowne@unknown>
Date: Sun, 3 Dec 2017 00:15:03 +0100
Subject: [PATCH 147/916] Fix hang when reparenting a frozen window in wxOSX

The wrong order of changing parent and freezing/thawing could result in
hanging the application when reparenting frozen windows, e.g. when
switching order of pages in a notebook.

Closes #16722.
---
 src/osx/cocoa/window.mm | 56 ++++++++++++++++++++++++++++++++++++++---
 src/osx/window_osx.cpp  | 12 +++++++--
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index b218573f9e..1106b2b888 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -769,6 +769,30 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
     }
 }
 
+static void SetDrawingEnabledIfFrozenRecursive(wxWidgetCocoaImpl *impl, bool enable)
+{
+    if (!impl->GetWXPeer())
+        return;
+
+    if (impl->GetWXPeer()->IsFrozen())
+        impl->SetDrawingEnabled(enable);
+
+    for ( wxWindowList::iterator i = impl->GetWXPeer()->GetChildren().begin();
+          i != impl->GetWXPeer()->GetChildren().end();
+          ++i )
+    {
+        wxWindow *child = *i;
+        if ( child->IsTopLevel() || !child->IsFrozen() )
+            continue;
+
+        // Skip any user panes as they'll handle this themselves
+        if ( !child->GetPeer() || child->GetPeer()->IsUserPane() )
+            continue;
+
+        SetDrawingEnabledIfFrozenRecursive((wxWidgetCocoaImpl *)child->GetPeer(), enable);
+    }
+}
+
 @implementation wxNSView
 
 + (void)initialize
@@ -887,6 +911,24 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
     return [super hitTest:aPoint];
 }
 
+- (void) viewWillMoveToWindow:(NSWindow *)newWindow
+{
+    wxWidgetCocoaImpl* viewimpl = (wxWidgetCocoaImpl*) wxWidgetImpl::FindFromWXWidget( self );
+    if (viewimpl)
+        SetDrawingEnabledIfFrozenRecursive(viewimpl, true);
+
+    [super viewWillMoveToWindow:newWindow];
+}
+
+- (void) viewDidMoveToWindow
+{
+    wxWidgetCocoaImpl* viewimpl = (wxWidgetCocoaImpl*) wxWidgetImpl::FindFromWXWidget( self );
+    if (viewimpl)
+        SetDrawingEnabledIfFrozenRecursive(viewimpl, false);
+
+    [super viewDidMoveToWindow];
+}
+
 @end // wxNSView
 
 // We need to adopt NSTextInputClient protocol in order to interpretKeyEvents: to work.
@@ -2486,7 +2528,7 @@ void wxWidgetCocoaImpl::Init()
 wxWidgetCocoaImpl::~wxWidgetCocoaImpl()
 {
     if ( GetWXPeer() && GetWXPeer()->IsFrozen() )
-        [[m_osxView window] enableFlushWindow];
+        SetDrawingEnabled(true);
     
     RemoveAssociations( this );
 
@@ -3034,6 +3076,10 @@ void wxWidgetCocoaImpl::SetDropTarget(wxDropTarget* target)
 
 void wxWidgetCocoaImpl::RemoveFromParent()
 {
+    // User panes will be thawed in the removeFromSuperview call below
+    if (!IsUserPane() && m_wxPeer->IsFrozen())
+        SetDrawingEnabled(true);
+
     [m_osxView removeFromSuperview];
 }
 
@@ -3043,8 +3089,9 @@ void wxWidgetCocoaImpl::Embed( wxWidgetImpl *parent )
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
     [container addSubview:m_osxView];
     
-    if( m_wxPeer->IsFrozen() )
-        [[m_osxView window] disableFlushWindow];
+    // User panes will be frozen elsewhere
+    if( m_wxPeer->IsFrozen() && !IsUserPane() )
+        SetDrawingEnabled(false);
 }
 
 void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col )
@@ -3693,6 +3740,9 @@ void wxWidgetCocoaImpl::SetFlipped(bool flipped)
 
 void wxWidgetCocoaImpl::SetDrawingEnabled(bool enabled)
 {
+    if ( [m_osxView window] == nil )
+        return;
+
     if ( enabled )
     {
         [[m_osxView window] enableFlushWindow];
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index c725ef8d57..5928260429 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -1638,6 +1638,15 @@ void wxWindowMac::RemoveChild( wxWindowBase *child )
     if ( child == m_growBox )
         m_growBox = NULL ;
 #endif
+    if (!child->IsBeingDeleted() && !child->IsTopLevel())
+    {
+        // Must be removed prior to RemoveChild and next AddChild call
+        // Otherwise the next AddChild may freeze the wrong window
+        wxWindowMac *mac = (wxWindowMac *)child;
+        if (mac->GetPeer() && mac->GetPeer()->IsOk())
+            mac->GetPeer()->RemoveFromParent();
+    }
+
     wxWindowBase::RemoveChild( child ) ;
 }
 
@@ -2458,10 +2467,9 @@ bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
     if ( !wxWindowBase::Reparent(newParent) )
         return false;
 
-    GetPeer()->RemoveFromParent();
     GetPeer()->Embed( GetParent()->GetPeer() );
 
-    MacChildAdded();
+    GetParent()->MacChildAdded();
     return true;
 }
 

From c677e4e6526378ff3cd4a55abe628b8e9a190031 Mon Sep 17 00:00:00 2001
From: Paul Kulchenko <paul@kulchenko.com>
Date: Thu, 9 Nov 2017 16:25:17 -0800
Subject: [PATCH 148/916] Fix crash on calltip click on macOS

Commit b0d0494f fixed it for autocomplete popup, but a similar issue is
still present for calltips. This commit fixes it.

Closes https://github.com/wxWidgets/wxWidgets/pull/595
---
 src/stc/ScintillaWX.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index a18796220a..deaacadbfe 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -490,9 +490,10 @@ void ScintillaWX::NotifyParent(SCNotification scn) {
 // a side effect that the AutoComp will also not be destroyed when switching
 // to another window, but I think that is okay.
 void ScintillaWX::CancelModes() {
-    if (! focusEvent)
+    if (! focusEvent) {
         AutoCompleteCancel();
-    ct.CallTipCancel();
+        ct.CallTipCancel();
+    }
     Editor::CancelModes();
 }
 

From acdd0ef09ec4bf8518a5b0fe6640cddc5d7b662a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 15 Jan 2018 13:09:48 +0100
Subject: [PATCH 149/916] Check for HAVE_TYPE_TRAITS in CMake build not only
 for MSVC

This check is needed for all compilers, although it can be skipped for
MSVC versions too old to have either type_traits or tr1/type_traits.
---
 build/cmake/setup.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index 9e0e4d24d4..1bc1a10fd8 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -580,7 +580,7 @@ endif()
 check_cxx_symbol_exists(round math.h HAVE_ROUND)
 
 # Check includes
-if(NOT MSVC_VERSION LESS 1600)
+if(NOT MSVC_VERSION OR NOT MSVC_VERSION LESS 1600)
     check_include_file_cxx(tr1/type_traits HAVE_TR1_TYPE_TRAITS)
     check_include_file_cxx(type_traits HAVE_TYPE_TRAITS)
 endif()

From 52e71680ea58dc391a7bb9b94b3c35303f9a6a81 Mon Sep 17 00:00:00 2001
From: John Roberts <johnr@iinet.net.au>
Date: Mon, 15 Jan 2018 13:24:18 +0100
Subject: [PATCH 150/916] Fix grid sample OnGridRender()

Destroy current "frameRender" when creating a new render.

Make bitmap and frame size equal.

Closes https://github.com/wxWidgets/wxWidgets/pull/673
---
 samples/grid/griddemo.cpp | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index 56b831f51d..974959aea7 100644
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -2232,7 +2232,7 @@ void GridFrame::OnGridRender( wxCommandEvent& event )
     int styleRender = 0, i;
     bool useLometric = false, defSize = false;
     double zoom = 1;
-    wxSize sizeMargin( 0, 0 );
+    wxSize sizeOffset( 0, 0 );
     wxPoint pointOrigin( 0, 0 );
 
     wxMenu* menu = GetMenuBar()->GetMenu( 0 );
@@ -2255,7 +2255,7 @@ void GridFrame::OnGridRender( wxCommandEvent& event )
     {
         pointOrigin.x += 50;
         pointOrigin.y += 50;
-        sizeMargin.IncBy( 50 );
+        sizeOffset.IncBy( 50 );
     }
     if ( menu->FindItem( ID_RENDER_ZOOM )->IsChecked() )
         zoom = 1.25;
@@ -2310,26 +2310,19 @@ void GridFrame::OnGridRender( wxCommandEvent& event )
     sizeRender.y *= zoom;
 
     // delete any existing render frame and create new one
-    wxWindow* win = FindWindow( "frameRender" );
+    wxWindow* win = FindWindowByName( "frameRender" );
     if ( win )
         win->Destroy();
 
+    // create a frame large enough for the rendered bitmap
     wxFrame* frame = new wxFrame( this, wxID_ANY, "Grid Render" );
-    frame->SetClientSize( 780, 400 );
+    frame->SetClientSize( sizeRender + sizeOffset * 2 );
     frame->SetName( "frameRender" );
 
     wxPanel* canvas = new wxPanel( frame, wxID_ANY );
 
-    // make bitmap large enough for margins if any
-    if ( !defSize )
-        sizeRender.IncBy( sizeMargin * 2 );
-    else
-        sizeRender.IncBy( sizeMargin );
-
-    wxBitmap bmp( sizeRender );
-    // don't leave it larger or drawing will be scaled
-    sizeRender.DecBy( sizeMargin * 2 );
-
+    // make a bitmap large enough for any top/left offset
+    wxBitmap bmp( sizeRender + sizeOffset );
     wxMemoryDC memDc(bmp);
 
     // default row labels have no background colour so set background

From 4f456c8a193022cc88abcd365419fff080419398 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 16 Jan 2018 13:04:54 +0100
Subject: [PATCH 151/916] Refactor "changed" notifiers in generic
 wxDataViewCtrl code

No real changes, just add the new DoItemChanged() used from both
ItemChanged() and ValueChanged() notifications to avoid repeating the
same code in both functions.
---
 src/generic/datavgen.cpp | 66 ++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 37 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 8a584ce69a..9f27cdcfc5 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -704,7 +704,10 @@ public:
     // notifications from wxDataViewModel
     bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
-    bool ItemChanged( const wxDataViewItem &item );
+    bool ItemChanged( const wxDataViewItem &item )
+    {
+        return DoItemChanged(item, wxNOT_FOUND);
+    }
     bool ValueChanged( const wxDataViewItem &item, unsigned int model_column );
     bool Cleared();
     void Resort()
@@ -891,6 +894,10 @@ private:
 
     void DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect );
 
+    // Common part of {Item,Value}Changed(): if view_column is wxNOT_FOUND,
+    // assumes that all columns were modified, otherwise just this one.
+    bool DoItemChanged(const wxDataViewItem& item, int view_column);
+
 private:
     wxDataViewCtrl             *m_owner;
     int                         m_lineHeight;
@@ -2926,17 +2933,34 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
     return true;
 }
 
-bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
+bool wxDataViewMainWindow::DoItemChanged(const wxDataViewItem & item, int view_column)
 {
     // Move this node to its new correct place after it was updated.
+    //
+    // In principle, we could skip the call to PutInSortOrder() if the modified
+    // column is not the sort column, but in real-world applications it's fully
+    // possible and likely that custom compare uses not only the selected model
+    // column but also falls back to other values for comparison. To ensure
+    // consistency it is better to treat a value change as if it was an item
+    // change.
     wxDataViewTreeNode* const node = FindNode(item);
     wxCHECK_MSG( node, false, "invalid item" );
     node->PutInSortOrder(this);
 
-    GetOwner()->InvalidateColBestWidths();
+    wxDataViewColumn* column;
+    if ( view_column == wxNOT_FOUND )
+    {
+        column = NULL;
+        GetOwner()->InvalidateColBestWidths();
+    }
+    else
+    {
+        column = m_owner->GetColumn(view_column);
+        GetOwner()->InvalidateColBestWidth(view_column);
+    }
 
     // Send event
-    wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner, item);
+    wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner, column, item);
     m_owner->ProcessWindowEvent(le);
 
     return true;
@@ -2948,39 +2972,7 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i
     if ( view_column == wxNOT_FOUND )
         return false;
 
-    // NOTE: to be valid, we cannot use e.g. INT_MAX - 1
-/*#define MAX_VIRTUAL_WIDTH       100000
-
-    wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight );
-    m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-    Refresh( true, &rect );
-
-    return true;
-*/
-
-    // In principle, we could skip the call to PutInSortOrder() if the modified
-    // column is not the sort column, but in real-world applications it's fully
-    // possible and likely that custom compare uses not only the selected model
-    // column but also falls back to other values for comparison. To ensure
-    // consistency it is better to treat a value change as if it was an item
-    // change.
-    //
-    // Alternatively, one could require the user to use ItemChanged() rather
-    // than ValueChanged() when the changed value may affect sorting, and add a
-    // check for model_column vs sort column here.
-
-    wxDataViewTreeNode* const node = FindNode(item);
-    wxCHECK_MSG( node, false, "invalid item" );
-    node->PutInSortOrder(this);
-
-    GetOwner()->InvalidateColBestWidth(view_column);
-
-    // Send event
-    wxDataViewColumn* const column = m_owner->GetColumn(view_column);
-    wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner, column, item);
-    m_owner->ProcessWindowEvent(le);
-
-    return true;
+    return DoItemChanged(item, view_column);
 }
 
 bool wxDataViewMainWindow::Cleared()

From 77c7c80696a4566e10719e6b154b5d07717a3323 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 16 Jan 2018 13:08:52 +0100
Subject: [PATCH 152/916] Update modified items in generic wxDataViewCtrl
 immediately

Recent optimizations avoiding resort on item change (see
https://github.com/wxWidgets/wxWidgets/pull/642) have also optimized
away refreshing the modified item, which was done implicitly, as a side
effect of resorting, before, so the changes were not reflected on
display immediately any longer.

Fix this by simply refreshing the item explicitly and also add a way to
test for the correct behaviour in the sample.
---
 samples/dataview/dataview.cpp | 18 ++++++++++++++++++
 src/generic/datavgen.cpp      |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index b6fa7328b4..a53b1c7be3 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -102,6 +102,7 @@ private:
     void OnExpand(wxCommandEvent& event);
     void OnShowCurrent(wxCommandEvent& event);
     void OnSetNinthCurrent(wxCommandEvent& event);
+    void OnChangeNinthTitle(wxCommandEvent& event);
 
     void OnPrependList(wxCommandEvent& event);
     void OnDeleteList(wxCommandEvent& event);
@@ -342,6 +343,7 @@ enum
     ID_EXPAND           = 105,
     ID_SHOW_CURRENT,
     ID_SET_NINTH_CURRENT,
+    ID_CHANGE_NINTH_TITLE,
 
     ID_PREPEND_LIST     = 200,
     ID_DELETE_LIST      = 201,
@@ -384,6 +386,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_BUTTON( ID_EXPAND, MyFrame::OnExpand )
     EVT_BUTTON( ID_SHOW_CURRENT, MyFrame::OnShowCurrent )
     EVT_BUTTON( ID_SET_NINTH_CURRENT, MyFrame::OnSetNinthCurrent )
+    EVT_BUTTON( ID_CHANGE_NINTH_TITLE, MyFrame::OnChangeNinthTitle )
 
     EVT_BUTTON( ID_PREPEND_LIST, MyFrame::OnPrependList )
     EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList )
@@ -512,6 +515,8 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
                                    "&Show current"), border);
     sizerCurrent->Add(new wxButton(firstPanel, ID_SET_NINTH_CURRENT,
                                    "Make &ninth symphony current"), border);
+    sizerCurrent->Add(new wxButton(firstPanel, ID_CHANGE_NINTH_TITLE,
+                                   "Change ninth &title"), border);
 
     wxSizer *firstPanelSz = new wxBoxSizer( wxVERTICAL );
     m_ctrl[0]->SetMinSize(wxSize(-1, 200));
@@ -1137,6 +1142,19 @@ void MyFrame::OnSetNinthCurrent(wxCommandEvent& WXUNUSED(event))
     m_ctrl[0]->SetCurrentItem(item);
 }
 
+void MyFrame::OnChangeNinthTitle(wxCommandEvent& WXUNUSED(event))
+{
+    wxDataViewItem item(m_music_model->GetNinthItem());
+    if ( !item.IsOk() )
+    {
+        wxLogError( "Cannot change the ninth symphony title: it was removed!" );
+        return;
+    }
+
+    m_music_model->SetValue("Symphony No. 9", item, 0);
+    m_music_model->ItemChanged(item);
+}
+
 void MyFrame::OnValueChanged( wxDataViewEvent &event )
 {
     wxString title = m_music_model->GetTitle( event.GetItem() );
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 9f27cdcfc5..75d37d1357 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2959,6 +2959,9 @@ bool wxDataViewMainWindow::DoItemChanged(const wxDataViewItem & item, int view_c
         GetOwner()->InvalidateColBestWidth(view_column);
     }
 
+    // Update the displayed value(s).
+    RefreshRow(GetRowByItem(item));
+
     // Send event
     wxDataViewEvent le(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, m_owner, column, item);
     m_owner->ProcessWindowEvent(le);

From 66519997198d05848f07b15c4f1bd33c8fc25d12 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 16 Jan 2018 16:22:51 +0100
Subject: [PATCH 153/916] Fold best size and ellipsis handling in
 AutoResizeIfNecessary()

Refactor wxStaticText code to use AutoResizeIfNecessary() for all the
updates done after the label extent changes (whether it's due to the
change of the label itself or the font used for rendering it).

There should be no changes in behaviour after this commit except for a
small bug fix in wxGenericStaticText when setting label with markup:
this didn't invalidate the best size before, but does now.
---
 src/common/stattextcmn.cpp | 21 ++++++++++++++-------
 src/generic/stattextg.cpp  |  5 +----
 src/gtk/stattext.cpp       | 14 +++-----------
 src/msw/stattext.cpp       |  7 +------
 src/osx/stattext_osx.cpp   | 14 ++------------
 5 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index 203e1f7a51..aaa61e87ec 100644
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -205,13 +205,20 @@ void wxStaticTextBase::Wrap(int width)
 
 void wxStaticTextBase::AutoResizeIfNecessary()
 {
-    // adjust the size of the window to fit to the label unless autoresizing is
-    // disabled
-    if ( !HasFlag(wxST_NO_AUTORESIZE) )
-    {
-        DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
-                  wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
-    }
+    // This method is only called if either the label or the font changed, i.e.
+    // if the label extent changed, so the best size is not the same neither
+    // any more.
+    InvalidateBestSize();
+
+    if ( IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!
+        return;
+
+    // This flag is specifically used to prevent the control from resizing even
+    // when its label changes.
+    if ( HasFlag(wxST_NO_AUTORESIZE) )
+        return;
+
+    SetSize(GetBestSize());
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/generic/stattextg.cpp b/src/generic/stattextg.cpp
index a8b4b5c150..fa1db47c4a 100644
--- a/src/generic/stattextg.cpp
+++ b/src/generic/stattextg.cpp
@@ -102,10 +102,7 @@ void wxGenericStaticText::SetLabel(const wxString& label)
     wxControl::SetLabel(label);
     DoSetLabel(GetEllipsizedLabel());
 
-    InvalidateBestSize();
-
-    if ( !IsEllipsized() )
-        AutoResizeIfNecessary();
+    AutoResizeIfNecessary();
 
 #if wxUSE_MARKUP
     if ( m_markupText )
diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 9c1031f9fb..bda1f6d135 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -138,14 +138,9 @@ void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );
 
-    InvalidateBestSize();
-
     (this->*setter)(GTK_LABEL(m_widget), label);
 
-    // adjust the label size to the new label unless disabled
-    if ( !HasFlag(wxST_NO_AUTORESIZE) &&
-         !IsEllipsized() )  // if ellipsization is ON, then we don't want to get resized!
-        SetSize( GetBestSize() );
+    AutoResizeIfNecessary();
 }
 
 void wxStaticText::SetLabel(const wxString& label)
@@ -222,11 +217,8 @@ bool wxStaticText::SetFont( const wxFont &font )
         gtk_label_set_use_underline(GTK_LABEL(m_widget), !isUnderlined);
     }
 
-    // adjust the label size to the new label unless disabled
-    if (!HasFlag(wxST_NO_AUTORESIZE))
-    {
-        SetSize( GetBestSize() );
-    }
+    AutoResizeIfNecessary();
+
     return ret;
 }
 
diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 97b28d06e8..f5a29f380e 100644
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -184,12 +184,7 @@ void wxStaticText::SetLabel(const wxString& label)
 #endif // SS_ENDELLIPSIS
         DoSetLabel(GetEllipsizedLabel());
 
-    InvalidateBestSize();
-
-    if ( !IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!
-    {
-        AutoResizeIfNecessary();
-    }
+    AutoResizeIfNecessary();
 }
 
 bool wxStaticText::SetFont(const wxFont& font)
diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index 4176add134..53e0e0ced9 100644
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -78,13 +78,7 @@ void wxStaticText::SetLabel(const wxString& label)
         DoSetLabel(GetEllipsizedLabel());
     }
 
-    InvalidateBestSize();
-
-    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) &&
-         !IsEllipsized() )  // don't resize if we adjust to current size
-    {
-        SetSize( GetBestSize() );
-    }
+    AutoResizeIfNecessary();
 
     Refresh();
 
@@ -98,11 +92,7 @@ bool wxStaticText::SetFont(const wxFont& font)
 
     if ( ret )
     {
-        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-        {
-            InvalidateBestSize();
-            SetSize( GetBestSize() );
-        }
+        AutoResizeIfNecessary();
     }
 
     return ret;

From 51bfc68423d735dfa24e7c1e6dd807110bfeafae Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 16 Jan 2018 16:26:35 +0100
Subject: [PATCH 154/916] Avoid unnecessary checks in wxStaticText::SetFont()
 in wxGTK

There is no need to do anything if the font didn't actually change.
---
 src/gtk/stattext.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index bda1f6d135..78e154c006 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -175,7 +175,8 @@ bool wxStaticText::SetFont( const wxFont &font )
     const bool wasUnderlined = GetFont().GetUnderlined();
     const bool wasStrickenThrough = GetFont().GetStrikethrough();
 
-    bool ret = wxControl::SetFont(font);
+    if ( !wxControl::SetFont(font) )
+        return false;
 
     const bool isUnderlined = GetFont().GetUnderlined();
     const bool isStrickenThrough = GetFont().GetStrikethrough();
@@ -219,7 +220,7 @@ bool wxStaticText::SetFont( const wxFont &font )
 
     AutoResizeIfNecessary();
 
-    return ret;
+    return true;
 }
 
 wxSize wxStaticText::DoGetBestSize() const

From c19e53e75e61134d8ef478a2316eef87e915f37c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 16 Jan 2018 16:27:17 +0100
Subject: [PATCH 155/916] Don't skip wxStaticText auto-resizing if it's
 ellipsized

There doesn't seem to be any good reason for this, as it's perfectly
possible to use ellipsize the text if it's too long to fit even when the
control is resized to its maximal extent, but still allow the control to
resize in the first place.

See https://groups.google.com/d/msg/wx-dev/58xFP4FIxXc/d5lj6901CQAJ
---
 src/common/stattextcmn.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index aaa61e87ec..a83d937246 100644
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -210,9 +210,6 @@ void wxStaticTextBase::AutoResizeIfNecessary()
     // any more.
     InvalidateBestSize();
 
-    if ( IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!
-        return;
-
     // This flag is specifically used to prevent the control from resizing even
     // when its label changes.
     if ( HasFlag(wxST_NO_AUTORESIZE) )

From 3294b9a63a30f385b7c061acda069dc4e5820599 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 16 Jan 2018 16:47:11 +0100
Subject: [PATCH 156/916] Don't invalidate best size for controls with
 wxST_NO_AUTORESIZE

This results in non-intuitive behaviour, as the controls with this style
still get resized after changing their label, so don't do it.

See https://groups.google.com/d/msg/wx-dev/58xFP4FIxXc/hm5WO0xNBwAJ
---
 src/common/stattextcmn.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index a83d937246..811aceb190 100644
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -205,16 +205,21 @@ void wxStaticTextBase::Wrap(int width)
 
 void wxStaticTextBase::AutoResizeIfNecessary()
 {
-    // This method is only called if either the label or the font changed, i.e.
-    // if the label extent changed, so the best size is not the same neither
-    // any more.
-    InvalidateBestSize();
-
     // This flag is specifically used to prevent the control from resizing even
     // when its label changes.
     if ( HasFlag(wxST_NO_AUTORESIZE) )
         return;
 
+    // This method is only called if either the label or the font changed, i.e.
+    // if the label extent changed, so the best size is not the same neither
+    // any more.
+    //
+    // Note that we don't invalidate it when wxST_NO_AUTORESIZE is on because
+    // this would result in the control being effectively resized during the
+    // next Layout() and this style is used expressly to prevent this from
+    // happening.
+    InvalidateBestSize();
+
     SetSize(GetBestSize());
 }
 

From 4dc78a33e0158e92fdc45c20896a0feed8704ab8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Jan 2018 00:12:52 +0100
Subject: [PATCH 157/916] Fix adding items to a never opened branch of generic
 wxDataViewCtrl

Calling ItemAdded() on a parent item that had never been opened yet
"lost" all its children that initially existed in the model, as the
corresponding subtree wasn't built any more in Expand() when this item
was finally opened because the list of item children wasn't empty any
more after ItemAdded() added the new child to it.

Fix this by simply not doing anything in ItemAdded() in this situation,
there is no need to update a closed tree branch immediately anyhow.
---
 src/generic/datavgen.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 8a584ce69a..e361ef6606 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2739,6 +2739,14 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
         if ( !parentNode )
             return false;
 
+        // If the parent node isn't and hadn't been opened yet, we don't have
+        // anything to do here, all the items will be added to it when it's
+        // opened for the first time.
+        if ( !parentNode->IsOpen() && parentNode->GetChildNodes().empty() )
+        {
+            return true;
+        }
+
         wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(parentNode, item);
         itemNode->SetHasChildren(GetModel()->IsContainer(item));
         parentNode->SetHasChildren(true);

From ff3b3269dd55fb9ae25e719ce620d703da28f53e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Jan 2018 10:10:38 +0100
Subject: [PATCH 158/916] Fix adding items to wxDataViewCtrl broken in the last
 commit

SetHasChildren(true) must be called before checking GetChildNodes() if
the parent hadn't had any items in the initial model.

Also remove the assert checking that the node is open in
BuildTreeHelper() as we may need to build even a closed tree branch.
---
 src/generic/datavgen.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index e361ef6606..dfc7c2c489 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2739,6 +2739,8 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
         if ( !parentNode )
             return false;
 
+        parentNode->SetHasChildren(true);
+
         // If the parent node isn't and hadn't been opened yet, we don't have
         // anything to do here, all the items will be added to it when it's
         // opened for the first time.
@@ -2749,7 +2751,6 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData
 
         wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(parentNode, item);
         itemNode->SetHasChildren(GetModel()->IsContainer(item));
-        parentNode->SetHasChildren(true);
 
         if ( GetSortOrder().IsNone() )
         {
@@ -3963,8 +3964,8 @@ static void BuildTreeHelper( wxDataViewMainWindow *window, const wxDataViewModel
         node->InsertChild(window, n, index);
     }
 
-    wxASSERT( node->IsOpen() );
-    node->ChangeSubTreeCount(+num);
+    if ( node->IsOpen() )
+        node->ChangeSubTreeCount(+num);
 }
 
 void wxDataViewMainWindow::BuildTree(wxDataViewModel * model)

From 91f54ea7e467e09184713cb64855ffcd0e2ae5e7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Jan 2018 10:12:41 +0100
Subject: [PATCH 159/916] Remove a useless assert from
 wxDataViewTreeNode::GetChildNodes()

Checking that a pointer is non-null before dereferencing it is perfectly
useless: the code will crash anyhow, so assert doesn't help with
debugging it in debug builds nor with preventing the crash in release.
---
 src/generic/datavgen.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index dfc7c2c489..372cb86cb8 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -496,7 +496,6 @@ public:
 
     const wxDataViewTreeNodes& GetChildNodes() const
     {
-        wxASSERT( m_branchData != NULL );
         return m_branchData->children;
     }
 

From 4ad61f3048db752d48d988d31c6b3a98dee0dad3 Mon Sep 17 00:00:00 2001
From: John Roberts <johnr@jjbone.com>
Date: Wed, 17 Jan 2018 12:04:52 +0800
Subject: [PATCH 160/916] Fix LAN detection in wxDialUpManager for macOS

Check for enX interface name for Darwin.

Closes https://github.com/wxWidgets/wxWidgets/pull/676
---
 src/unix/dialup.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 14122eb2c1..e9612b6152 100644
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -722,11 +722,12 @@ wxDialUpManagerImpl::CheckIfconfig()
                     hasModem = strstr(output.fn_str(),"ipdptp") != NULL;
                     hasLAN = strstr(output.fn_str(), "hme") != NULL;
 #elif defined(__LINUX__) || defined (__FREEBSD__) || defined (__QNX__) || \
-      defined(__OPENBSD__)
+      defined(__OPENBSD__) || defined(__DARWIN__)
                     hasModem = strstr(output.fn_str(),"ppp")    // ppp
                         || strstr(output.fn_str(),"sl")  // slip
                         || strstr(output.fn_str(),"pl"); // plip
-                    hasLAN = strstr(output.fn_str(), "eth") != NULL;
+                    hasLAN = strstr(output.fn_str(), "eth") != NULL
+                        || strstr(output.fn_str(),"en") != NULL; // en0, en1 osx
 #elif defined(__SGI__)  // IRIX
                     hasModem = strstr(output.fn_str(), "ppp") != NULL; // PPP
 #elif defined(__HPUX__)

From 321c9d5f3037cc80deb17304c82eda94e21e626a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Jan 2018 10:18:10 +0100
Subject: [PATCH 161/916] Add another email address for John Roberts

See https://github.com/wxWidgets/wxWidgets/pull/676
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 196e21b5e3..cbaae76c77 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@ Cătălin Răceanu							<maildus@gmail.com>
 Dimitri Schoolwerth	<dimitri.schoolwerth@gmail.com>		<dimitri@schoolwerth.com>
 Hubert Talbot							<hubert.talbot64@gmail.com>
 Ilya Bizyaev							<bizyaev.game@yandex.ru>
+John Roberts		<johnr@iinet.net.au>			<johnr@jjbone.com>
 Jouk Jansen							<joukj@hrem.nano.tudelft.nl>
 Julian Smart							<julian@anthemion.co.uk>
 Jevgenijs Protopopovs						<jprotopopov1122@gmail.com>

From 1dd102d741dc9858df2b7e933761ed7cc7a51093 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Jan 2018 10:24:55 +0100
Subject: [PATCH 162/916] Fix crash when deleting all wxTreeListCtrl items with
 wxGTK3

GTK+ 3 (but not the generic version nor even GTK+ 2, apparently) sends
"selection changed" event from gtk_tree_model_row_deleted() when
deleting the currently selected row, which resulted in sending of
wxEVT_TREELIST_SELECTION_CHANGED events with invalid wxTreeListItem,
containing a dangling pointer, and a crash in the treelist sample when
trying to dump it.

Avoid this by clearing the model (and hence generating these events)
first and deleting the items only afterwards.

Also add a trivial unit test for wxTreeListCtrl::DeleteAllItems(), which
doesn't even allow to reproduce this bug, but is still probably better
to have than not to.

Closes #18045.
---
 src/generic/treelist.cpp            | 8 ++++++--
 tests/controls/treelistctrltest.cpp | 9 +++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/generic/treelist.cpp b/src/generic/treelist.cpp
index 6c599100ae..3c6f26d955 100644
--- a/src/generic/treelist.cpp
+++ b/src/generic/treelist.cpp
@@ -572,12 +572,16 @@ void wxTreeListModel::DeleteItem(Node* item)
 
 void wxTreeListModel::DeleteAllItems()
 {
+    // Note that this must be called before actually deleting the items as
+    // clearing GTK+ wxDataViewCtrl results in SELECTION_CHANGED events being
+    // sent and these events contain pointers to the model items, so they must
+    // still be valid.
+    Cleared();
+
     while ( m_root->GetChild() )
     {
         m_root->DeleteChild();
     }
-
-    Cleared();
 }
 
 const wxString& wxTreeListModel::GetItemText(Node* item, unsigned col) const
diff --git a/tests/controls/treelistctrltest.cpp b/tests/controls/treelistctrltest.cpp
index d4a3ac96d6..02164ab3a1 100644
--- a/tests/controls/treelistctrltest.cpp
+++ b/tests/controls/treelistctrltest.cpp
@@ -39,6 +39,7 @@ private:
         CPPUNIT_TEST( Traversal );
         CPPUNIT_TEST( ItemText );
         CPPUNIT_TEST( ItemCheck );
+        CPPUNIT_TEST( DeleteAll );
     CPPUNIT_TEST_SUITE_END();
 
     // Create the control with the given style.
@@ -55,6 +56,7 @@ private:
     void Traversal();
     void ItemText();
     void ItemCheck();
+    void DeleteAll();
 
 
     // The control itself.
@@ -231,4 +233,11 @@ void TreeListCtrlTestCase::ItemCheck()
                           m_treelist->GetCheckedState(m_code) );
 }
 
+void TreeListCtrlTestCase::DeleteAll()
+{
+    m_treelist->DeleteAllItems();
+
+    CHECK( !m_treelist->GetFirstChild(m_treelist->GetRootItem()).IsOk() );
+}
+
 #endif // wxUSE_TREELISTCTRL

From 4750e1ee78f9256519c80596aeb76dbbbf7b7582 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Jan 2018 11:47:08 +0100
Subject: [PATCH 163/916] Exit the main loop, not the current one, on unhandled
 exception

If wxApp::OnExceptionInMainLoop() returns false, we're supposed to exit
the application by stopping its main event loop, not the loop that is
currently running, so do the former instead of the latter.

Also call wxAbort() if we can't exit the application in any other way,
this is not ideal, but still better than not doing anything and, for
example, keeping showing the same "Unexpected error occurred" message
box to the user over and over again if the exception comes from an event
handler being called repeatedly, such as wxEVT_PAINT or wxEVT_IDLE.
---
 src/common/event.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/common/event.cpp b/src/common/event.cpp
index d32a21d9d6..867871a348 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -1635,8 +1635,21 @@ void wxEvtHandler::WXConsumeException()
     {
         if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() )
         {
-            if ( loop )
-                loop->Exit();
+            // If OnExceptionInMainLoop() returns false, we're supposed to exit
+            // the program and for this we need to exit the main loop, not the
+            // possibly nested one we're running right now.
+            if ( wxTheApp )
+            {
+                wxTheApp->ExitMainLoop();
+            }
+            else
+            {
+                // We must not continue running after an exception, unless
+                // explicitly requested, so if we can't ensure this in any
+                // other way, do it brutally like this.
+                wxAbort();
+            }
+
         }
         //else: continue running current event loop
     }

From 35a0ba4fcee1539817e096ee2b3f11d8a844f1df Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Jan 2018 11:32:07 +0100
Subject: [PATCH 164/916] Avoid crash on abnormal exit in wx+MFC combined
 applications

Reset m_pMainWnd in wxMFCApp::ExitInstance() to avoid crash when
deleting it again in OnMainWindowDestroyed() that could happen if
ExitInstance() was called not because the main window was closed (normal
case) but because wxApp::ExitMainLoop() was called, as it happens when
an unhandled exception is thrown.
---
 include/wx/msw/mfc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h
index 8cab2ee37f..830db351ac 100644
--- a/include/wx/msw/mfc.h
+++ b/include/wx/msw/mfc.h
@@ -81,6 +81,7 @@ public:
     int ExitInstance() wxOVERRIDE
     {
         delete m_pMainWnd;
+        m_pMainWnd = NULL;
 
         if ( wxTheApp )
             wxTheApp->OnExit();

From a1cf0e1cd4e486db8f3a8bd31778e2f167e6cfb9 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 18 Jan 2018 19:42:08 +0100
Subject: [PATCH 165/916] Removing manual focus handling

see https://github.com/wxWidgets/wxWidgets/pull/672 , commit 61b1a9a3533d4e16b2b7a9441e42766d8d9655c7 , revert this change if problems arise to see whether this is a recursion
---
 include/wx/osx/frame.h   | 14 +-------------
 src/osx/carbon/frame.cpp | 33 ---------------------------------
 src/osx/window_osx.cpp   | 23 -----------------------
 3 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index 195145281f..9a493773fa 100644
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
 {
 public:
     // construction
-    wxFrame() { Init(); }
+    wxFrame() { }
     wxFrame(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
@@ -30,8 +30,6 @@ public:
             long style = wxDEFAULT_FRAME_STYLE,
             const wxString& name = wxFrameNameStr)
     {
-        Init();
-
         Create(parent, id, title, pos, size, style, name);
     }
 
@@ -75,19 +73,12 @@ public:
                                            const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
 #endif // wxUSE_STATUSBAR
 
-    // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
-    wxWindow *GetLastFocus() const { return m_winLastFocused; }
-
     void PositionBars();
 
     // internal response to size events
     virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); }
 
 protected:
-    // common part of all ctors
-    void Init();
-
 #if wxUSE_TOOLBAR
     virtual void PositionToolBar() wxOVERRIDE;
 #endif
@@ -104,9 +95,6 @@ protected:
     virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
 #endif
 
-    // the last focused child: we restore focus to it on activation
-    wxWindow             *m_winLastFocused;
-
     virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE;
 
     wxDECLARE_EVENT_TABLE();
diff --git a/src/osx/carbon/frame.cpp b/src/osx/carbon/frame.cpp
index 4b27f3d719..d0033a3d5d 100644
--- a/src/osx/carbon/frame.cpp
+++ b/src/osx/carbon/frame.cpp
@@ -36,11 +36,6 @@ wxEND_EVENT_TABLE()
 // creation/destruction
 // ----------------------------------------------------------------------------
 
-void wxFrame::Init()
-{
-    m_winLastFocused = NULL;
-}
-
 bool wxFrame::Create(wxWindow *parent,
            wxWindowID id,
            const wxString& title,
@@ -156,38 +151,10 @@ void wxFrame::OnActivate(wxActivateEvent& event)
 {
     if ( !event.GetActive() )
     {
-       // remember the last focused child if it is our child
-        m_winLastFocused = FindFocus();
-
-        // so we NULL it out if it's a child from some other frame
-        wxWindow *win = m_winLastFocused;
-        while ( win )
-        {
-            if ( win->IsTopLevel() )
-            {
-                if ( win != this )
-                    m_winLastFocused = NULL;
-
-                break;
-            }
-
-            win = win->GetParent();
-        }
-
         event.Skip();
     }
     else
     {
-        // restore focus to the child which was last focused
-        wxWindow *parent = m_winLastFocused
-            ? m_winLastFocused->GetParent()
-            : NULL;
-
-        if (parent == NULL)
-            parent = this;
-
-        wxSetFocusToChild(parent, &m_winLastFocused);
-
 #if wxUSE_MENUS
         if (m_frameMenuBar != NULL)
         {
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 5928260429..8ec3e2500a 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -239,20 +239,6 @@ wxWindowMac::~wxWindowMac()
 
     MacInvalidateBorders() ;
 
-#ifndef __WXUNIVERSAL__
-    // VS: make sure there's no wxFrame with last focus set to us:
-    for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
-    {
-        wxFrame *frame = wxDynamicCast(win, wxFrame);
-        if ( frame )
-        {
-            if ( frame->GetLastFocus() == this )
-                frame->SetLastFocus(NULL);
-            break;
-        }
-    }
-#endif
-
     // destroy children before destroying this window itself
     DestroyChildren();
 
@@ -266,15 +252,6 @@ wxWindowMac::~wxWindowMac()
             tlw->SetDefaultItem(NULL);
     }
 
-#ifndef __WXUNIVERSAL__
-    wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( (wxWindow*)this ) , wxFrame ) ;
-    if ( frame )
-    {
-        if ( frame->GetLastFocus() == this )
-            frame->SetLastFocus( NULL ) ;
-    }
-#endif
-
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     wxDELETE(m_dropTarget);

From c6e445d40c8f9a58ff728e31c72caa37045660c3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 18 Jan 2018 22:58:34 +0100
Subject: [PATCH 166/916] Set focus to wxSimplebook contents when setting focus
 to it

This is more expected than simply doing nothing, as happened until now.
---
 include/wx/simplebook.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/wx/simplebook.h b/include/wx/simplebook.h
index 4d604bac8e..7e819700fc 100644
--- a/include/wx/simplebook.h
+++ b/include/wx/simplebook.h
@@ -146,6 +146,14 @@ public:
         return NO_IMAGE;
     }
 
+    // Override some wxWindow methods too.
+    virtual void SetFocus() wxOVERRIDE
+    {
+        wxWindow* const page = GetCurrentPage();
+        if ( page )
+            page->SetFocus();
+    }
+
 protected:
     virtual void UpdateSelectedPage(size_t newsel) wxOVERRIDE
     {

From 483993222782c53ae0be72f6dbd42d1a4ffc56a1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 18 Jan 2018 22:20:58 +0100
Subject: [PATCH 167/916] Allow tabbing to the windows inside non-notebook
 wxBookCtrl

Remove wxBookCtrlBase::AcceptsFocus() returning false as it didn't make
any sense: even though wxBookCtrlBase doesn't, indeed, accept focus on
itself, it does accept it for its children and returning false prevented
the focus from ever getting inside it.

This fixes, for example, keyboard navigation in a window containing
wxSimplebook and TAB can now be used to move to the controls inside it
from the outside.

Also remove the now unnecessary AcceptsFocus() override which was just
undoing the damage of the base class method and is not needed any more.
---
 include/wx/bookctrl.h | 3 ---
 include/wx/notebook.h | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 0149ba4d94..aad4834a55 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -228,9 +228,6 @@ public:
     // we do have multiple pages
     virtual bool HasMultiplePages() const wxOVERRIDE { return true; }
 
-    // we don't want focus for ourselves
-    virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
-
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
 
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 61c2d2e6b8..8416c695a5 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -139,10 +139,6 @@ public:
     // new is wxNOT_FOUND)
     void SendPageChangedEvent(int nPageOld, int nPageNew = wxNOT_FOUND);
 
-    // wxBookCtrlBase overrides this method to return false but we do need
-    // focus because we have tabs
-    virtual bool AcceptsFocus() const wxOVERRIDE { return wxControl::AcceptsFocus(); }
-
 #if wxUSE_EXTENDED_RTTI    
     // XTI accessors
     virtual void AddPageInfo( wxNotebookPageInfo* info );

From a67f4b8254dd371e087f132e674e52e17fc8a72c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 18 Jan 2018 23:14:36 +0100
Subject: [PATCH 168/916] Don't pretend static box with enabled label is
 disabled

Trying to be smart by setting m_isEnabled to false in
wxStaticBox::Enable() without actually disabling the box itself (because
it can't be done if its label window is to remain enabled) didn't really
work. For example, it was impossible to TAB to a checkbox label of the
box when it was disabled, because keyboard navigation (correctly)
doesn't recurse into disabled windows and there could be similar
problems with any other code iterating over windows and skipping over
the disabled ones.

So, finally, simplify things and keep m_isEnabled in sync with the real
box state, even if this, counter-intuitively, means that IsEnabled() on
the box returns true after calling Enable(false) on it.

This also reverts 4ee35cf5ee569b6ee6c7d0d5702484d4d2a20f96 ("Don't
disable wxStaticBox children at wx level when disabling it") as we can't
avoid really disabling the children any more now that their parent is
not disabled: without this, their IsEnabled() would return true, i.e.
they wouldn't be disabled at all, from the program point of view. This
is unfortunate for the reasons that originally motivated that commit,
i.e. if some wxStaticBox child is disabled, disabling and re-enabling
the box will now re-enable this child, even if it shouldn't, but seems
impossible to avoid. The only possible alternative is to modify
IsEnabled() to add some wxStaticBox-specific hook to it, e.g. instead of
calling GetParent()->IsEnabled() there, we could call some now
AreChildrenEnable() method, which would delegate to IsEnabled() by
default but overridden in wxStaticBox. However this seems complicated,
and will add an extra virtual function call to all (frequently
happening) IsEnabled() calls.
---
 include/wx/statbox.h      |  7 +++++++
 include/wx/window.h       | 10 +++++-----
 interface/wx/statbox.h    | 15 +++++++++++++++
 src/common/statboxcmn.cpp | 39 +++++++++------------------------------
 4 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index ecb07ed92f..d5d15a9f00 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -54,6 +54,13 @@ protected:
     // static box and will be deleted when it is.
     wxWindow* m_labelWin;
 
+    // For boxes with window label this member variable is used instead of
+    // m_isEnabled to remember the last value passed to Enable(). It is
+    // required because the box itself doesn't get disabled by Enable(false) in
+    // this case (see comments in Enable() implementation), and m_isEnabled
+    // must correspond to its real state.
+    bool m_areChildrenEnabled;
+
     wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);
 };
 
diff --git a/include/wx/window.h b/include/wx/window.h
index b8d9e8d1a3..8046223a4a 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1580,11 +1580,6 @@ public:
         return false;
     }
 
-    // Recursively call our own and our children DoEnable() when the
-    // enabled/disabled status changed because a parent window had been
-    // enabled/disabled. This is only used by the library implementation.
-    void NotifyWindowOnEnableChange(bool enabled);
-
 
 protected:
     // helper for the derived class Create() methods: the first overload, with
@@ -1896,6 +1891,11 @@ protected:
     static void NotifyCaptureLost();
 
 private:
+    // recursively call our own and our children DoEnable() when the
+    // enabled/disabled status changed because a parent window had been
+    // enabled/disabled
+    void NotifyWindowOnEnableChange(bool enabled);
+
 #if wxUSE_MENUS
     // temporary event handlers used by GetPopupMenuSelectionFromUser()
     void InternalOnPopupMenu(wxCommandEvent& event);
diff --git a/interface/wx/statbox.h b/interface/wx/statbox.h
index f9174261d7..d9f2a564de 100644
--- a/interface/wx/statbox.h
+++ b/interface/wx/statbox.h
@@ -182,6 +182,21 @@ public:
                         });
         @endcode
         does work as expected.
+
+        Please note that overriding Enable() to not actually disable this
+        window itself has two possibly unexpected consequences:
+
+        - The box retains its enabled status, i.e. IsEnabled() still returns
+          @true, after calling @c Enable(false).
+        - The box children are enabled or disabled when the box is, which can
+          result in the loss of their original state. E.g. if a box child is
+          initially disabled, then the box itself is disabled and, finally, the
+          box is enabled again, this child will end up being enabled too (this
+          wouldn't happen with any other parent window as its children would
+          inherit the disabled state from the parent instead of being really
+          disabled themselves when it is disabled). To avoid this problem,
+          consider using ::wxEVT_UPDATE_UI to ensure that the child state is
+          always correct or restoring it manually after re-enabling the box.
      */
     virtual bool Enable(bool enable = true);
 };
diff --git a/src/common/statboxcmn.cpp b/src/common/statboxcmn.cpp
index 50f8a932e6..f8f489363b 100644
--- a/src/common/statboxcmn.cpp
+++ b/src/common/statboxcmn.cpp
@@ -32,6 +32,7 @@ extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox";
 wxStaticBoxBase::wxStaticBoxBase()
 {
     m_labelWin = NULL;
+    m_areChildrenEnabled = true;
 
 #ifndef __WXGTK__
     m_container.DisableSelfFocus();
@@ -88,47 +89,25 @@ bool wxStaticBoxBase::Enable(bool enable)
     // also disabled the label control.
     //
     // Unfortunately it is _not_ enough to just disable the box and then enable
-    // the label window as it would still remain disabled under some platforms
-    // (those where wxHAS_NATIVE_ENABLED_MANAGEMENT is defined, e.g. wxGTK) for
-    // as long as its parent is disabled. So we avoid disabling the box at all
-    // in this case and only disable its children, but still pretend that the
-    // box is disabled by updating its m_isEnabled, as it would be surprising
-    // if IsEnabled() didn't return false after disabling the box, for example.
-    //
-    // Finally note that this really needs to be done only when disabling the
-    // box and not when re-enabling it, at least for the platforms without
-    // native enabled state management (e.g. wxMSW) because otherwise we could
-    // have a bug in the following scenario:
-    //
-    //  0. The box is initially enabled
-    //  1. Its parent gets disabled, calling DoEnable(false) on the box and all
-    //     its children from its NotifyWindowOnEnableChange() (including the
-    //     label).
-    //  2. The box is itself disabled (for whatever app logic reason).
-    //  3. The parent gets enabled but this time doesn't do anything with the
-    //     box, because it should continue being disabled.
-    //  4. The box is re-enabled -- but remains actually disabled as
-    //     DoEnable(true) was never called on it (nor on the label).
-    //
-    // To avoid this possibility, we always call the base class version, which
-    // does call DoEnable(true) on the box itself and all its children,
-    // including the label, when re-enabling it.
-    if ( m_labelWin && !enable )
+    // the label window as it would still remain disabled for as long as its
+    // parent is disabled. So we avoid disabling the box at all in this case
+    // and only disable its children.
+    if ( m_labelWin )
     {
-        if ( enable == IsThisEnabled() )
+        if ( enable == m_areChildrenEnabled )
             return false;
 
+        m_areChildrenEnabled = enable;
+
         const wxWindowList& children = GetChildren();
         for ( wxWindowList::const_iterator i = children.begin();
               i != children.end();
               ++i )
         {
             if ( *i != m_labelWin )
-                (*i)->NotifyWindowOnEnableChange(enable);
+                (*i)->Enable(enable);
         }
 
-        m_isEnabled = enable;
-
         return true;
     }
 #endif // wxHAS_WINDOW_LABEL_IN_STATIC_BOX

From 0cd2e4b6cbabfb54484d952d40752798d13ecbd5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Jan 2018 13:10:10 +0100
Subject: [PATCH 169/916] Don't document wxEVT_ICONIZE as being for wxMSW and
 wxGTK only

It's generated by wxOSX too.

Closes #17840.
---
 interface/wx/event.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interface/wx/event.h b/interface/wx/event.h
index ae1eaeee9a..60e6f98475 100644
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -4477,8 +4477,6 @@ public:
 
     An event being sent when the frame is iconized (minimized) or restored.
 
-    @onlyfor{wxmsw,wxgtk}
-
     @beginEventTable{wxIconizeEvent}
     @event{EVT_ICONIZE(func)}
         Process a @c wxEVT_ICONIZE event.

From 7ff5e5e749987086954869365f453dc6e21b6c00 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Jan 2018 13:45:31 +0100
Subject: [PATCH 170/916] Regenerate configure after gtk.m4 update

This should have been part of 8e35398037c683e44f88ea084c9abbe64e69fafc.
---
 configure | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 4b10f91843..61a4e00d1d 100755
--- a/configure
+++ b/configure
@@ -21674,7 +21674,7 @@ if ac_fn_c_try_link "$LINENO"; then :
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
    echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
+          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -21821,13 +21821,13 @@ main ()
      exit(1);
    }
 
-  if ((GTK_MAJOR_VERSION != $gtk_config_major_version) ||
-      (GTK_MINOR_VERSION != $gtk_config_minor_version) ||
-      (GTK_MICRO_VERSION != $gtk_config_micro_version))
+  if ((gtk_get_major_version() != $gtk_config_major_version) ||
+      (gtk_get_minor_version() != $gtk_config_minor_version) ||
+      (gtk_get_micro_version() != $gtk_config_micro_version))
     {
       printf("\n*** 'pkg-config --modversion gtk+-4.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+             gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
       printf ("*** was found! If pkg-config was correct, then it is best\n");
       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
@@ -21836,18 +21836,27 @@ main ()
       printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
       printf("*** to point to the correct configuration files\n");
     }
+  else if ((gtk_get_major_version() != GTK_MAJOR_VERSION) ||
+	   (gtk_get_minor_version() != GTK_MINOR_VERSION) ||
+           (gtk_get_micro_version() != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
+    }
   else
     {
-      if ((GTK_MAJOR_VERSION > major) ||
-        ((GTK_MAJOR_VERSION == major) && (GTK_MINOR_VERSION > minor)) ||
-        ((GTK_MAJOR_VERSION == major) && (GTK_MINOR_VERSION == minor) && (GTK_MICRO_VERSION >= micro)))
+      if ((gtk_get_major_version() > major) ||
+        ((gtk_get_major_version() == major) && (gtk_get_minor_version() > minor)) ||
+        ((gtk_get_major_version() == major) && (gtk_get_minor_version() == minor) && (gtk_get_micro_version() >= micro)))
       {
         return 0;
        }
      else
       {
         printf("\n*** An old version of GTK+ (%u.%u.%u) was found.\n",
-               GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+               gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
         printf("*** You need a version of GTK+ newer than %u.%u.%u. The latest version of\n",
 	       major, minor, micro);
         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
@@ -21906,7 +21915,7 @@ $as_echo "no" >&6; }
 int
 main ()
 {
- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
+ return ((gtk_get_major_version()) || (gtk_get_minor_version()) || (gtk_get_micro_version()));
   ;
   return 0;
 }
@@ -21923,7 +21932,7 @@ if ac_fn_c_try_link "$LINENO"; then :
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 else
    echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
+          echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext

From bc131194943e69b2e0483cae6d987ff4b9899959 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Jan 2018 13:47:21 +0100
Subject: [PATCH 171/916] Don't check for non-standatd xlocale.h in configure

Testing for xlocale.h was due to a misunderstanding, this header wasn't
supposed to define locale_t which is defined by locale.h itself and was
just some internal glibc header which was removed in its 2.26 release,
see

https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27

Stop checking for it in configure and also don't always define
wxUSE_XLOCALE but only do it if the configure test succeeded.
---
 configure            | 26 ++++++++++++++------------
 configure.in         | 18 ++++++++----------
 include/wx/xlocale.h |  1 -
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/configure b/configure
index 61a4e00d1d..9c1e4bc12d 100755
--- a/configure
+++ b/configure
@@ -32907,12 +32907,9 @@ $as_echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;}
 fi
 
 if test "$wxUSE_XLOCALE" = "yes" ; then
-    $as_echo "#define wxUSE_XLOCALE 1" >>confdefs.h
-
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete xlocale" >&5
-$as_echo_n "checking for complete xlocale... " >&6; }
-if ${wx_cv_func_strtod_l+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale_t" >&5
+$as_echo_n "checking for locale_t... " >&6; }
+if ${wx_cv_type_locale_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -32925,7 +32922,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-        #include <xlocale.h>
         #include <locale.h>
         #include <stdlib.h>
 
@@ -32941,9 +32937,9 @@ main ()
 }
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  wx_cv_func_strtod_l=yes
+  wx_cv_type_locale_t=yes
 else
-  wx_cv_func_strtod_l=no
+  wx_cv_type_locale_t=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -32955,12 +32951,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_strtod_l" >&5
-$as_echo "$wx_cv_func_strtod_l" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_locale_t" >&5
+$as_echo "$wx_cv_type_locale_t" >&6; }
+
+    if test "$wx_cv_type_locale_t" = "yes" ; then
+        $as_echo "#define wxUSE_XLOCALE 1" >>confdefs.h
+
 
-    if test "$wx_cv_func_strtod_l" = "yes" ; then
                         $as_echo "#define HAVE_LOCALE_T 1" >>confdefs.h
 
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No locale_t support, wxXLocale won't be available" >&5
+$as_echo "$as_me: WARNING: No locale_t support, wxXLocale won't be available" >&2;}
     fi
 fi
 
diff --git a/configure.in b/configure.in
index 7b20dff46f..c9a84bb3a6 100644
--- a/configure.in
+++ b/configure.in
@@ -5757,17 +5757,11 @@ if test "$wxUSE_INTL" = "yes" ; then
 fi
 
 if test "$wxUSE_XLOCALE" = "yes" ; then
-    AC_DEFINE(wxUSE_XLOCALE)
-
-    dnl even if xlocale.h exists, it may not contain all that
-    dnl wx needs. check if strtod_l() really is available.
-    AC_CACHE_CHECK([for complete xlocale],
-                   wx_cv_func_strtod_l,
+    AC_CACHE_CHECK([for locale_t], wx_cv_type_locale_t,
     [
         AC_LANG_PUSH(C++)
         AC_TRY_COMPILE(
         [
-        #include <xlocale.h>
         #include <locale.h>
         #include <stdlib.h>
         ],
@@ -5775,16 +5769,20 @@ if test "$wxUSE_XLOCALE" = "yes" ; then
         locale_t t;
         strtod_l(NULL, NULL, t);
         ],
-        wx_cv_func_strtod_l=yes,
-        wx_cv_func_strtod_l=no
+        wx_cv_type_locale_t=yes,
+        wx_cv_type_locale_t=no
         )
         AC_LANG_POP()
     ])
 
-    if test "$wx_cv_func_strtod_l" = "yes" ; then
+    if test "$wx_cv_type_locale_t" = "yes" ; then
+        AC_DEFINE(wxUSE_XLOCALE)
+
         dnl We don't test (just) for locale_t existence, but we still define
         dnl this symbol to avoid changing the existing code using it.
         AC_DEFINE(HAVE_LOCALE_T)
+    else
+        AC_MSG_WARN([No locale_t support, wxXLocale won't be available])
     fi
 fi
 
diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index 27493974d0..9ade3a99f4 100644
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -41,7 +41,6 @@
         #define wxXLOCALE_IDENT(name) _ ## name
     #elif defined(HAVE_LOCALE_T)
         #include <locale.h>
-        #include <xlocale.h>
         #include <ctype.h>
         #include <stdlib.h>
 

From d6b88ca399eeb7c8245491a9ae4d418298564078 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Sat, 20 Jan 2018 16:53:13 +0100
Subject: [PATCH 172/916] Add footer text and icon to wxRichMessageDialog

The underlying Windows TaskDialog supports adding an additional footer
to the message dialog. This makes the native functionality available
and implements it in the generic version.

See https://github.com/wxWidgets/wxWidgets/pull/573
---
 docs/changes.txt            |  1 +
 include/wx/richmsgdlg.h     | 15 +++++++++++-
 interface/wx/richmsgdlg.h   | 48 +++++++++++++++++++++++++++++++++++++
 samples/dialogs/dialogs.cpp | 47 ++++++++++++++++++++++++++++++++++++
 samples/dialogs/dialogs.h   |  2 ++
 src/generic/richmsgdlgg.cpp | 23 ++++++++++++++++++
 src/msw/richmsgdlg.cpp      | 21 ++++++++++++++++
 7 files changed, 156 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 3867505ef1..c60379766e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -172,6 +172,7 @@ All (GUI):
 - Ensure that navigation order reflects layout of wxStdDialogButtonSizer.
 - Add Scintilla FineTicker methods to wxSTC (NewPagodi).
 - Add wxFontPickerCtrl::SetMinPointSize() (Andreas Falkenhahn).
+- Add Set/GetFooter/Text/Icon() to wxRichMessageDialog (Tobias Taschner)
 
 wxGTK:
 
diff --git a/include/wx/richmsgdlg.h b/include/wx/richmsgdlg.h
index ab49af7d00..53812e0e6d 100644
--- a/include/wx/richmsgdlg.h
+++ b/include/wx/richmsgdlg.h
@@ -28,7 +28,8 @@ public:
         : wxGenericMessageDialog( parent, message, caption, style ),
           m_detailsExpanderCollapsedLabel( wxGetTranslation("&See details") ),
           m_detailsExpanderExpandedLabel( wxGetTranslation("&Hide details") ),
-          m_checkBoxValue( false )
+          m_checkBoxValue( false ),
+          m_footerIcon( 0 )
         { }
 
     void ShowCheckBox(const wxString& checkBoxText, bool checked = false)
@@ -46,6 +47,16 @@ public:
 
     virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; }
 
+    void SetFooterText(const wxString& footerText)
+        { m_footerText = footerText; }
+
+    wxString GetFooterText() const { return m_footerText; }
+
+    void SetFooterIcon(int icon)
+        { m_footerIcon = icon; }
+
+    int GetFooterIcon() const { return m_footerIcon; }
+
 protected:
     const wxString m_detailsExpanderCollapsedLabel;
     const wxString m_detailsExpanderExpandedLabel;
@@ -53,6 +64,8 @@ protected:
     wxString m_checkBoxText;
     bool m_checkBoxValue;
     wxString m_detailedText;
+    wxString m_footerText;
+    int m_footerIcon;
 
 private:
     void ShowDetails(bool shown);
diff --git a/interface/wx/richmsgdlg.h b/interface/wx/richmsgdlg.h
index c80462f3e6..649e0ae4d4 100644
--- a/interface/wx/richmsgdlg.h
+++ b/interface/wx/richmsgdlg.h
@@ -107,6 +107,54 @@ public:
      */
     wxString GetDetailedText() const;
 
+    /**
+        Shows or hides a footer text that is used at the bottom of
+        the dialog together with an optional icon.
+
+        @param footerText
+            The footer text if empty no footer text will be used.
+
+        @see SetFooterIcon(), GetFooterText()
+        
+        @since 3.1.1
+    */
+    void SetFooterText(const wxString& footerText);
+
+    /**
+        Retrieves the footer text.
+
+        @return
+            The footer text or empty if footer text is not used.
+
+        @since 3.1.1
+    */
+    wxString GetFooterText() const;
+
+    /**
+        Specify the footer icon set together with the footer text.
+
+        Valid values are @c wxICON_INFORMATION, @c wxICON_WARNING,
+        @c wxICON_AUTH_NEEDED and @c wxICON_ERROR (notice that
+        @c wxICON_QUESTION is not allowed here).
+
+        @see GetFooterIcon(), SetFooterText()
+
+        @since 3.1.1
+    */
+    void SetFooterIcon(int icon);
+
+    /**
+        Retrieves the footer icon.
+
+        @return
+            The footer icon or 0 if footer icon is not used.
+
+        @see SetFooterIcon()
+
+        @since 3.1.1
+    */
+    int GetFooterIcon() const;
+
     /**
         Retrieves the state of the checkbox.
 
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 899d50d058..c0ea4641a3 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -3892,6 +3892,34 @@ void TestRichMessageDialog::AddAdditionalTextOptions(wxSizer *sizer)
                                     wxTE_MULTILINE);
     sizerMsgs->Add(m_textDetailed, wxSizerFlags().Expand());
 
+    // add option to show footer text
+    wxSizer * const sizerFooter = new wxBoxSizer(wxHORIZONTAL);
+    sizerFooter->Add(new wxStaticText(this, wxID_ANY, "&Footer Text:"),
+        wxSizerFlags().Centre().Border(wxRIGHT));
+    m_textFooter = new wxTextCtrl(this, wxID_ANY);
+    sizerFooter->Add(m_textFooter, wxSizerFlags(1).Centre());
+
+    // add option to select footer icon
+    const wxString icons[] =
+    {
+        "None",
+        "Info",
+        "Warning",
+        "Error",
+        "Auth needed"
+    };
+
+    sizerFooter->Add(new wxStaticText(this, wxID_ANY, "Icon:"),
+        wxSizerFlags().Centre().Border(wxLEFT));
+    m_iconsFooter = new wxChoice(this, wxID_ANY,
+        wxDefaultPosition, wxDefaultSize,
+        WXSIZEOF(icons), icons);
+    // Make the None the default:
+    m_iconsFooter->SetSelection(0);
+    sizerFooter->Add(m_iconsFooter, wxSizerFlags().Expand().Border());
+
+    sizerMsgs->Add(sizerFooter, wxSizerFlags().Expand().Border(wxTOP));
+
     sizer->Add(sizerMsgs, wxSizerFlags().Expand().Border());
 }
 
@@ -3912,6 +3940,25 @@ void TestRichMessageDialog::OnApply(wxCommandEvent& WXUNUSED(event))
     dlg.ShowCheckBox(m_textCheckBox->GetValue(),
                      m_initialValueCheckBox->GetValue());
     dlg.ShowDetailedText(m_textDetailed->GetValue());
+    dlg.SetFooterText(m_textFooter->GetValue());
+    switch ( m_iconsFooter->GetSelection() )
+    {
+        case 1:
+            dlg.SetFooterIcon(wxICON_INFORMATION);
+            break;
+
+        case 2:
+            dlg.SetFooterIcon(wxICON_WARNING);
+            break;
+
+        case 3:
+            dlg.SetFooterIcon(wxICON_ERROR);
+            break;
+
+        case 4:
+            dlg.SetFooterIcon(wxICON_AUTH_NEEDED);
+            break;
+    }
 
     ShowResult(dlg.ShowModal());
 }
diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index a7df5878b5..45063772cb 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -268,6 +268,8 @@ private:
     wxTextCtrl *m_textCheckBox;
     wxCheckBox *m_initialValueCheckBox;
     wxTextCtrl *m_textDetailed;
+    wxTextCtrl *m_textFooter;
+    wxChoice *m_iconsFooter;
 
     wxDECLARE_EVENT_TABLE();
 };
diff --git a/src/generic/richmsgdlgg.cpp b/src/generic/richmsgdlgg.cpp
index c74e380f57..ed9a5d9717 100644
--- a/src/generic/richmsgdlgg.cpp
+++ b/src/generic/richmsgdlgg.cpp
@@ -18,12 +18,15 @@
 
 #ifndef WX_PRECOMP
     #include "wx/checkbox.h"
+    #include "wx/statbmp.h"
     #include "wx/stattext.h"
     #include "wx/sizer.h"
 #endif
 
 #include "wx/collpane.h"
 #include "wx/richmsgdlg.h"
+#include "wx/statline.h"
+#include "wx/artprov.h"
 
 wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog)
 
@@ -77,6 +80,26 @@ void wxGenericRichMessageDialog::AddMessageDialogDetails(wxSizer *sizer)
         sizerDetails->Add( m_detailsPane, wxSizerFlags().Right().Expand() );
         sizer->Add( sizerDetails, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
     }
+
+    if ( !m_footerText.empty() )
+    {
+        // add footer
+        sizer->Add( new wxStaticLine(this), wxSizerFlags().Expand().Border() );
+        wxSizer *footerSizer = new wxBoxSizer(wxHORIZONTAL);
+        if (m_footerIcon)
+        {
+            wxSize iconSize = wxArtProvider::GetNativeSizeHint(wxART_MENU);
+
+            wxStaticBitmap* footerIcon = new wxStaticBitmap(this, wxID_ANY,
+                wxArtProvider::GetIcon(wxArtProvider::GetMessageBoxIconId(m_footerIcon),
+                wxART_MESSAGE_BOX, iconSize));
+            footerSizer->Add( footerIcon,
+                wxSizerFlags().Border(wxLEFT|wxRIGHT).CenterVertical() );
+        }
+        footerSizer->Add( new wxStaticText(this, wxID_ANY, m_footerText),
+            wxSizerFlags().CenterVertical() );
+        sizer->Add( footerSizer, wxSizerFlags().Border().Expand() );
+    }
 }
 
 bool wxGenericRichMessageDialog::IsCheckBoxChecked() const
diff --git a/src/msw/richmsgdlg.cpp b/src/msw/richmsgdlg.cpp
index 5a97225887..5415bc16fe 100644
--- a/src/msw/richmsgdlg.cpp
+++ b/src/msw/richmsgdlg.cpp
@@ -58,6 +58,27 @@ int wxRichMessageDialog::ShowModal()
         if ( !m_detailedText.empty() )
             tdc.pszExpandedInformation = m_detailedText.t_str();
 
+        // Add footer text
+        if ( !m_footerText.empty() )
+        {
+            tdc.pszFooter = m_footerText.t_str();
+            switch ( m_footerIcon )
+            {
+                case wxICON_INFORMATION:
+                    tdc.pszFooterIcon = TD_INFORMATION_ICON;
+                    break;
+                case wxICON_WARNING:
+                    tdc.pszFooterIcon = TD_WARNING_ICON;
+                    break;
+                case wxICON_ERROR:
+                    tdc.pszFooterIcon = TD_ERROR_ICON;
+                    break;
+                case wxICON_AUTH_NEEDED:
+                    tdc.pszFooterIcon = TD_SHIELD_ICON;
+                    break;
+            }
+        }
+
         TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc();
         if ( !taskDialogIndirect )
             return wxID_CANCEL;

From 5c0dfcd5aeef7dd9dd6a9f7b5b5d871a8517ac48 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Jan 2018 17:28:20 +0100
Subject: [PATCH 173/916] Fix extra wxEVT_COLLAPSIBLEPANE_CHANGED with
 wxCP_NO_TLW_RESIZE

A pane using wxCP_NO_TLW_RESIZE would generate wxCollapsiblePaneEvent
even when toggled from a program because the GTK+ callback didn't take
m_bIgnoreNextChange flag into account in this case.

Fix this and also avoid duplicating the code for sending the event.
---
 src/gtk/collpane.cpp | 53 +++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index 9d67ea4ca6..a2007f6662 100644
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -99,40 +99,33 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
     //     (redraw/relayout/resize) so that it's flicker-free
     p->SetMinSize(sz);
 
-    if (p->HasFlag(wxCP_NO_TLW_RESIZE))
+    if (!p->HasFlag(wxCP_NO_TLW_RESIZE))
     {
-        // fire an event
-        wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
-        p->HandleWindowEvent(ev);
-
-        // the user asked to explicitly handle the resizing itself...
-        return;
-    }
-
-    wxTopLevelWindow *
-        top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow);
-    if ( top && top->GetSizer() )
-    {
-        // 2) recalculate minimal size of the top window
-        sz = top->GetSizer()->CalcMin();
-
-        if (top->m_mainWidget)
+        wxTopLevelWindow *
+            top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow);
+        if ( top && top->GetSizer() )
         {
-            // 3) MAGIC HACK: if you ever used GtkExpander in a GTK+ program
-            //    you know that this magic call is required to make it possible
-            //    to shrink the top level window in the expanded->collapsed
-            //    transition.  This may be sometimes undesired but *is*
-            //    necessary and if you look carefully, all GTK+ programs using
-            //    GtkExpander perform this trick (e.g. the standard "open file"
-            //    dialog of GTK+>=2.4 is not resizable when the expander is
-            //    collapsed!)
-            gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded());
+            // 2) recalculate minimal size of the top window
+            sz = top->GetSizer()->CalcMin();
 
-            // 4) set size hints
-            top->SetMinClientSize(sz);
+            if (top->m_mainWidget)
+            {
+                // 3) MAGIC HACK: if you ever used GtkExpander in a GTK+ program
+                //    you know that this magic call is required to make it possible
+                //    to shrink the top level window in the expanded->collapsed
+                //    transition.  This may be sometimes undesired but *is*
+                //    necessary and if you look carefully, all GTK+ programs using
+                //    GtkExpander perform this trick (e.g. the standard "open file"
+                //    dialog of GTK+>=2.4 is not resizable when the expander is
+                //    collapsed!)
+                gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded());
 
-            // 5) set size
-            top->SetClientSize(sz);
+                // 4) set size hints
+                top->SetMinClientSize(sz);
+
+                // 5) set size
+                top->SetClientSize(sz);
+            }
         }
     }
 

From c63d47bc9451daf2e2509fe400a13d2e547fbdaa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Jan 2018 18:07:23 +0100
Subject: [PATCH 174/916] Fix broken resize handling in wxGTK wxCollapsiblePane

Almost totally rewrite the resize-after-toggle code in this control so
that it actually makes sense and works, especially in the situations
when the contents of wxCollapsiblePane changes, for example when it
contains another wxCollapsiblePane inside it which can be collapsed or
expanded. Previously, this didn't work at all in wxGTK and the inner
pane always remained at its minimal, collapsed size. Now it does, after
doing the following:

First, replace the completely useless DoGetBestSize() which just did the
same thing as its base class implementation with the code actually
determining the best size of the window that was previously hidden
inside gtk_collapsiblepane_expanded_callback() for some reason. Note
that the comment about "not caching the best size" in the old code was
very out of date and was probably left over from the days when
GetBestSize() itself was virtual, as caching is not done in
DoGetBestSize() anyhow, but in GetBestSize() itself.

So, second, do fix the best size invalidation by doing it explicitly
whenever the pane is toggled. And, relatedly, do not set the min size of
anything because this overrides the layout computations and is never
reset/invalidated, unlike the best size, even if the best size of the
pane changes, e.g. because of a change to its contents.

Finally, remove many thoroughly outdated comments, e.g. the one speaking
about OnStateChange() which doesn't exist at all in this implementation.
---
 src/gtk/collpane.cpp | 84 +++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 55 deletions(-)

diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index a2007f6662..e02c0be1da 100644
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -51,62 +51,28 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
                                       GParamSpec * WXUNUSED(param_spec),
                                       wxCollapsiblePane *p)
 {
-    // NB: unlike for the "activate" signal, when this callback is called, if
-    //     we try to query the "collapsed" status through p->IsCollapsed(), we
-    //     get the right value. I.e. here p->IsCollapsed() will return false if
-    //     this callback has been called at the end of a collapsed->expanded
-    //     transition and viceversa. Inside the "activate" signal callback
-    //     p->IsCollapsed() would return the wrong value!
-
-    wxSize sz;
-    if ( p->IsExpanded() )
-    {
-        // NB: we cannot use the p->GetBestSize() or p->GetMinSize() functions
-        //     here as they would return the size for the collapsed expander
-        //     even if the collapsed->expanded transition has already been
-        //     completed; we solve this problem doing:
-
-        sz = p->m_szCollapsed;
-
-        wxSize panesz = p->GetPane()->GetBestSize();
-        sz.x = wxMax(sz.x, panesz.x);
-        sz.y += gtk_expander_get_spacing(GTK_EXPANDER(p->m_widget)) + panesz.y;
-    }
-    else // collapsed
-    {
-        // same problem described above: using p->Get[Best|Min]Size() here we
-        // would get the size of the control when it is expanded even if the
-        // expanded->collapsed transition should be complete now...
-        // So, we use the size cached at control-creation time...
-        sz = p->m_szCollapsed;
-    }
-
-    // VERY IMPORTANT:
-    // just calling
-    //          p->OnStateChange(sz);
-    // here would work work BUT:
-    //     1) in the expanded->collapsed transition it provokes a lot of flickering
-    //     2) in the collapsed->expanded transition using the "Change status" wxButton
-    //        in samples/collpane application some strange warnings would be generated
-    //        by the "clearlooks" theme, if that's your theme.
-    //
-    // So we prefer to use some GTK+ native optimized calls, which prevent too many resize
-    // calculations to happen. Note that the following code has been very carefully designed
-    // and tested - be VERY careful when changing it!
-
-    // 1) need to update our size hints
-    // NB: this function call won't actually do any long operation
-    //     (redraw/relayout/resize) so that it's flicker-free
-    p->SetMinSize(sz);
+    // When the pane is expanded or collapsed, its best size changes, so it
+    // needs to be invalidated in any case.
+    p->InvalidateBestSize();
 
     if (!p->HasFlag(wxCP_NO_TLW_RESIZE))
     {
         wxTopLevelWindow *
             top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow);
+
+        // If we want to automatically resize the entire TLW to adopt to the
+        // new pane size, we also need to invalidate the cached best sizes of
+        // all the intermediate windows to ensure that it's recalculated
+        // correctly when doing the layout below.
+        for ( wxWindow* w = p->GetParent(); w != top; w = w->GetParent() )
+        {
+            w->InvalidateBestSize();
+        }
+
         if ( top && top->GetSizer() )
         {
             // 2) recalculate minimal size of the top window
-            sz = top->GetSizer()->CalcMin();
+            const wxSize sz = top->GetSizer()->CalcMin();
 
             if (top->m_mainWidget)
             {
@@ -184,9 +150,10 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
         gtk_expander_new_with_mnemonic(wxGTK_CONV(GTKConvertMnemonics(label)));
     g_object_ref(m_widget);
 
-    // see the gtk_collapsiblepane_expanded_callback comments to understand why
-    // we connect to the "notify::expanded" signal instead of the more common
-    // "activate" one
+    // Connect to the "notify::expanded" signal instead of the more common
+    // "activate" one in order to use the new state in our callback, which is
+    // more convenient e.g. because calling GetBestSize() returns the suitable
+    // size for the new state.
     g_signal_connect(m_widget, "notify::expanded",
                      G_CALLBACK(gtk_collapsiblepane_expanded_callback), this);
 
@@ -204,7 +171,7 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
     m_pPane->SetBackgroundColour(bg);
 
     // remember the size of this control when it's collapsed
-    m_szCollapsed = GetBestSize();
+    m_szCollapsed = GTKGetPreferredSize(m_widget);
 
     return true;
 }
@@ -213,9 +180,16 @@ wxSize wxCollapsiblePane::DoGetBestSize() const
 {
     wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
 
-    // notice that we do not cache our best size here as it changes
-    // all times the user expands/hide our pane
-    return GTKGetPreferredSize(m_widget);
+    wxSize sz = m_szCollapsed;
+
+    if ( IsExpanded() )
+    {
+        const wxSize panesz = m_pPane->GetBestSize();
+        sz.x = wxMax(sz.x, panesz.x);
+        sz.y += gtk_expander_get_spacing(GTK_EXPANDER(m_widget)) + panesz.y;
+    }
+
+    return sz;
 }
 
 void wxCollapsiblePane::Collapse(bool collapse)

From 678d1142b44b5ffea684254a84d177cd4bbc1eda Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 21 Jan 2018 16:23:15 +0100
Subject: [PATCH 175/916] Fix typo in EVT_LIST_BEGIN_LABEL_EDIT in the
 documentation

"LIST" part was somehow forgotten.

Closes #18051.
---
 interface/wx/listctrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h
index e853e13a82..bd6bbad11a 100644
--- a/interface/wx/listctrl.h
+++ b/interface/wx/listctrl.h
@@ -200,7 +200,7 @@ enum
     @event{EVT_LIST_BEGIN_RDRAG(id, func)}
            Begin dragging with the right mouse button.
            Processes a @c wxEVT_LIST_BEGIN_RDRAG event type.
-    @event{EVT_BEGIN_LABEL_EDIT(id, func)}
+    @event{EVT_LIST_BEGIN_LABEL_EDIT(id, func)}
            Begin editing a label. This can be prevented by calling Veto().
            Processes a @c wxEVT_LIST_BEGIN_LABEL_EDIT event type.
     @event{EVT_LIST_END_LABEL_EDIT(id, func)}

From e723bb2ee485aec50ab2595ae976ec573796a59e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 21 Jan 2018 16:49:26 +0100
Subject: [PATCH 176/916] Try to fix macOS build using cmake after xlocale
 changes

Commit bc131194943e69b2e0483cae6d987ff4b9899959 removed the inclusion of
xlocale.h because it is not (and never was) needed under Linux with
glibc, but it is still needed under macOS, so this (silently) disabled
wxXLocale support under Mac when using configure and broke the build
when using cmake.

Fix both problems by using xlocale.h only if it's available, both in
configure and in cmake.
---
 build/cmake/setup.cmake |   1 +
 build/cmake/setup.h.in  |   3 ++
 configure               | 107 ++++++++++++++++++++++++++++++++++++++++
 configure.in            |   7 +++
 include/wx/xlocale.h    |   5 ++
 setup.h.in              |   3 ++
 6 files changed, 126 insertions(+)

diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index 9e0e4d24d4..a21a2449a8 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -649,6 +649,7 @@ if(wxUSE_FSWATCHER)
 endif()
 
 if(wxUSE_XLOCALE)
+    check_include_file(xlocale.h HAVE_XLOCALE_H)
     set(CMAKE_EXTRA_INCLUDE_FILES xlocale.h locale.h)
     check_type_size(locale_t LOCALE_T)
     set(CMAKE_EXTRA_INCLUDE_FILES)
diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
index ab342723f1..4f244d7da4 100644
--- a/build/cmake/setup.h.in
+++ b/build/cmake/setup.h.in
@@ -1257,6 +1257,9 @@
 /* Define if setpriority() is available. */
 #cmakedefine HAVE_SETPRIORITY 1
 
+/* Define if xlocale.h header file exists. */
+#cmakedefine HAVE_XLOCALE_H 1
+
 /* Define if locale_t is available */
 #cmakedefine HAVE_LOCALE_T 1
 
diff --git a/configure b/configure
index 9c1e4bc12d..7266ef5019 100755
--- a/configure
+++ b/configure
@@ -3217,6 +3217,97 @@ fi
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_run
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## -------------------------------------- ##
+## Report this to wx-dev@googlegroups.com ##
+## -------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -32907,6 +32998,19 @@ $as_echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;}
 fi
 
 if test "$wxUSE_XLOCALE" = "yes" ; then
+            for ac_header in xlocale.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "xlocale.h" "ac_cv_header_xlocale_h" "$ac_includes_default"
+if test "x$ac_cv_header_xlocale_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_XLOCALE_H 1
+_ACEOF
+
+fi
+
+done
+
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale_t" >&5
 $as_echo_n "checking for locale_t... " >&6; }
 if ${wx_cv_type_locale_t+:} false; then :
@@ -32922,6 +33026,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+        #ifdef HAVE_XLOCALE_H
+        #include <xlocale.h>
+        #endif
         #include <locale.h>
         #include <stdlib.h>
 
diff --git a/configure.in b/configure.in
index c9a84bb3a6..5af395548d 100644
--- a/configure.in
+++ b/configure.in
@@ -5757,11 +5757,18 @@ if test "$wxUSE_INTL" = "yes" ; then
 fi
 
 if test "$wxUSE_XLOCALE" = "yes" ; then
+    dnl Some platforms (e.g. macOS) require an extra header, others (Linux)
+    dnl don't, but it's simpler to just check for it under all of them.
+    AC_CHECK_HEADERS([xlocale.h])
+
     AC_CACHE_CHECK([for locale_t], wx_cv_type_locale_t,
     [
         AC_LANG_PUSH(C++)
         AC_TRY_COMPILE(
         [
+        #ifdef HAVE_XLOCALE_H
+        #include <xlocale.h>
+        #endif
         #include <locale.h>
         #include <stdlib.h>
         ],
diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
index 9ade3a99f4..476a3a737e 100644
--- a/include/wx/xlocale.h
+++ b/include/wx/xlocale.h
@@ -40,6 +40,11 @@
         typedef _locale_t wxXLocale_t;
         #define wxXLOCALE_IDENT(name) _ ## name
     #elif defined(HAVE_LOCALE_T)
+        // Some systems (notably macOS) require including a separate header for
+        // locale_t and related functions.
+        #ifdef HAVE_XLOCALE_H
+            #include <xlocale.h>
+        #endif
         #include <locale.h>
         #include <ctype.h>
         #include <stdlib.h>
diff --git a/setup.h.in b/setup.h.in
index 1f1955ad4c..981b45e1da 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -1267,6 +1267,9 @@
 /* Define if setpriority() is available. */
 #undef HAVE_SETPRIORITY
 
+/* Define if xlocale.h header file exists. */
+#undef HAVE_XLOCALE_H
+
 /* Define if locale_t is available */
 #undef HAVE_LOCALE_T
 

From aae23be946fca2ff7b57da5af97f04fe77e1f857 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 21 Jan 2018 17:33:50 +0100
Subject: [PATCH 177/916] Fixing xcode build after xlocale.h include change

see commit e723bb2ee485aec50ab2595ae976ec573796a59e
---
 include/wx/osx/config_xcode.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index 56aef33402..c9f3922de4 100644
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -121,6 +121,7 @@
 #define HAVE_GETPWUID_R 1
 #define HAVE_GETGRGID_R 1
 #define HAVE_LOCALE_T 1
+#define HAVE_XLOCALE_H 1
 #define wxHAS_KQUEUE 1
 
 #define PACKAGE_BUGREPORT "wx-dev@googlegroups.com"

From ce90336dffdeb8ae1efdae9842574f12bbad90d5 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 21 Jan 2018 20:41:52 +0100
Subject: [PATCH 178/916] Fixing popup windows with a modal dialog as parent

When having a certain creation sequence, these popup windows were not focused correctly, see https://github.com/wxWidgets/wxWidgets/pull/672 , commit d2265136e359df4d14054860a68bbc7f4910279d , revert this change if problems arise to see whether this is a recursion
---
 include/wx/osx/cocoa/private.h |  4 +++
 src/osx/cocoa/nonownedwnd.mm   | 62 ++++++++++++++++++++--------------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index db182e4479..07402e06d1 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -288,6 +288,10 @@ protected :
     CGWindowLevel   m_macWindowLevel;
     WXWindow        m_macWindow;
     void *          m_macFullScreenData ;
+    
+private:
+    void SetUpForModalParent();
+    
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl);
 };
 
diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 735ed8f5e4..9291601699 100644
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -733,31 +733,9 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
         [[m_macWindow standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
     }
     
-    // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need
-    // to be in NSModalPanelWindowLevel and not NSFloatingWindowLevel to stay
-    // above the parent.
-    wxDialog * const parentDialog = parent == NULL ? NULL : wxDynamicCast(parent->MacGetTopLevelWindow(), wxDialog);
-    if (parentDialog && parentDialog->IsModal())
-    {
-        if (level == NSFloatingWindowLevel)
-        {
-            level = NSModalPanelWindowLevel;
-        }
-
-        // Cocoa's modal loop does not process other windows by default, but
-        // don't call this on normal window levels so nested modal dialogs will
-        // still behave modally.
-        if (level != NSNormalWindowLevel)
-        {
-            if ([m_macWindow isKindOfClass:[NSPanel class]])
-            {
-                [(NSPanel*)m_macWindow setWorksWhenModal:YES];
-            }
-        }
-    }
-
-    [m_macWindow setLevel:level];
     m_macWindowLevel = level;
+    SetUpForModalParent();
+    [m_macWindow setLevel:m_macWindowLevel];
 
     [m_macWindow setDelegate:controller];
 
@@ -791,8 +769,41 @@ void wxNonOwnedWindowCocoaImpl::Lower()
     [m_macWindow orderWindow:NSWindowBelow relativeTo:0];
 }
 
+void wxNonOwnedWindowCocoaImpl::SetUpForModalParent()
+{
+    wxNonOwnedWindow* wxpeer = GetWXPeer();
+    if (wxpeer)
+    {
+        // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need
+        // to be in NSModalPanelWindowLevel and not NSFloatingWindowLevel to stay
+        // above the parent.
+        wxDialog* const parentDialog = wxDynamicCast(wxGetTopLevelParent(wxpeer->GetParent()), wxDialog);
+        if (parentDialog && parentDialog->IsModal())
+        {
+            if (m_macWindowLevel == NSFloatingWindowLevel)
+            {
+                m_macWindowLevel = NSModalPanelWindowLevel;
+                if ([m_macWindow level] == NSFloatingWindowLevel)
+                    [m_macWindow setLevel:m_macWindowLevel];
+            }
+
+            // Cocoa's modal loop does not process other windows by default, but
+            // don't call this on normal window levels so nested modal dialogs will
+            // still behave modally.
+            if (m_macWindowLevel != NSNormalWindowLevel)
+            {
+                if ([m_macWindow isKindOfClass:[NSPanel class]])
+                {
+                    [(NSPanel*)m_macWindow setWorksWhenModal:YES];
+                }
+            }
+        }
+    }
+}
+
 void wxNonOwnedWindowCocoaImpl::ShowWithoutActivating()
 {
+    SetUpForModalParent();
     [m_macWindow orderFront:nil];
     [[m_macWindow contentView] setNeedsDisplay: YES];
 }
@@ -826,7 +837,8 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
                 }
             }
             
-            if (!(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
+            SetUpForModalParent();
+            if (!(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW))
                 [m_macWindow makeKeyAndOrderFront:nil];
             else 
                 [m_macWindow orderFront:nil]; 

From ddceaab001a6c9459af84f3937e99fa9b8dc755a Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Fri, 27 Oct 2017 20:55:40 +0200
Subject: [PATCH 179/916] Remove MSW wxUxThemeEngine class

This undocumented "private" class was used for various windows UxTheme
functions which are available since WinXP. As wxWidgets 3.1 is XP+ it
does not make sense anymore to load the theme functions dynamically.
---
 Makefile.in                          |   1 -
 build/bakefiles/common.bkl           |   1 +
 build/bakefiles/files.bkl            |   1 -
 build/cmake/files.cmake              |   1 -
 build/files                          |   1 -
 build/msw/makefile.bcc               |  34 ++--
 build/msw/makefile.gcc               |  34 ++--
 build/msw/wx_core.vcxproj            |   1 -
 build/msw/wx_core.vcxproj.filters    |   3 -
 build/msw/wx_vc7_core.vcproj         |   3 -
 build/msw/wx_vc8_core.vcproj         |   4 -
 build/msw/wx_vc9_core.vcproj         |   4 -
 configure                            |   2 +-
 configure.in                         |   2 +-
 demos/bombs/makefile.bcc             |   2 +-
 demos/bombs/makefile.gcc             |   2 +-
 demos/forty/makefile.bcc             |   2 +-
 demos/forty/makefile.gcc             |   2 +-
 demos/fractal/makefile.bcc           |   2 +-
 demos/fractal/makefile.gcc           |   2 +-
 demos/life/makefile.bcc              |   2 +-
 demos/life/makefile.gcc              |   2 +-
 demos/poem/makefile.bcc              |   2 +-
 demos/poem/makefile.gcc              |   2 +-
 docs/changes.txt                     |   9 +-
 include/wx/msw/libraries.h           |   5 +
 include/wx/msw/uxtheme.h             | 223 +--------------------------
 include/wx/msw/uxthemep.h            | 169 --------------------
 samples/access/makefile.bcc          |   2 +-
 samples/access/makefile.gcc          |   2 +-
 samples/animate/makefile.bcc         |   2 +-
 samples/animate/makefile.gcc         |   2 +-
 samples/artprov/makefile.bcc         |   2 +-
 samples/artprov/makefile.gcc         |   2 +-
 samples/aui/makefile.bcc             |   2 +-
 samples/aui/makefile.gcc             |   2 +-
 samples/calendar/makefile.bcc        |   2 +-
 samples/calendar/makefile.gcc        |   2 +-
 samples/caret/makefile.bcc           |   2 +-
 samples/caret/makefile.gcc           |   2 +-
 samples/clipboard/makefile.bcc       |   2 +-
 samples/clipboard/makefile.gcc       |   2 +-
 samples/collpane/makefile.bcc        |   2 +-
 samples/collpane/makefile.gcc        |   2 +-
 samples/combo/makefile.bcc           |   2 +-
 samples/combo/makefile.gcc           |   2 +-
 samples/config/makefile.bcc          |   2 +-
 samples/config/makefile.gcc          |   2 +-
 samples/console/makefile.bcc         |   2 +-
 samples/console/makefile.gcc         |   2 +-
 samples/dataview/makefile.bcc        |   2 +-
 samples/dataview/makefile.gcc        |   2 +-
 samples/debugrpt/makefile.bcc        |   2 +-
 samples/debugrpt/makefile.gcc        |   2 +-
 samples/dialogs/makefile.bcc         |   2 +-
 samples/dialogs/makefile.gcc         |   2 +-
 samples/dialup/makefile.bcc          |   2 +-
 samples/dialup/makefile.gcc          |   2 +-
 samples/display/makefile.bcc         |   2 +-
 samples/display/makefile.gcc         |   2 +-
 samples/dll/makefile.bcc             |   4 +-
 samples/dll/makefile.gcc             |   4 +-
 samples/dnd/makefile.bcc             |   2 +-
 samples/dnd/makefile.gcc             |   2 +-
 samples/docview/makefile.bcc         |   2 +-
 samples/docview/makefile.gcc         |   2 +-
 samples/dragimag/makefile.bcc        |   2 +-
 samples/dragimag/makefile.gcc        |   2 +-
 samples/drawing/makefile.bcc         |   2 +-
 samples/drawing/makefile.gcc         |   2 +-
 samples/erase/makefile.bcc           |   2 +-
 samples/erase/makefile.gcc           |   2 +-
 samples/event/makefile.bcc           |   2 +-
 samples/event/makefile.gcc           |   2 +-
 samples/except/makefile.bcc          |   2 +-
 samples/except/makefile.gcc          |   2 +-
 samples/exec/makefile.bcc            |   2 +-
 samples/exec/makefile.gcc            |   2 +-
 samples/font/makefile.bcc            |   2 +-
 samples/font/makefile.gcc            |   2 +-
 samples/fswatcher/makefile.bcc       |   2 +-
 samples/fswatcher/makefile.gcc       |   2 +-
 samples/grid/makefile.bcc            |   2 +-
 samples/grid/makefile.gcc            |   2 +-
 samples/help/makefile.bcc            |   2 +-
 samples/help/makefile.gcc            |   2 +-
 samples/htlbox/makefile.bcc          |   2 +-
 samples/htlbox/makefile.gcc          |   2 +-
 samples/html/about/makefile.bcc      |   2 +-
 samples/html/about/makefile.gcc      |   2 +-
 samples/html/help/makefile.bcc       |   2 +-
 samples/html/help/makefile.gcc       |   2 +-
 samples/html/helpview/makefile.bcc   |   2 +-
 samples/html/helpview/makefile.gcc   |   2 +-
 samples/html/printing/makefile.bcc   |   2 +-
 samples/html/printing/makefile.gcc   |   2 +-
 samples/html/test/makefile.bcc       |   2 +-
 samples/html/test/makefile.gcc       |   2 +-
 samples/html/virtual/makefile.bcc    |   2 +-
 samples/html/virtual/makefile.gcc    |   2 +-
 samples/html/widget/makefile.bcc     |   2 +-
 samples/html/widget/makefile.gcc     |   2 +-
 samples/html/zip/makefile.bcc        |   2 +-
 samples/html/zip/makefile.gcc        |   2 +-
 samples/image/makefile.bcc           |   2 +-
 samples/image/makefile.gcc           |   2 +-
 samples/internat/makefile.bcc        |   2 +-
 samples/internat/makefile.gcc        |   2 +-
 samples/ipc/makefile.bcc             |   8 +-
 samples/ipc/makefile.gcc             |   8 +-
 samples/joytest/makefile.bcc         |   2 +-
 samples/joytest/makefile.gcc         |   2 +-
 samples/keyboard/makefile.bcc        |   2 +-
 samples/keyboard/makefile.gcc        |   2 +-
 samples/layout/makefile.bcc          |   2 +-
 samples/layout/makefile.gcc          |   2 +-
 samples/listctrl/makefile.bcc        |   2 +-
 samples/listctrl/makefile.gcc        |   2 +-
 samples/mdi/makefile.bcc             |   2 +-
 samples/mdi/makefile.gcc             |   2 +-
 samples/mediaplayer/makefile.bcc     |   2 +-
 samples/mediaplayer/makefile.gcc     |   2 +-
 samples/memcheck/makefile.bcc        |   2 +-
 samples/memcheck/makefile.gcc        |   2 +-
 samples/menu/makefile.bcc            |   2 +-
 samples/menu/makefile.gcc            |   2 +-
 samples/minimal/makefile.bcc         |   2 +-
 samples/minimal/makefile.gcc         |   2 +-
 samples/nativdlg/makefile.bcc        |   2 +-
 samples/nativdlg/makefile.gcc        |   2 +-
 samples/notebook/makefile.bcc        |   2 +-
 samples/notebook/makefile.gcc        |   2 +-
 samples/oleauto/makefile.bcc         |   2 +-
 samples/oleauto/makefile.gcc         |   2 +-
 samples/opengl/cube/makefile.bcc     |   2 +-
 samples/opengl/cube/makefile.gcc     |   2 +-
 samples/opengl/isosurf/makefile.bcc  |   2 +-
 samples/opengl/isosurf/makefile.gcc  |   2 +-
 samples/opengl/penguin/makefile.bcc  |   2 +-
 samples/opengl/penguin/makefile.gcc  |   2 +-
 samples/opengl/pyramid/makefile.bcc  |   2 +-
 samples/opengl/pyramid/makefile.gcc  |   2 +-
 samples/ownerdrw/makefile.bcc        |   2 +-
 samples/ownerdrw/makefile.gcc        |   2 +-
 samples/popup/makefile.bcc           |   2 +-
 samples/popup/makefile.gcc           |   2 +-
 samples/power/makefile.bcc           |   2 +-
 samples/power/makefile.gcc           |   2 +-
 samples/preferences/makefile.bcc     |   2 +-
 samples/preferences/makefile.gcc     |   2 +-
 samples/printing/makefile.bcc        |   2 +-
 samples/printing/makefile.gcc        |   2 +-
 samples/propgrid/makefile.bcc        |   2 +-
 samples/propgrid/makefile.gcc        |   2 +-
 samples/regtest/makefile.bcc         |   2 +-
 samples/regtest/makefile.gcc         |   2 +-
 samples/render/makefile.bcc          |   4 +-
 samples/render/makefile.gcc          |   4 +-
 samples/ribbon/makefile.bcc          |   2 +-
 samples/ribbon/makefile.gcc          |   2 +-
 samples/richtext/makefile.bcc        |   2 +-
 samples/richtext/makefile.gcc        |   2 +-
 samples/sashtest/makefile.bcc        |   2 +-
 samples/sashtest/makefile.gcc        |   2 +-
 samples/scroll/makefile.bcc          |   2 +-
 samples/scroll/makefile.gcc          |   2 +-
 samples/secretstore/makefile.bcc     |   2 +-
 samples/secretstore/makefile.gcc     |   2 +-
 samples/shaped/makefile.bcc          |   2 +-
 samples/shaped/makefile.gcc          |   2 +-
 samples/sockets/makefile.bcc         |   8 +-
 samples/sockets/makefile.gcc         |   8 +-
 samples/sound/makefile.bcc           |   2 +-
 samples/sound/makefile.gcc           |   2 +-
 samples/splash/makefile.bcc          |   2 +-
 samples/splash/makefile.gcc          |   2 +-
 samples/splitter/makefile.bcc        |   2 +-
 samples/splitter/makefile.gcc        |   2 +-
 samples/statbar/makefile.bcc         |   2 +-
 samples/statbar/makefile.gcc         |   2 +-
 samples/stc/makefile.bcc             |   2 +-
 samples/stc/makefile.gcc             |   2 +-
 samples/svg/makefile.bcc             |   2 +-
 samples/svg/makefile.gcc             |   2 +-
 samples/taborder/makefile.bcc        |   2 +-
 samples/taborder/makefile.gcc        |   2 +-
 samples/taskbar/makefile.bcc         |   2 +-
 samples/taskbar/makefile.gcc         |   2 +-
 samples/taskbarbutton/makefile.bcc   |   2 +-
 samples/taskbarbutton/makefile.gcc   |   2 +-
 samples/text/makefile.bcc            |   2 +-
 samples/text/makefile.gcc            |   2 +-
 samples/thread/makefile.bcc          |   2 +-
 samples/thread/makefile.gcc          |   2 +-
 samples/toolbar/makefile.bcc         |   2 +-
 samples/toolbar/makefile.gcc         |   2 +-
 samples/treectrl/makefile.bcc        |   2 +-
 samples/treectrl/makefile.gcc        |   2 +-
 samples/treelist/makefile.bcc        |   2 +-
 samples/treelist/makefile.gcc        |   2 +-
 samples/typetest/makefile.bcc        |   2 +-
 samples/typetest/makefile.gcc        |   2 +-
 samples/uiaction/makefile.bcc        |   2 +-
 samples/uiaction/makefile.gcc        |   2 +-
 samples/validate/makefile.bcc        |   2 +-
 samples/validate/makefile.gcc        |   2 +-
 samples/vscroll/makefile.bcc         |   2 +-
 samples/vscroll/makefile.gcc         |   2 +-
 samples/webview/makefile.bcc         |   2 +-
 samples/webview/makefile.gcc         |   2 +-
 samples/widgets/makefile.bcc         |   2 +-
 samples/widgets/makefile.gcc         |   2 +-
 samples/wizard/makefile.bcc          |   2 +-
 samples/wizard/makefile.gcc          |   2 +-
 samples/wrapsizer/makefile.bcc       |   2 +-
 samples/wrapsizer/makefile.gcc       |   2 +-
 samples/xrc/makefile.bcc             |   2 +-
 samples/xrc/makefile.gcc             |   2 +-
 samples/xti/makefile.bcc             |   2 +-
 samples/xti/makefile.gcc             |   2 +-
 src/aui/barartmsw.cpp                |  28 ++--
 src/aui/tabartmsw.cpp                |  29 ++--
 src/generic/combog.cpp               |   9 +-
 src/generic/richtooltipg.cpp         |  24 ++-
 src/msw/anybutton.cpp                |  29 ++--
 src/msw/combo.cpp                    |  31 +---
 src/msw/combobox.cpp                 |   2 +-
 src/msw/control.cpp                  |   2 +-
 src/msw/menuitem.cpp                 |  64 ++++----
 src/msw/notebook.cpp                 |  22 +--
 src/msw/renderer.cpp                 |  89 +++++++----
 src/msw/richtooltip.cpp              |   2 +-
 src/msw/statbox.cpp                  |   4 +-
 src/msw/statusbar.cpp                |   4 +-
 src/msw/systhemectrl.cpp             |   9 +-
 src/msw/textentry.cpp                |   4 +-
 src/msw/uxtheme.cpp                  | 146 +-----------------
 src/msw/window.cpp                   |  24 ++-
 tests/benchmarks/makefile.bcc        |   6 +-
 tests/benchmarks/makefile.gcc        |   6 +-
 tests/makefile.bcc                   |   8 +-
 tests/makefile.gcc                   |   8 +-
 utils/emulator/src/makefile.bcc      |   2 +-
 utils/emulator/src/makefile.gcc      |   2 +-
 utils/execmon/makefile.bcc           |   2 +-
 utils/execmon/makefile.gcc           |   2 +-
 utils/helpview/src/makefile.bcc      |   2 +-
 utils/helpview/src/makefile.gcc      |   2 +-
 utils/hhp2cached/makefile.bcc        |   2 +-
 utils/hhp2cached/makefile.gcc        |   2 +-
 utils/ifacecheck/src/makefile.bcc    |   2 +-
 utils/ifacecheck/src/makefile.gcc    |   2 +-
 utils/screenshotgen/src/makefile.bcc |   2 +-
 utils/screenshotgen/src/makefile.gcc |   2 +-
 utils/wxrc/makefile.bcc              |   2 +-
 utils/wxrc/makefile.gcc              |   2 +-
 256 files changed, 478 insertions(+), 1034 deletions(-)
 delete mode 100644 include/wx/msw/uxthemep.h

diff --git a/Makefile.in b/Makefile.in
index c00dbf1699..9c8279c3ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2761,7 +2761,6 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
 	wx/msw/ole/activex.h \
 	wx/msw/popupwin.h \
 	wx/msw/uxtheme.h \
-	wx/msw/uxthemep.h \
 	wx/msw/htmlhelp.h \
 	wx/msw/helpchm.h \
 	wx/msw/helpwin.h
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index c596c08ccc..5febc1ac6e 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -570,6 +570,7 @@ $(TAB)cl /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
                  wx/msw/libraries.h when wxUSE_ACCESSIBILITY==1 -->
             <if cond="IS_MSVC=='0'">
                 <sys-lib>oleacc</sys-lib>
+                <sys-lib>uxtheme</sys-lib>
             </if>
         </if>
     </template>
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 85658c2a8c..429136f79a 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1919,7 +1919,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/ole/activex.h
     wx/msw/popupwin.h
     wx/msw/uxtheme.h
-    wx/msw/uxthemep.h
     wx/msw/htmlhelp.h
 </set>
 
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 82690419f8..1253477e0b 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -1793,7 +1793,6 @@ set(MSW_LOWLEVEL_HDR
     wx/msw/ole/activex.h
     wx/msw/popupwin.h
     wx/msw/uxtheme.h
-    wx/msw/uxthemep.h
     wx/msw/htmlhelp.h
 )
 
diff --git a/build/files b/build/files
index e6d0c67a6d..e38e8fd584 100644
--- a/build/files
+++ b/build/files
@@ -1785,7 +1785,6 @@ MSW_LOWLEVEL_HDR =
     wx/msw/ole/activex.h
     wx/msw/popupwin.h
     wx/msw/uxtheme.h
-    wx/msw/uxthemep.h
     wx/msw/htmlhelp.h
 
 MSW_DESKTOP_LOWLEVEL_SRC =
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 8a61ffbd7a..6cccbb80d7 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -5222,7 +5222,7 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib      $(__wxscintilla) import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\monodll_version.res
+	c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib      $(__wxscintilla) import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\monodll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@
 !endif
@@ -5238,7 +5238,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\basedll_version.res
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\basedll_version.res
+	c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\basedll_version.res
 |
 	implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@
 !endif
@@ -5258,7 +5258,7 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\netdll_version.res $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\netdll_version.res
+	c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\netdll_version.res
 |
 	implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@
 !endif
@@ -5278,7 +5278,7 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\coredll_version.res $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\coredll_version.res
+	c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\coredll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@
 !endif
@@ -5298,7 +5298,7 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\advdll_version.res
+	c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\advdll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@
 !endif
@@ -5318,7 +5318,7 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\mediadll_version.res
+	c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\mediadll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@
 !endif
@@ -5338,7 +5338,7 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\htmldll_version.res
+	c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\htmldll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@
 !endif
@@ -5358,7 +5358,7 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\webviewdll_dummy.obj  $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(WEBVIEWDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\webviewdll_version.res
+	c0d32.obj $(WEBVIEWDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\webviewdll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview $@
 !endif
@@ -5378,7 +5378,7 @@ wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\qadll_version.res
+	c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\qadll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@
 !endif
@@ -5398,7 +5398,7 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\xmldll_version.res $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xmldll_version.res
+	c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xmldll_version.res
 |
 	implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@
 !endif
@@ -5418,7 +5418,7 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xrcdll_version.res
+	c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xrcdll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@
 !endif
@@ -5438,7 +5438,7 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\auidll_version.res
+	c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\auidll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui $@
 !endif
@@ -5458,7 +5458,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj  $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(RIBBONDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\ribbondll_version.res
+	c0d32.obj $(RIBBONDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\ribbondll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon $@
 !endif
@@ -5478,7 +5478,7 @@ wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj  $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(PROPGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\propgriddll_version.res
+	c0d32.obj $(PROPGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\propgriddll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid $@
 !endif
@@ -5498,7 +5498,7 @@ wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\richtextdll_version.res
+	c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\richtextdll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext $@
 !endif
@@ -5518,7 +5518,7 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla)  $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(STCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\stcdll_version.res
+	c0d32.obj $(STCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\stcdll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc $@
 !endif
@@ -5538,7 +5538,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib  $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\gldll_version.res
+	c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)  import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\gldll_version.res
 |
 	implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@
 !endif
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index d9945f9e6b..2f6f1f2f0e 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -5311,7 +5311,7 @@ endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\monodll_version_rc.o $(__wxscintilla_library_link_DEP)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MONODLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc      $(__wxscintilla)
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MONODLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme      $(__wxscintilla)
 endif
 endif
 
@@ -5327,7 +5327,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\basedll_version_rc.o
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(BASEDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(BASEDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 endif
 
@@ -5347,7 +5347,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\netdll_version_rc.o $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(NETDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(NETDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 
@@ -5368,7 +5368,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\coredll_version_rc.o $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(COREDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(COREDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5394,7 +5394,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\advdll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(ADVDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(ADVDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5421,7 +5421,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_MEDIA),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\mediadll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MEDIADLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MEDIADLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5453,7 +5453,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_HTML),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\htmldll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(HTMLDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(HTMLDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5483,7 +5483,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_WEBVIEW),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\webviewdll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(WEBVIEWDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(WEBVIEWDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5513,7 +5513,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_QA),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll: $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\qadll_version_rc.o $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(QADLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(QADLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a
 endif
 endif
 endif
@@ -5541,7 +5541,7 @@ endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xmldll_version_rc.o $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XMLDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XMLDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 
@@ -5562,7 +5562,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_XRC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xrcdll_version_rc.o $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XRCDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XRCDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5588,7 +5588,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_AUI),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\auidll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(AUIDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(AUIDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5614,7 +5614,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_RIBBON),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll: $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\ribbondll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RIBBONDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RIBBONDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5640,7 +5640,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_PROPGRID),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll: $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\propgriddll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(PROPGRIDDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(PROPGRIDDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5666,7 +5666,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_RICHTEXT),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\richtextdll_version_rc.o $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RICHTEXTDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RICHTEXTDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5692,7 +5692,7 @@ ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 ifeq ($(USE_STC),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__wxscintilla) $(OBJS)\stcdll_version_rc.o $(__coredll___depname) $(__basedll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(STCDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(STCDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a
 endif
 endif
 endif
@@ -5718,7 +5718,7 @@ ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 ifeq ($(USE_OPENGL),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\gldll_version_rc.o $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(GLDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(GLDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32
 endif
 endif
 endif
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index 174b3d06f7..fa5484d035 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -1140,7 +1140,6 @@
     <ClInclude Include="..\..\include\wx\msw\treectrl.h" />
     <ClInclude Include="..\..\include\wx\msw\ole\uuid.h" />
     <ClInclude Include="..\..\include\wx\msw\uxtheme.h" />
-    <ClInclude Include="..\..\include\wx\msw\uxthemep.h" />
     <ClInclude Include="..\..\include\wx\msw\window.h" />
     <ClInclude Include="..\..\include\wx\generic\accel.h" />
     <ClInclude Include="..\..\include\wx\generic\busyinfo.h" />
diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters
index 3d054e9e26..d27e7e9151 100644
--- a/build/msw/wx_core.vcxproj.filters
+++ b/build/msw/wx_core.vcxproj.filters
@@ -1675,9 +1675,6 @@
     <ClInclude Include="..\..\include\wx\msw\uxtheme.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\msw\uxthemep.h">
-      <Filter>MSW Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\window.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 117b6efbc3..bc06126838 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1631,9 +1631,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\uxtheme.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\uxthemep.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\webview_ie.h">
 			</File>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index d42bb1e612..a5cb10c1df 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2677,10 +2677,6 @@
 				RelativePath="..\..\include\wx\msw\uxtheme.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\uxthemep.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\webview_ie.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index cb6cbf6566..f480343e17 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2673,10 +2673,6 @@
 				RelativePath="..\..\include\wx\msw\uxtheme.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\uxthemep.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\webview_ie.h"
 				>
diff --git a/configure b/configure
index 7266ef5019..40cee31096 100755
--- a/configure
+++ b/configure
@@ -21125,7 +21125,7 @@ fi
 
 
 
-    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32"
+    LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32"
     case "${host}" in
         x86_64-*-mingw32* )
                                                 WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
diff --git a/configure.in b/configure.in
index 5af395548d..7e6a66a077 100644
--- a/configure.in
+++ b/configure.in
@@ -2705,7 +2705,7 @@ if test "$USE_WIN32" = 1 ; then
     ],
     [ ])
 
-    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32"
+    LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32"
     case "${host}" in
         x86_64-*-mingw32* )
             dnl we need to define this to embed the manifest for correct
diff --git a/demos/bombs/makefile.bcc b/demos/bombs/makefile.bcc
index 844f6c3038..bf2c8945a7 100644
--- a/demos/bombs/makefile.bcc
+++ b/demos/bombs/makefile.bcc
@@ -230,7 +230,7 @@ clean:
 
 $(OBJS)\bombs.exe: $(BOMBS_OBJECTS)  $(OBJS)\bombs_bombs.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res
+	c0w32.obj $(BOMBS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\bombs_bombs.res
 |
 
 $(OBJS)\bombs_bombs.obj: .\bombs.cpp
diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc
index 65c4ee8fe1..f23e5e9ac9 100644
--- a/demos/bombs/makefile.gcc
+++ b/demos/bombs/makefile.gcc
@@ -220,7 +220,7 @@ clean:
 	-if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe
 
 $(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs_rc.o
-	$(CXX) -o $@ $(BOMBS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(BOMBS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\bombs_bombs.o: ./bombs.cpp
 	$(CXX) -c -o $@ $(BOMBS_CXXFLAGS) $(CPPDEPS) $<
diff --git a/demos/forty/makefile.bcc b/demos/forty/makefile.bcc
index 5abf5b6c3e..52ac1b6c5e 100644
--- a/demos/forty/makefile.bcc
+++ b/demos/forty/makefile.bcc
@@ -247,7 +247,7 @@ clean:
 
 $(OBJS)\forty.exe: $(FORTY_OBJECTS)  $(OBJS)\forty_forty.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
+	c0w32.obj $(FORTY_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\forty_forty.res
 |
 
 data: 
diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc
index 4501b33c43..b2f549b595 100644
--- a/demos/forty/makefile.gcc
+++ b/demos/forty/makefile.gcc
@@ -237,7 +237,7 @@ clean:
 	-if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
 
 $(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty_rc.o
-	$(CXX) -o $@ $(FORTY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(FORTY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/demos/fractal/makefile.bcc b/demos/fractal/makefile.bcc
index 2bb7560b45..eae6b853b1 100644
--- a/demos/fractal/makefile.bcc
+++ b/demos/fractal/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS)  $(OBJS)\fractal_fractal.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res
+	c0w32.obj $(FRACTAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fractal_fractal.res
 |
 
 $(OBJS)\fractal_fractal.obj: .\fractal.cpp
diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc
index 3dda17bf5c..02a1065f4b 100644
--- a/demos/fractal/makefile.gcc
+++ b/demos/fractal/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe
 
 $(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal_rc.o
-	$(CXX) -o $@ $(FRACTAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(FRACTAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\fractal_fractal.o: ./fractal.cpp
 	$(CXX) -c -o $@ $(FRACTAL_CXXFLAGS) $(CPPDEPS) $<
diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc
index 126e8b841f..e7a0b3172c 100644
--- a/demos/life/makefile.bcc
+++ b/demos/life/makefile.bcc
@@ -231,7 +231,7 @@ clean:
 
 $(OBJS)\life.exe: $(LIFE_OBJECTS)  $(OBJS)\life_life.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res
+	c0w32.obj $(LIFE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\life_life.res
 |
 
 data: 
diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc
index f3d854c349..081320c979 100644
--- a/demos/life/makefile.gcc
+++ b/demos/life/makefile.gcc
@@ -221,7 +221,7 @@ clean:
 	-if exist $(OBJS)\life.exe del $(OBJS)\life.exe
 
 $(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life_rc.o
-	$(CXX) -o $@ $(LIFE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(LIFE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc
index 2f713bd71e..92b823c43f 100644
--- a/demos/poem/makefile.bcc
+++ b/demos/poem/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS)  $(OBJS)\wxpoem_wxpoem.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res
+	c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res
 |
 
 data: 
diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc
index 8580edc6f1..da1cd7a9cc 100644
--- a/demos/poem/makefile.gcc
+++ b/demos/poem/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe
 
 $(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o
-	$(CXX) -o $@ $(WXPOEM_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WXPOEM_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/docs/changes.txt b/docs/changes.txt
index c60379766e..4378b63aa8 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -48,10 +48,11 @@ Changes in behaviour which may result in build errors
 - "webview" library is not included in `wx-config --libs` output any more, you
   need to request it explicitly, e.g. `wx-config --libs std,webview`.
 
-- wxMSW now requires linking with shlwapi.lib and version.lib. This is done
-  automatically in most cases, but if you use a static build of the library
-  with a non-MSVC compiler such as MinGW and do not use wx-config, then you
-  will need to add these libraries to your make or project files yourself.
+- wxMSW now requires linking with uxtheme.lib, shlwapi.lib and version.lib.
+  This is done automatically in most cases, but if you use a static build of
+  the library with a non-MSVC compiler such as MinGW and do not use wx-config,
+  then you will need to add these libraries to your make or project files
+  yourself.
 
 - WXWIN_OS_DESCRIPTION doesn't exist any longer, use wxGetOsDescription().
 
diff --git a/include/wx/msw/libraries.h b/include/wx/msw/libraries.h
index abd0046a74..50282ceb90 100644
--- a/include/wx/msw/libraries.h
+++ b/include/wx/msw/libraries.h
@@ -22,4 +22,9 @@
 #pragma comment(lib, "oleacc")
 #endif
 
+#if defined __VISUALC__ && wxUSE_UXTHEME
+#pragma comment(lib, "uxtheme")
+#endif
+
+
 #endif /* _WX_MSW_LIBRARIES_H_ */
diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index 394dd4d975..b081ed2fc5 100644
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -14,7 +14,7 @@
 #include "wx/defs.h"
 
 #include "wx/msw/private.h"     // we use GetHwndOf()
-#include "wx/msw/uxthemep.h"
+#include <uxtheme.h>
 
 // Amazingly, GetThemeFont() and GetThemeSysFont() functions use LOGFONTA under
 // XP but LOGFONTW (even in non-Unicode build) under later versions of Windows.
@@ -32,21 +32,18 @@ public:
     // Trivial default ctor.
     wxUxThemeFont() { }
 
-    // Just some unique type.
-    struct Ptr { };
-
 #if wxUSE_UNICODE
     // In Unicode build we always use LOGFONT anyhow so this class is
     // completely trivial.
-    Ptr *GetPtr() { return reinterpret_cast<Ptr *>(&m_lfW); }
+    LPLOGFONTW GetPtr() { return &m_lfW; }
     const LOGFONTW& GetLOGFONT() { return m_lfW; }
 #else // !wxUSE_UNICODE
     // Return either LOGFONTA or LOGFONTW pointer as required by the current
     // Windows version.
-    Ptr *GetPtr()
+    LPLOGFONTW GetPtr()
     {
-        return UseLOGFONTW() ? reinterpret_cast<Ptr *>(&m_lfW)
-                             : reinterpret_cast<Ptr *>(&m_lfA);
+        return UseLOGFONTW() ? &m_lfW
+                             : reinterpret_cast<LPLOGFONTW>(&m_lfA);
     }
 
     // This method returns LOGFONT (i.e. LOGFONTA in ANSI build and LOGFONTW in
@@ -84,208 +81,7 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxUxThemeFont);
 };
 
-typedef int(__stdcall *DTT_CALLBACK_PROC)(HDC hdc, const wchar_t * pszText, int cchText, RECT * prc, unsigned int dwFlags, WXLPARAM lParam);
-
-typedef struct _DTTOPTS
-{
-    DWORD             dwSize;
-    DWORD             dwFlags;
-    COLORREF          crText;
-    COLORREF          crBorder;
-    COLORREF          crShadow;
-    int               iTextShadowType;
-    POINT             ptShadowOffset;
-    int               iBorderSize;
-    int               iFontPropId;
-    int               iColorPropId;
-    int               iStateId;
-    BOOL              fApplyOverlay;
-    int               iGlowSize;
-    DTT_CALLBACK_PROC pfnDrawTextCallback;
-    WXLPARAM          lParam;
-} DTTOPTS, *PDTTOPTS;
-
-typedef HTHEME  (__stdcall *PFNWXUOPENTHEMEDATA)(HWND, const wchar_t *);
-typedef HRESULT (__stdcall *PFNWXUCLOSETHEMEDATA)(HTHEME);
-typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEBACKGROUND)(HTHEME, HDC, int, int, const RECT *, const RECT *);
-typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEBACKGROUNDEX)(HTHEME, HDC, int, int, const RECT *, const DTBGOPTS *);
-typedef HRESULT (__stdcall *PFNWXUDRAWTHEMETEXT)(HTHEME, HDC, int, int, const wchar_t *, int, DWORD, DWORD, const RECT *);
-typedef HRESULT (__stdcall *PFNWXUDRAWTHEMETEXTEX)(HTHEME, HDC, int, int, const wchar_t *, int, DWORD, RECT *, const DTTOPTS *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDCONTENTRECT)(HTHEME, HDC, int, int, const RECT *, RECT *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDEXTENT)(HTHEME, HDC, int, int, const RECT *, RECT *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEPARTSIZE)(HTHEME, HDC, int, int, const RECT *, /* enum */ THEMESIZE, SIZE *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMETEXTEXTENT)(HTHEME, HDC, int, int, const wchar_t *, int, DWORD, const RECT *, RECT *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMETEXTMETRICS)(HTHEME, HDC, int, int, TEXTMETRIC*);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEBACKGROUNDREGION)(HTHEME, HDC, int, int, const RECT *, HRGN *);
-typedef HRESULT (__stdcall *PFNWXUHITTESTTHEMEBACKGROUND)(HTHEME, HDC, int, int, DWORD, const RECT *, HRGN, POINT, unsigned short *);
-typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEEDGE)(HTHEME, HDC, int, int, const RECT *, unsigned int, unsigned int, RECT *);
-typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEICON)(HTHEME, HDC, int, int, const RECT *, HIMAGELIST, int);
-typedef BOOL    (__stdcall *PFNWXUISTHEMEPARTDEFINED)(HTHEME, int, int);
-typedef BOOL    (__stdcall *PFNWXUISTHEMEBACKGROUNDPARTIALLYTRANSPARENT)(HTHEME, int, int);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMECOLOR)(HTHEME, int, int, int, COLORREF*);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEMETRIC)(HTHEME, HDC, int, int, int, int *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMESTRING)(HTHEME, int, int, int, wchar_t *, int);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEBOOL)(HTHEME, int, int, int, BOOL *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEINT)(HTHEME, int, int, int, int *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEENUMVALUE)(HTHEME, int, int, int, int *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEPOSITION)(HTHEME, int, int, int, POINT *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEFONT)(HTHEME, HDC, int, int, int, wxUxThemeFont::Ptr *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMERECT)(HTHEME, int, int, int, RECT *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEMARGINS)(HTHEME, HDC, int, int, int, RECT *, MARGINS *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEINTLIST)(HTHEME, int, int, int, INTLIST*);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEPROPERTYORIGIN)(HTHEME, int, int, int, /* enum */ PROPERTYORIGIN *);
-typedef HRESULT (__stdcall *PFNWXUSETWINDOWTHEME)(HWND, const wchar_t*, const wchar_t *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEFILENAME)(HTHEME, int, int, int, wchar_t *, int);
-typedef COLORREF(__stdcall *PFNWXUGETTHEMESYSCOLOR)(HTHEME, int);
-typedef HBRUSH  (__stdcall *PFNWXUGETTHEMESYSCOLORBRUSH)(HTHEME, int);
-typedef BOOL    (__stdcall *PFNWXUGETTHEMESYSBOOL)(HTHEME, int);
-typedef int     (__stdcall *PFNWXUGETTHEMESYSSIZE)(HTHEME, int);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSFONT)(HTHEME, int, wxUxThemeFont::Ptr *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSSTRING)(HTHEME, int, wchar_t *, int);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSINT)(HTHEME, int, int *);
-typedef BOOL    (__stdcall *PFNWXUISTHEMEACTIVE)();
-typedef BOOL    (__stdcall *PFNWXUISAPPTHEMED)();
-typedef HTHEME  (__stdcall *PFNWXUGETWINDOWTHEME)(HWND);
-typedef HRESULT (__stdcall *PFNWXUENABLETHEMEDIALOGTEXTURE)(HWND, DWORD);
-typedef BOOL    (__stdcall *PFNWXUISTHEMEDIALOGTEXTUREENABLED)(HWND);
-typedef DWORD   (__stdcall *PFNWXUGETTHEMEAPPPROPERTIES)();
-typedef void    (__stdcall *PFNWXUSETTHEMEAPPPROPERTIES)(DWORD);
-typedef HRESULT (__stdcall *PFNWXUGETCURRENTTHEMENAME)(wchar_t *, int, wchar_t *, int, wchar_t *, int);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEDOCUMENTATIONPROPERTY)(const wchar_t *, const wchar_t *, wchar_t *, int);
-typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEPARENTBACKGROUND)(HWND, HDC, const RECT *);
-typedef HRESULT (__stdcall *PFNWXUENABLETHEMING)(BOOL);
-
-// ----------------------------------------------------------------------------
-// wxUxThemeEngine: provides all theme functions from uxtheme.dll
-// ----------------------------------------------------------------------------
-
-// we always define this class, even if wxUSE_UXTHEME == 0, but we just make it
-// empty in this case -- this allows to use it elsewhere without any #ifdefs
-#if wxUSE_UXTHEME
-    #include "wx/dynlib.h"
-
-    #define wxUX_THEME_DECLARE(type, func) type func;
-#else
-    #define wxUX_THEME_DECLARE(type, func) type func(...) { return 0; }
-#endif
-
-class WXDLLIMPEXP_CORE wxUxThemeEngine
-{
-public:
-    // get the theme engine or NULL if themes are not available
-    static wxUxThemeEngine *Get();
-
-    // get the theme enging or NULL if themes are not available or not used for
-    // this application
-    static wxUxThemeEngine *GetIfActive();
-
-    // all uxtheme.dll functions
-    wxUX_THEME_DECLARE(PFNWXUOPENTHEMEDATA, OpenThemeData)
-    wxUX_THEME_DECLARE(PFNWXUCLOSETHEMEDATA, CloseThemeData)
-    wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEBACKGROUND, DrawThemeBackground)
-    wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEBACKGROUNDEX, DrawThemeBackgroundEx)
-    wxUX_THEME_DECLARE(PFNWXUDRAWTHEMETEXT, DrawThemeText)
-    wxUX_THEME_DECLARE(PFNWXUDRAWTHEMETEXTEX, DrawThemeTextEx)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEBACKGROUNDCONTENTRECT, GetThemeBackgroundContentRect)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEBACKGROUNDEXTENT, GetThemeBackgroundExtent)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEPARTSIZE, GetThemePartSize)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMETEXTEXTENT, GetThemeTextExtent)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMETEXTMETRICS, GetThemeTextMetrics)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEBACKGROUNDREGION, GetThemeBackgroundRegion)
-    wxUX_THEME_DECLARE(PFNWXUHITTESTTHEMEBACKGROUND, HitTestThemeBackground)
-    wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEEDGE, DrawThemeEdge)
-    wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEICON, DrawThemeIcon)
-    wxUX_THEME_DECLARE(PFNWXUISTHEMEPARTDEFINED, IsThemePartDefined)
-    wxUX_THEME_DECLARE(PFNWXUISTHEMEBACKGROUNDPARTIALLYTRANSPARENT, IsThemeBackgroundPartiallyTransparent)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMECOLOR, GetThemeColor)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEMETRIC, GetThemeMetric)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMESTRING, GetThemeString)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEBOOL, GetThemeBool)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEINT, GetThemeInt)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEENUMVALUE, GetThemeEnumValue)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEPOSITION, GetThemePosition)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEFONT, GetThemeFont)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMERECT, GetThemeRect)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEMARGINS, GetThemeMargins)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEINTLIST, GetThemeIntList)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEPROPERTYORIGIN, GetThemePropertyOrigin)
-    wxUX_THEME_DECLARE(PFNWXUSETWINDOWTHEME, SetWindowTheme)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEFILENAME, GetThemeFilename)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSCOLOR, GetThemeSysColor)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSCOLORBRUSH, GetThemeSysColorBrush)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSBOOL, GetThemeSysBool)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSSIZE, GetThemeSysSize)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSFONT, GetThemeSysFont)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSSTRING, GetThemeSysString)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMESYSINT, GetThemeSysInt)
-    wxUX_THEME_DECLARE(PFNWXUISTHEMEACTIVE, IsThemeActive)
-    wxUX_THEME_DECLARE(PFNWXUISAPPTHEMED, IsAppThemed)
-    wxUX_THEME_DECLARE(PFNWXUGETWINDOWTHEME, GetWindowTheme)
-    wxUX_THEME_DECLARE(PFNWXUENABLETHEMEDIALOGTEXTURE, EnableThemeDialogTexture)
-    wxUX_THEME_DECLARE(PFNWXUISTHEMEDIALOGTEXTUREENABLED, IsThemeDialogTextureEnabled)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEAPPPROPERTIES, GetThemeAppProperties)
-    wxUX_THEME_DECLARE(PFNWXUSETTHEMEAPPPROPERTIES, SetThemeAppProperties)
-    wxUX_THEME_DECLARE(PFNWXUGETCURRENTTHEMENAME, GetCurrentThemeName)
-    wxUX_THEME_DECLARE(PFNWXUGETTHEMEDOCUMENTATIONPROPERTY, GetThemeDocumentationProperty)
-    wxUX_THEME_DECLARE(PFNWXUDRAWTHEMEPARENTBACKGROUND, DrawThemeParentBackground)
-    wxUX_THEME_DECLARE(PFNWXUENABLETHEMING, EnableTheming)
-
-private:
-    // construcor is private as only Get() can create us and is also trivial as
-    // everything really happens in Initialize()
-    wxUxThemeEngine() { }
-
-    // destructor is private as only Get() and wxUxThemeModule delete us, it is
-    // not virtual as we're not supposed to be derived from
-    ~wxUxThemeEngine() { }
-
-#if wxUSE_UXTHEME
-    // initialize the theme engine: load the DLL, resolve the functions
-    //
-    // return true if we can be used, false if themes are not available
-    bool Initialize();
-
-
-    // uxtheme.dll
-    wxDynamicLibrary m_dllUxTheme;
-
-
-    // the one and only theme engine, initially NULL
-    static wxUxThemeEngine *ms_themeEngine;
-
-    // this is a bool which initially has the value -1 meaning "unknown"
-    static int ms_isThemeEngineAvailable;
-
-    // it must be able to delete us
-    friend class wxUxThemeModule;
-#endif // wxUSE_UXTHEME
-
-    wxDECLARE_NO_COPY_CLASS(wxUxThemeEngine);
-};
-
-#if wxUSE_UXTHEME
-
-/* static */ inline wxUxThemeEngine *wxUxThemeEngine::GetIfActive()
-{
-    wxUxThemeEngine *engine = Get();
-    return engine && engine->IsAppThemed() && engine->IsThemeActive()
-                ? engine
-                : NULL;
-}
-
-#else // !wxUSE_UXTHEME
-
-/* static */ inline wxUxThemeEngine *wxUxThemeEngine::Get()
-{
-    return NULL;
-}
-
-/* static */ inline wxUxThemeEngine *wxUxThemeEngine::GetIfActive()
-{
-    return NULL;
-}
-
-#endif // wxUSE_UXTHEME/!wxUSE_UXTHEME
+WXDLLIMPEXP_CORE bool wxUxThemeIsActive();
 
 // ----------------------------------------------------------------------------
 // wxUxThemeHandle: encapsulates ::Open/CloseThemeData()
@@ -296,10 +92,7 @@ class wxUxThemeHandle
 public:
     wxUxThemeHandle(const wxWindow *win, const wchar_t *classes)
     {
-        wxUxThemeEngine *engine = wxUxThemeEngine::Get();
-
-        m_hTheme = engine ? (HTHEME)engine->OpenThemeData(GetHwndOf(win), classes)
-                          : NULL;
+        m_hTheme = (HTHEME)::OpenThemeData(GetHwndOf(win), classes);
     }
 
     operator HTHEME() const { return m_hTheme; }
@@ -308,7 +101,7 @@ public:
     {
         if ( m_hTheme )
         {
-            wxUxThemeEngine::Get()->CloseThemeData(m_hTheme);
+            ::CloseThemeData(m_hTheme);
         }
     }
 
diff --git a/include/wx/msw/uxthemep.h b/include/wx/msw/uxthemep.h
deleted file mode 100644
index 3d5123b9cf..0000000000
--- a/include/wx/msw/uxthemep.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Win32 5.1 theme definitions
- *
- * Copyright (C) 2003 Kevin Koltzau
- *
- * Originally written for the Wine project, and issued under
- * the wxWindows licence by kind permission of the author.
- *
- * Licence:     wxWindows licence
- */
-
-#ifndef __WINE_UXTHEME_H
-#define __WINE_UXTHEME_H
-
-#include "wx/msw/wrapcctl.h"
-
-typedef HANDLE HTHEME;
-
-HRESULT WINAPI CloseThemeData(HTHEME hTheme);
-HRESULT WINAPI DrawThemeBackground(HTHEME,HDC,int,int,const RECT*,const RECT*);
-
-#define DTBG_CLIPRECT        0x00000001
-#define DTBG_DRAWSOLID       0x00000002
-#define DTBG_OMITBORDER      0x00000004
-#define DTBG_OMITCONTENT     0x00000008
-#define DTBG_COMPUTINGREGION 0x00000010
-#define DTBG_MIRRORDC        0x00000020
-
-typedef struct _DTBGOPTS {
-    DWORD dwSize;
-    DWORD dwFlags;
-    RECT rcClip;
-} DTBGOPTS, *PDTBGOPTS;
-
-HRESULT WINAPI DrawThemeBackgroundEx(HTHEME,HDC,int,int,const RECT*,
-                                     const DTBGOPTS*);
-HRESULT WINAPI DrawThemeEdge(HTHEME,HDC,int,int,const RECT*,UINT,UINT,
-                             RECT*);
-HRESULT WINAPI DrawThemeIcon(HTHEME,HDC,int,int,const RECT*,HIMAGELIST,int);
-HRESULT WINAPI DrawThemeParentBackground(HWND,HDC,RECT*);
-
-#define DTT_GRAYED      0x1
-
-HRESULT WINAPI DrawThemeText(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,DWORD,
-                             const RECT*);
-
-#define ETDT_DISABLE       0x00000001
-#define ETDT_ENABLE        0x00000002
-#define ETDT_USETABTEXTURE 0x00000004
-#define ETDT_ENABLETAB     (ETDT_ENABLE|ETDT_USETABTEXTURE)
-
-HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD);
-HRESULT WINAPI EnableTheming(BOOL);
-HRESULT WINAPI GetCurrentThemeName(LPWSTR,int,LPWSTR,int,LPWSTR,int);
-
-#define STAP_ALLOW_NONCLIENT    (1<<0)
-#define STAP_ALLOW_CONTROLS     (1<<1)
-#define STAP_ALLOW_WEBCONTENT   (1<<2)
-
-DWORD WINAPI GetThemeAppProperties(void);
-HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME,HDC,int,int,
-                                             const RECT*,RECT*);
-HRESULT WINAPI GetThemeBackgroundExtent(HTHEME,HDC,int,int,const RECT*,RECT*);
-HRESULT WINAPI GetThemeBackgroundRegion(HTHEME,HDC,int,int,const RECT*,HRGN*);
-HRESULT WINAPI GetThemeBool(HTHEME,int,int,int,BOOL*);
-HRESULT WINAPI GetThemeColor(HTHEME,int,int,int,COLORREF*);
-
-#if defined(__GNUC__)
-# define SZ_THDOCPROP_DISPLAYNAME   (const WCHAR []){ 'D','i','s','p','l','a','y','N','a','m','e',0 }
-# define SZ_THDOCPROP_CANONICALNAME (const WCHAR []){ 'T','h','e','m','e','N','a','m','e',0 }
-# define SZ_THDOCPROP_TOOLTIP       (const WCHAR []){ 'T','o','o','l','T','i','p',0 }
-# define SZ_THDOCPROP_AUTHOR        (const WCHAR []){ 'a','u','t','h','o','r',0 }
-#else /* lif defined(_MSC_VER) */
-# define SZ_THDOCPROP_DISPLAYNAME   L"DisplayName"
-# define SZ_THDOCPROP_CANONICALNAME L"ThemeName"
-# define SZ_THDOCPROP_TOOLTIP       L"ToolTip"
-# define SZ_THDOCPROP_AUTHOR        L"author"
-/*
-#else
-static const WCHAR SZ_THDOCPROP_DISPLAYNAME[] =   { 'D','i','s','p','l','a','y','N','a','m','e',0 };
-static const WCHAR SZ_THDOCPROP_CANONICALNAME[] = { 'T','h','e','m','e','N','a','m','e',0 };
-static const WCHAR SZ_THDOCPROP_TOOLTIP[] =       { 'T','o','o','l','T','i','p',0 };
-static const WCHAR SZ_THDOCPROP_AUTHOR[] =        { 'a','u','t','h','o','r',0 };
-*/
-#endif
-
-HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR,LPCWSTR,LPWSTR,int);
-HRESULT WINAPI GetThemeEnumValue(HTHEME,int,int,int,int*);
-HRESULT WINAPI GetThemeFilename(HTHEME,int,int,int,LPWSTR,int);
-HRESULT WINAPI GetThemeFont(HTHEME,HDC,int,int,int,LOGFONTW*);
-HRESULT WINAPI GetThemeInt(HTHEME,int,int,int,int*);
-
-#define MAX_INTLIST_COUNT 10
-typedef struct _INTLIST {
-    int iValueCount;
-    int iValues[MAX_INTLIST_COUNT];
-} INTLIST, *PINTLIST;
-
-HRESULT WINAPI GetThemeIntList(HTHEME,int,int,int,INTLIST*);
-
-typedef struct _MARGINS {
-    int cxLeftWidth;
-    int cxRightWidth;
-    int cyTopHeight;
-    int cyBottomHeight;
-} MARGINS, *PMARGINS;
-
-HRESULT WINAPI GetThemeMargins(HTHEME,HDC,int,int,int,RECT*,MARGINS*);
-HRESULT WINAPI GetThemeMetric(HTHEME,HDC,int,int,int,int*);
-
-typedef enum {
-    TS_MIN,
-    TS_TRUE,
-    TS_DRAW
-} THEMESIZE;
-
-HRESULT WINAPI GetThemePartSize(HTHEME,HDC,int,int,RECT*,THEMESIZE,SIZE*);
-HRESULT WINAPI GetThemePosition(HTHEME,int,int,int,POINT*);
-
-typedef enum {
-    PO_STATE,
-    PO_PART,
-    PO_CLASS,
-    PO_GLOBAL,
-    PO_NOTFOUND
-} PROPERTYORIGIN;
-
-HRESULT WINAPI GetThemePropertyOrigin(HTHEME,int,int,int,PROPERTYORIGIN*);
-HRESULT WINAPI GetThemeRect(HTHEME,int,int,int,RECT*);
-HRESULT WINAPI GetThemeString(HTHEME,int,int,int,LPWSTR,int);
-BOOL WINAPI GetThemeSysBool(HTHEME,int);
-COLORREF WINAPI GetThemeSysColor(HTHEME,int);
-HBRUSH WINAPI GetThemeSysColorBrush(HTHEME,int);
-HRESULT WINAPI GetThemeSysFont(HTHEME,int,LOGFONTW*);
-HRESULT WINAPI GetThemeSysInt(HTHEME,int,int*);
-int WINAPI GetThemeSysSize(HTHEME,int);
-HRESULT WINAPI GetThemeSysString(HTHEME,int,LPWSTR,int);
-HRESULT WINAPI GetThemeTextExtent(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,
-                                  const RECT*,RECT*);
-HRESULT WINAPI GetThemeTextMetrics(HTHEME,HDC,int,int,TEXTMETRICW*);
-HTHEME WINAPI GetWindowTheme(HWND);
-
-#define HTTB_BACKGROUNDSEG          0x0000
-#define HTTB_FIXEDBORDER            0x0002
-#define HTTB_CAPTION                0x0004
-#define HTTB_RESIZINGBORDER_LEFT    0x0010
-#define HTTB_RESIZINGBORDER_TOP     0x0020
-#define HTTB_RESIZINGBORDER_RIGHT   0x0040
-#define HTTB_RESIZINGBORDER_BOTTOM  0x0080
-#define HTTB_RESIZINGBORDER \
-    (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|\
-     HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM)
-#define HTTB_SIZINGTEMPLATE         0x0100
-#define HTTB_SYSTEMSIZINGMARGINS    0x0200
-
-HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*,
-                                      HRGN,POINT,WORD*);
-BOOL WINAPI IsAppThemed(void);
-BOOL WINAPI IsThemeActive(void);
-BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int);
-BOOL WINAPI IsThemeDialogTextureEnabled(void);
-BOOL WINAPI IsThemePartDefined(HTHEME,int,int);
-HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);
-void WINAPI SetThemeAppProperties(DWORD);
-HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);
-
-
-#endif
-
diff --git a/samples/access/makefile.bcc b/samples/access/makefile.bcc
index ce41305742..275ab535ef 100644
--- a/samples/access/makefile.bcc
+++ b/samples/access/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS)  $(OBJS)\accesstest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_sample.res
+	c0w32.obj $(ACCESSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\accesstest_sample.res
 |
 
 $(OBJS)\accesstest_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc
index c33c0d83eb..164157970d 100644
--- a/samples/access/makefile.gcc
+++ b/samples/access/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe
 
 $(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_sample_rc.o
-	$(CXX) -o $@ $(ACCESSTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(ACCESSTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\accesstest_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/animate/makefile.bcc b/samples/animate/makefile.bcc
index 628dfa04d2..4620304fe2 100644
--- a/samples/animate/makefile.bcc
+++ b/samples/animate/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\anitest.exe: $(ANITEST_OBJECTS)  $(OBJS)\anitest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res
+	c0w32.obj $(ANITEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\anitest_sample.res
 |
 
 catalog: 
diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc
index 026e185023..dec12d9f27 100644
--- a/samples/animate/makefile.gcc
+++ b/samples/animate/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe
 
 $(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample_rc.o
-	$(CXX) -o $@ $(ANITEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(ANITEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 catalog: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/artprov/makefile.bcc b/samples/artprov/makefile.bcc
index 077fb197aa..1088ec82bf 100644
--- a/samples/artprov/makefile.bcc
+++ b/samples/artprov/makefile.bcc
@@ -229,7 +229,7 @@ clean:
 
 $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS)  $(OBJS)\arttest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_sample.res
+	c0w32.obj $(ARTTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\arttest_sample.res
 |
 
 $(OBJS)\arttest_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc
index 2a16db8950..cb30a37f45 100644
--- a/samples/artprov/makefile.gcc
+++ b/samples/artprov/makefile.gcc
@@ -219,7 +219,7 @@ clean:
 	-if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe
 
 $(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample_rc.o
-	$(CXX) -o $@ $(ARTTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(ARTTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\arttest_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/aui/makefile.bcc b/samples/aui/makefile.bcc
index 473719a270..4f4b27bf47 100644
--- a/samples/aui/makefile.bcc
+++ b/samples/aui/makefile.bcc
@@ -244,7 +244,7 @@ clean:
 
 $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS)  $(OBJS)\auidemo_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res
+	c0w32.obj $(AUIDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\auidemo_sample.res
 |
 
 $(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc
index 6ed67b1f6f..8c8463b7f9 100644
--- a/samples/aui/makefile.gcc
+++ b/samples/aui/makefile.gcc
@@ -234,7 +234,7 @@ clean:
 	-if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe
 
 $(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample_rc.o
-	$(CXX) -o $@ $(AUIDEMO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(AUIDEMO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\auidemo_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc
index 2fac3f428e..a9d3ca3c57 100644
--- a/samples/calendar/makefile.bcc
+++ b/samples/calendar/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS)  $(OBJS)\calendar_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_sample.res
+	c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\calendar_sample.res
 |
 
 $(OBJS)\calendar_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc
index 864e250986..c76df1c53b 100644
--- a/samples/calendar/makefile.gcc
+++ b/samples/calendar/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe
 
 $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_sample_rc.o
-	$(CXX) -o $@ $(CALENDAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(CALENDAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\calendar_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/caret/makefile.bcc b/samples/caret/makefile.bcc
index ab429db739..8e24bced84 100644
--- a/samples/caret/makefile.bcc
+++ b/samples/caret/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\caret.exe: $(CARET_OBJECTS)  $(OBJS)\caret_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_sample.res
+	c0w32.obj $(CARET_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\caret_sample.res
 |
 
 $(OBJS)\caret_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc
index 3bc309a808..c640d97a16 100644
--- a/samples/caret/makefile.gcc
+++ b/samples/caret/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe
 
 $(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_sample_rc.o
-	$(CXX) -o $@ $(CARET_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(CARET_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\caret_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/clipboard/makefile.bcc b/samples/clipboard/makefile.bcc
index 76f135634a..5998c83e98 100644
--- a/samples/clipboard/makefile.bcc
+++ b/samples/clipboard/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS)  $(OBJS)\clipboard_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_sample.res
+	c0w32.obj $(CLIPBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\clipboard_sample.res
 |
 
 $(OBJS)\clipboard_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc
index dfdc7d1645..7c2cbb07fe 100644
--- a/samples/clipboard/makefile.gcc
+++ b/samples/clipboard/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe
 
 $(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_sample_rc.o
-	$(CXX) -o $@ $(CLIPBOARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(CLIPBOARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\clipboard_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/collpane/makefile.bcc b/samples/collpane/makefile.bcc
index d4cd5b7539..9bfcf19416 100644
--- a/samples/collpane/makefile.bcc
+++ b/samples/collpane/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS)  $(OBJS)\collpane_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(COLLPANE_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\collpane_sample.res
+	c0w32.obj $(COLLPANE_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\collpane_sample.res
 |
 
 $(OBJS)\collpane_collpane.obj: .\collpane.cpp
diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc
index dfe1d75562..23ff544cf5 100644
--- a/samples/collpane/makefile.gcc
+++ b/samples/collpane/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe
 
 $(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample_rc.o
-	$(CXX) -o $@ $(COLLPANE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(COLLPANE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\collpane_collpane.o: ./collpane.cpp
 	$(CXX) -c -o $@ $(COLLPANE_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/combo/makefile.bcc b/samples/combo/makefile.bcc
index 5af539b793..fab83da5e1 100644
--- a/samples/combo/makefile.bcc
+++ b/samples/combo/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\combo.exe: $(COMBO_OBJECTS)  $(OBJS)\combo_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(COMBO_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\combo_sample.res
+	c0w32.obj $(COMBO_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\combo_sample.res
 |
 
 data: 
diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc
index 834855271b..eebb17631e 100644
--- a/samples/combo/makefile.gcc
+++ b/samples/combo/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe
 
 $(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample_rc.o
-	$(CXX) -o $@ $(COMBO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(COMBO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/config/makefile.bcc b/samples/config/makefile.bcc
index 7ff505cda0..cf6f3ed978 100644
--- a/samples/config/makefile.bcc
+++ b/samples/config/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS)  $(OBJS)\conftest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_sample.res
+	c0w32.obj $(CONFTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\conftest_sample.res
 |
 
 $(OBJS)\conftest_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc
index 9476d2eeec..fecaab0587 100644
--- a/samples/config/makefile.gcc
+++ b/samples/config/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe
 
 $(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_sample_rc.o
-	$(CXX) -o $@ $(CONFTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(CONFTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\conftest_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc
index ea3692fb1c..6fec7a44f9 100644
--- a/samples/console/makefile.bcc
+++ b/samples/console/makefile.bcc
@@ -192,7 +192,7 @@ clean:
 
 $(OBJS)\console.exe: $(CONSOLE_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0x32.obj $(CONSOLE_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+	c0x32.obj $(CONSOLE_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
 |
 
 $(OBJS)\console_console.obj: .\console.cpp
diff --git a/samples/console/makefile.gcc b/samples/console/makefile.gcc
index 72e8c298a9..4c0ba4cd0e 100644
--- a/samples/console/makefile.gcc
+++ b/samples/console/makefile.gcc
@@ -179,7 +179,7 @@ clean:
 	-if exist $(OBJS)\console.exe del $(OBJS)\console.exe
 
 $(OBJS)\console.exe: $(CONSOLE_OBJECTS)
-	$(CXX) -o $@ $(CONSOLE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(CONSOLE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\console_console.o: ./console.cpp
 	$(CXX) -c -o $@ $(CONSOLE_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/dataview/makefile.bcc b/samples/dataview/makefile.bcc
index bcacf4bb00..3524569234 100644
--- a/samples/dataview/makefile.bcc
+++ b/samples/dataview/makefile.bcc
@@ -233,7 +233,7 @@ clean:
 
 $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS)  $(OBJS)\dataview_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_sample.res
+	c0w32.obj $(DATAVIEW_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dataview_sample.res
 |
 
 $(OBJS)\dataview_dataview.obj: .\dataview.cpp
diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc
index fa65cbfaed..101c7ff350 100644
--- a/samples/dataview/makefile.gcc
+++ b/samples/dataview/makefile.gcc
@@ -223,7 +223,7 @@ clean:
 	-if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe
 
 $(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample_rc.o
-	$(CXX) -o $@ $(DATAVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(DATAVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\dataview_dataview.o: ./dataview.cpp
 	$(CXX) -c -o $@ $(DATAVIEW_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/debugrpt/makefile.bcc b/samples/debugrpt/makefile.bcc
index cc1a6c00ba..128e0ef7ab 100644
--- a/samples/debugrpt/makefile.bcc
+++ b/samples/debugrpt/makefile.bcc
@@ -236,7 +236,7 @@ clean:
 
 $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS)  $(OBJS)\debugrpt_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DEBUGRPT_OBJECTS),$@,, $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\debugrpt_sample.res
+	c0w32.obj $(DEBUGRPT_OBJECTS),$@,, $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\debugrpt_sample.res
 |
 
 $(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc
index bd2df19b50..cc33187e6d 100644
--- a/samples/debugrpt/makefile.gcc
+++ b/samples/debugrpt/makefile.gcc
@@ -226,7 +226,7 @@ clean:
 	-if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe
 
 $(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample_rc.o
-	$(CXX) -o $@ $(DEBUGRPT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(DEBUGRPT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_QA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\debugrpt_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 61bf3a6765..95190bf0a5 100644
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -240,7 +240,7 @@ clean:
 
 $(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS)  $(OBJS)\dialogs_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_sample.res
+	c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_sample.res
 |
 
 data: 
diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index ebcdb7c06a..a3f1bef975 100644
--- a/samples/dialogs/makefile.gcc
+++ b/samples/dialogs/makefile.gcc
@@ -232,7 +232,7 @@ clean:
 	-if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
 
 $(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample_rc.o
-	$(CXX) -o $@ $(DIALOGS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(DIALOGS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/dialup/makefile.bcc b/samples/dialup/makefile.bcc
index bb706b7ac9..954bd7f431 100644
--- a/samples/dialup/makefile.bcc
+++ b/samples/dialup/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\nettest.exe: $(NETTEST_OBJECTS)  $(OBJS)\nettest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(NETTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_sample.res
+	c0w32.obj $(NETTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nettest_sample.res
 |
 
 $(OBJS)\nettest_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc
index f63ea26360..f0685888a4 100644
--- a/samples/dialup/makefile.gcc
+++ b/samples/dialup/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe
 
 $(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_sample_rc.o
-	$(CXX) -o $@ $(NETTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(NETTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\nettest_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/display/makefile.bcc b/samples/display/makefile.bcc
index b31ca6b3c1..95e8b48898 100644
--- a/samples/display/makefile.bcc
+++ b/samples/display/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\display.exe: $(DISPLAY_OBJECTS)  $(OBJS)\display_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DISPLAY_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\display_sample.res
+	c0w32.obj $(DISPLAY_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\display_sample.res
 |
 
 $(OBJS)\display_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc
index 7c970200d4..15f9d4454c 100644
--- a/samples/display/makefile.gcc
+++ b/samples/display/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\display.exe del $(OBJS)\display.exe
 
 $(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample_rc.o
-	$(CXX) -o $@ $(DISPLAY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(DISPLAY_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\display_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/dll/makefile.bcc b/samples/dll/makefile.bcc
index 68ab07796a..de1c0da19d 100644
--- a/samples/dll/makefile.bcc
+++ b/samples/dll/makefile.bcc
@@ -256,14 +256,14 @@ clean:
 
 $(OBJS)\my_dll.dll: $(MY_DLL_OBJECTS)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(MY_DLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
+	c0d32.obj $(MY_DLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
 |
 	implib -f $(OBJS)\my_dll $@
 
 !if "$(SHARED)" == "0"
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS)  $(OBJS)\wx_exe_sample.res $(OBJS)\my_dll.dll
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0w32.obj $(WX_EXE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\my_dll.lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\wx_exe_sample.res
+	c0w32.obj $(WX_EXE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\my_dll.lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\wx_exe_sample.res
 |
 !endif
 
diff --git a/samples/dll/makefile.gcc b/samples/dll/makefile.gcc
index 2d2b055fb0..dc0502f9e1 100644
--- a/samples/dll/makefile.gcc
+++ b/samples/dll/makefile.gcc
@@ -238,11 +238,11 @@ clean:
 	-if exist $(OBJS)\sdk_exe.exe del $(OBJS)\sdk_exe.exe
 
 $(OBJS)\my_dll.dll: $(MY_DLL_OBJECTS)
-	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MY_DLL_OBJECTS)  -Wl,--out-implib=$(OBJS)\libmy_dll.a $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MY_DLL_OBJECTS)  -Wl,--out-implib=$(OBJS)\libmy_dll.a $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 ifeq ($(SHARED),0)
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS) $(OBJS)\wx_exe_sample_rc.o $(OBJS)\my_dll.dll
-	$(CXX) -o $@ $(WX_EXE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\libmy_dll.a $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WX_EXE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\libmy_dll.a $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\sdk_exe.exe: $(SDK_EXE_OBJECTS) $(OBJS)\my_dll.dll
diff --git a/samples/dnd/makefile.bcc b/samples/dnd/makefile.bcc
index 4a514a4a45..51b6f4b835 100644
--- a/samples/dnd/makefile.bcc
+++ b/samples/dnd/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\dnd.exe: $(DND_OBJECTS)  $(OBJS)\dnd_dnd.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DND_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dnd_dnd.res
+	c0w32.obj $(DND_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dnd_dnd.res
 |
 
 data: 
diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc
index 85e91ad59b..5879de67e7 100644
--- a/samples/dnd/makefile.gcc
+++ b/samples/dnd/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe
 
 $(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd_rc.o
-	$(CXX) -o $@ $(DND_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(DND_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc
index 9bc0a3b5d0..b7a3be7a76 100644
--- a/samples/docview/makefile.bcc
+++ b/samples/docview/makefile.bcc
@@ -230,7 +230,7 @@ clean:
 
 $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS)  $(OBJS)\docview_docview.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res
+	c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res
 |
 
 $(OBJS)\docview_docview.obj: .\docview.cpp
diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc
index 28fe0ccb9a..d07248d8a2 100644
--- a/samples/docview/makefile.gcc
+++ b/samples/docview/makefile.gcc
@@ -220,7 +220,7 @@ clean:
 	-if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
 
 $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview_rc.o
-	$(CXX) -o $@ $(DOCVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(DOCVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\docview_docview.o: ./docview.cpp
 	$(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/dragimag/makefile.bcc b/samples/dragimag/makefile.bcc
index 9b521efcb2..4ac2da81d3 100644
--- a/samples/dragimag/makefile.bcc
+++ b/samples/dragimag/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS)  $(OBJS)\dragimag_dragimag.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DRAGIMAG_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dragimag_dragimag.res
+	c0w32.obj $(DRAGIMAG_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dragimag_dragimag.res
 |
 
 data: 
diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc
index 4a4286d519..956f37a35a 100644
--- a/samples/dragimag/makefile.gcc
+++ b/samples/dragimag/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe
 
 $(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag_rc.o
-	$(CXX) -o $@ $(DRAGIMAG_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(DRAGIMAG_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/drawing/makefile.bcc b/samples/drawing/makefile.bcc
index 4d6d2c187f..47f2e4e7c5 100644
--- a/samples/drawing/makefile.bcc
+++ b/samples/drawing/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\drawing.exe: $(DRAWING_OBJECTS)  $(OBJS)\drawing_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_sample.res
+	c0w32.obj $(DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\drawing_sample.res
 |
 
 data: 
diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc
index 4f4209ad11..fefce55548 100644
--- a/samples/drawing/makefile.gcc
+++ b/samples/drawing/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe
 
 $(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_sample_rc.o
-	$(CXX) -o $@ $(DRAWING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(DRAWING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/erase/makefile.bcc b/samples/erase/makefile.bcc
index 39cee15fee..a6d7095c74 100644
--- a/samples/erase/makefile.bcc
+++ b/samples/erase/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\erase.exe: $(ERASE_OBJECTS)  $(OBJS)\erase_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(ERASE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_sample.res
+	c0w32.obj $(ERASE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\erase_sample.res
 |
 
 $(OBJS)\erase_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc
index 498f4521a8..8be5ff80a3 100644
--- a/samples/erase/makefile.gcc
+++ b/samples/erase/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe
 
 $(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_sample_rc.o
-	$(CXX) -o $@ $(ERASE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(ERASE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\erase_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/event/makefile.bcc b/samples/event/makefile.bcc
index eb9481716f..b73990856c 100644
--- a/samples/event/makefile.bcc
+++ b/samples/event/makefile.bcc
@@ -229,7 +229,7 @@ clean:
 
 $(OBJS)\event.exe: $(EVENT_OBJECTS)  $(OBJS)\event_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(EVENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_sample.res
+	c0w32.obj $(EVENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\event_sample.res
 |
 
 $(OBJS)\event_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc
index 105c791901..c689b86707 100644
--- a/samples/event/makefile.gcc
+++ b/samples/event/makefile.gcc
@@ -219,7 +219,7 @@ clean:
 	-if exist $(OBJS)\event.exe del $(OBJS)\event.exe
 
 $(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_sample_rc.o
-	$(CXX) -o $@ $(EVENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(EVENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\event_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/except/makefile.bcc b/samples/except/makefile.bcc
index d480321d83..6804598fff 100644
--- a/samples/except/makefile.bcc
+++ b/samples/except/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\except.exe: $(EXCEPT_OBJECTS)  $(OBJS)\except_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(EXCEPT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\except_sample.res
+	c0w32.obj $(EXCEPT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\except_sample.res
 |
 
 $(OBJS)\except_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc
index 59b10a279f..7c5216968a 100644
--- a/samples/except/makefile.gcc
+++ b/samples/except/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\except.exe del $(OBJS)\except.exe
 
 $(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample_rc.o
-	$(CXX) -o $@ $(EXCEPT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(EXCEPT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\except_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc
index 46585c4db6..a3d9470249 100644
--- a/samples/exec/makefile.bcc
+++ b/samples/exec/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\exec.exe: $(EXEC_OBJECTS)  $(OBJS)\exec_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(EXEC_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\exec_sample.res
+	c0w32.obj $(EXEC_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\exec_sample.res
 |
 
 $(OBJS)\exec_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc
index 23a28020ec..65a84bfd4c 100644
--- a/samples/exec/makefile.gcc
+++ b/samples/exec/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe
 
 $(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample_rc.o
-	$(CXX) -o $@ $(EXEC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(EXEC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\exec_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/font/makefile.bcc b/samples/font/makefile.bcc
index 7d8249c264..1259e50616 100644
--- a/samples/font/makefile.bcc
+++ b/samples/font/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\font.exe: $(FONT_OBJECTS)  $(OBJS)\font_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(FONT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_sample.res
+	c0w32.obj $(FONT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\font_sample.res
 |
 
 data: 
diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc
index db2b679db0..4082a98966 100644
--- a/samples/font/makefile.gcc
+++ b/samples/font/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\font.exe del $(OBJS)\font.exe
 
 $(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_sample_rc.o
-	$(CXX) -o $@ $(FONT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(FONT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/fswatcher/makefile.bcc b/samples/fswatcher/makefile.bcc
index 50415ff8da..f0af45993d 100644
--- a/samples/fswatcher/makefile.bcc
+++ b/samples/fswatcher/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\fswatcher.exe: $(FSWATCHER_OBJECTS)  $(OBJS)\fswatcher_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(FSWATCHER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fswatcher_sample.res
+	c0w32.obj $(FSWATCHER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\fswatcher_sample.res
 |
 
 $(OBJS)\fswatcher_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/fswatcher/makefile.gcc b/samples/fswatcher/makefile.gcc
index 2c35167715..0bf7551253 100644
--- a/samples/fswatcher/makefile.gcc
+++ b/samples/fswatcher/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\fswatcher.exe del $(OBJS)\fswatcher.exe
 
 $(OBJS)\fswatcher.exe: $(FSWATCHER_OBJECTS) $(OBJS)\fswatcher_sample_rc.o
-	$(CXX) -o $@ $(FSWATCHER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(FSWATCHER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\fswatcher_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc
index 93a11bf585..a3d2b5d9b2 100644
--- a/samples/grid/makefile.bcc
+++ b/samples/grid/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\grid.exe: $(GRID_OBJECTS)  $(OBJS)\grid_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(GRID_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\grid_sample.res
+	c0w32.obj $(GRID_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\grid_sample.res
 |
 
 $(OBJS)\grid_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc
index ebdec45674..17d7dd24e5 100644
--- a/samples/grid/makefile.gcc
+++ b/samples/grid/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe
 
 $(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_sample_rc.o
-	$(CXX) -o $@ $(GRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(GRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\grid_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc
index 390126e43c..bdc2ab23d6 100644
--- a/samples/help/makefile.bcc
+++ b/samples/help/makefile.bcc
@@ -236,7 +236,7 @@ clean:
 
 $(OBJS)\help.exe: $(HELP_OBJECTS)  $(OBJS)\help_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_sample.res
+	c0w32.obj $(HELP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\help_sample.res
 |
 
 data: 
diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index e318d753ac..18d90b7e2c 100644
--- a/samples/help/makefile.gcc
+++ b/samples/help/makefile.gcc
@@ -226,7 +226,7 @@ clean:
 	-if exist $(OBJS)\help.exe del $(OBJS)\help.exe
 
 $(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_sample_rc.o
-	$(CXX) -o $@ $(HELP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(HELP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/htlbox/makefile.bcc b/samples/htlbox/makefile.bcc
index e2ee1599c3..249ce68137 100644
--- a/samples/htlbox/makefile.bcc
+++ b/samples/htlbox/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS)  $(OBJS)\htlbox_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_sample.res
+	c0w32.obj $(HTLBOX_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htlbox_sample.res
 |
 
 $(OBJS)\htlbox_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc
index 9532dbf68c..f86bd19114 100644
--- a/samples/htlbox/makefile.gcc
+++ b/samples/htlbox/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe
 
 $(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_sample_rc.o
-	$(CXX) -o $@ $(HTLBOX_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(HTLBOX_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\htlbox_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/html/about/makefile.bcc b/samples/html/about/makefile.bcc
index 9484e46d4c..43b99adeca 100644
--- a/samples/html/about/makefile.bcc
+++ b/samples/html/about/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\about.exe: $(ABOUT_OBJECTS)  $(OBJS)\about_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(ABOUT_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_sample.res
+	c0w32.obj $(ABOUT_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\about_sample.res
 |
 
 data_files: 
diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc
index 7ed5b99d9d..ed953003be 100644
--- a/samples/html/about/makefile.gcc
+++ b/samples/html/about/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\about.exe del $(OBJS)\about.exe
 
 $(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_sample_rc.o
-	$(CXX) -o $@ $(ABOUT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(ABOUT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data_files: 
 	if not exist $(OBJS)\data mkdir $(OBJS)\data
diff --git a/samples/html/help/makefile.bcc b/samples/html/help/makefile.bcc
index b0137584e5..cc49c04206 100644
--- a/samples/html/help/makefile.bcc
+++ b/samples/html/help/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS)  $(OBJS)\htmlhelp_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_sample.res
+	c0w32.obj $(HTMLHELP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlhelp_sample.res
 |
 
 data: 
diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc
index 4b689ed534..0e75133f8e 100644
--- a/samples/html/help/makefile.gcc
+++ b/samples/html/help/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe
 
 $(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_sample_rc.o
-	$(CXX) -o $@ $(HTMLHELP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(HTMLHELP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles
diff --git a/samples/html/helpview/makefile.bcc b/samples/html/helpview/makefile.bcc
index 59aaa33399..0be78c6a18 100644
--- a/samples/html/helpview/makefile.bcc
+++ b/samples/html/helpview/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_sample.res
+	c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_sample.res
 |
 
 data: 
diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index bd55b7707e..3f24e71fd1 100644
--- a/samples/html/helpview/makefile.gcc
+++ b/samples/html/helpview/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
 
 $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_sample_rc.o
-	$(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc
index 964a37b4f5..4fbc685102 100644
--- a/samples/html/printing/makefile.bcc
+++ b/samples/html/printing/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS)  $(OBJS)\htmlprinting_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_sample.res
+	c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_sample.res
 |
 
 data: 
diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc
index 047ae980f1..9b2d9157a2 100644
--- a/samples/html/printing/makefile.gcc
+++ b/samples/html/printing/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe
 
 $(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_sample_rc.o
-	$(CXX) -o $@ $(HTMLPRINTING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(HTMLPRINTING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/test/makefile.bcc b/samples/html/test/makefile.bcc
index 781041f5b9..b731585504 100644
--- a/samples/html/test/makefile.bcc
+++ b/samples/html/test/makefile.bcc
@@ -236,7 +236,7 @@ clean:
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)  $(OBJS)\test_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_sample.res
+	c0w32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\test_sample.res
 |
 
 data: 
diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc
index 88efccc04d..39b76549bb 100644
--- a/samples/html/test/makefile.gcc
+++ b/samples/html/test/makefile.gcc
@@ -226,7 +226,7 @@ clean:
 	-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
 
 $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample_rc.o
-	$(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/virtual/makefile.bcc b/samples/html/virtual/makefile.bcc
index 7bd3c5fc9d..f28c2a3f02 100644
--- a/samples/html/virtual/makefile.bcc
+++ b/samples/html/virtual/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS)  $(OBJS)\virtual_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_sample.res
+	c0w32.obj $(VIRTUAL_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\virtual_sample.res
 |
 
 data: 
diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc
index d70212c306..30f5425fbc 100644
--- a/samples/html/virtual/makefile.gcc
+++ b/samples/html/virtual/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe
 
 $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_sample_rc.o
-	$(CXX) -o $@ $(VIRTUAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(VIRTUAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/widget/makefile.bcc b/samples/html/widget/makefile.bcc
index 1e04c8e799..bfa09e5a6f 100644
--- a/samples/html/widget/makefile.bcc
+++ b/samples/html/widget/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\widget.exe: $(WIDGET_OBJECTS)  $(OBJS)\widget_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(WIDGET_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_sample.res
+	c0w32.obj $(WIDGET_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widget_sample.res
 |
 
 data: 
diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc
index eeba506dc2..03b78a8228 100644
--- a/samples/html/widget/makefile.gcc
+++ b/samples/html/widget/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe
 
 $(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_sample_rc.o
-	$(CXX) -o $@ $(WIDGET_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WIDGET_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/html/zip/makefile.bcc b/samples/html/zip/makefile.bcc
index a7c0931eb3..54ba40aafa 100644
--- a/samples/html/zip/makefile.bcc
+++ b/samples/html/zip/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\zip.exe: $(ZIP_OBJECTS)  $(OBJS)\zip_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(ZIP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_sample.res
+	c0w32.obj $(ZIP_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\zip_sample.res
 |
 
 data: 
diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc
index b95713925d..208c74a050 100644
--- a/samples/html/zip/makefile.gcc
+++ b/samples/html/zip/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe
 
 $(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_sample_rc.o
-	$(CXX) -o $@ $(ZIP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(ZIP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc
index 1f68ea8194..57286539ae 100644
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -229,7 +229,7 @@ clean:
 
 $(OBJS)\image.exe: $(IMAGE_OBJECTS)  $(OBJS)\image_image.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res
+	c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res
 |
 
 data: 
diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc
index 755fe5fca1..daead73f9a 100644
--- a/samples/image/makefile.gcc
+++ b/samples/image/makefile.gcc
@@ -219,7 +219,7 @@ clean:
 	-if exist $(OBJS)\image.exe del $(OBJS)\image.exe
 
 $(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image_rc.o
-	$(CXX) -o $@ $(IMAGE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(IMAGE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/internat/makefile.bcc b/samples/internat/makefile.bcc
index 19ec3e705a..fa8a0724ef 100644
--- a/samples/internat/makefile.bcc
+++ b/samples/internat/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\internat.exe: $(INTERNAT_OBJECTS)  $(OBJS)\internat_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\internat_sample.res
+	c0w32.obj $(INTERNAT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\internat_sample.res
 |
 
 ar: 
diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc
index 9c0bb1fcbc..ff784f1903 100644
--- a/samples/internat/makefile.gcc
+++ b/samples/internat/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe
 
 $(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_sample_rc.o
-	$(CXX) -o $@ $(INTERNAT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(INTERNAT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 ar: 
 	if not exist $(OBJS)\ar mkdir $(OBJS)\ar
diff --git a/samples/ipc/makefile.bcc b/samples/ipc/makefile.bcc
index 40e063d3ea..07b4acbe36 100644
--- a/samples/ipc/makefile.bcc
+++ b/samples/ipc/makefile.bcc
@@ -287,25 +287,25 @@ clean:
 !if "$(USE_GUI)" == "1"
 $(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS)  $(OBJS)\ipcclient_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0w32.obj $(IPCCLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcclient_sample.res
+	c0w32.obj $(IPCCLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcclient_sample.res
 |
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS)  $(OBJS)\ipcserver_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0w32.obj $(IPCSERVER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcserver_sample.res
+	c0w32.obj $(IPCSERVER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\ipcserver_sample.res
 |
 !endif
 
 $(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(BASEIPCCLIENT_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+	c0x32.obj $(BASEIPCCLIENT_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 
 $(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(BASEIPCSERVER_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+	c0x32.obj $(BASEIPCSERVER_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 
 $(OBJS)\ipcclient_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc
index 42385f8689..d81ac94a99 100644
--- a/samples/ipc/makefile.gcc
+++ b/samples/ipc/makefile.gcc
@@ -266,19 +266,19 @@ clean:
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample_rc.o
-	$(CXX) -o $@ $(IPCCLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(IPCCLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample_rc.o
-	$(CXX) -o $@ $(IPCSERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(IPCSERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS)
-	$(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS)
-	$(CXX) -o $@ $(BASEIPCSERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(BASEIPCSERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\ipcclient_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc
index cc808666b6..95be09737d 100644
--- a/samples/joytest/makefile.bcc
+++ b/samples/joytest/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\joytest.exe: $(JOYTEST_OBJECTS)  $(OBJS)\joytest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(JOYTEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\joytest_sample.res
+	c0w32.obj $(JOYTEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\joytest_sample.res
 |
 
 $(OBJS)\joytest_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc
index df95730908..f0b35596d3 100644
--- a/samples/joytest/makefile.gcc
+++ b/samples/joytest/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe
 
 $(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_sample_rc.o
-	$(CXX) -o $@ $(JOYTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(JOYTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\joytest_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc
index dfd4245487..e4f0e13c9d 100644
--- a/samples/keyboard/makefile.bcc
+++ b/samples/keyboard/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS)  $(OBJS)\keyboard_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\keyboard_sample.res
+	c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\keyboard_sample.res
 |
 
 $(OBJS)\keyboard_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc
index 240c90e7ae..d008b12cae 100644
--- a/samples/keyboard/makefile.gcc
+++ b/samples/keyboard/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe
 
 $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_sample_rc.o
-	$(CXX) -o $@ $(KEYBOARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(KEYBOARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\keyboard_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/layout/makefile.bcc b/samples/layout/makefile.bcc
index c8e2db8537..e6f2ad94be 100644
--- a/samples/layout/makefile.bcc
+++ b/samples/layout/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\layout.exe: $(LAYOUT_OBJECTS)  $(OBJS)\layout_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(LAYOUT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\layout_sample.res
+	c0w32.obj $(LAYOUT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\layout_sample.res
 |
 
 $(OBJS)\layout_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc
index 23004a7fee..a0796d8572 100644
--- a/samples/layout/makefile.gcc
+++ b/samples/layout/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe
 
 $(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_sample_rc.o
-	$(CXX) -o $@ $(LAYOUT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(LAYOUT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\layout_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/listctrl/makefile.bcc b/samples/listctrl/makefile.bcc
index b9beab0623..3cd9f8ce03 100644
--- a/samples/listctrl/makefile.bcc
+++ b/samples/listctrl/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS)  $(OBJS)\listctrl_listtest.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(LISTCTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\listctrl_listtest.res
+	c0w32.obj $(LISTCTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\listctrl_listtest.res
 |
 
 $(OBJS)\listctrl_listtest.obj: .\listtest.cpp
diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc
index 2642494e93..a21dd4642f 100644
--- a/samples/listctrl/makefile.gcc
+++ b/samples/listctrl/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe
 
 $(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest_rc.o
-	$(CXX) -o $@ $(LISTCTRL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(LISTCTRL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\listctrl_listtest.o: ./listtest.cpp
 	$(CXX) -c -o $@ $(LISTCTRL_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc
index f8f47f66bf..55a910aa2e 100644
--- a/samples/mdi/makefile.bcc
+++ b/samples/mdi/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\mdi.exe: $(MDI_OBJECTS)  $(OBJS)\mdi_mdi.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(MDI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mdi_mdi.res
+	c0w32.obj $(MDI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mdi_mdi.res
 |
 
 $(OBJS)\mdi_mdi.obj: .\mdi.cpp
diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc
index 55ecec86af..2f3b7a3da5 100644
--- a/samples/mdi/makefile.gcc
+++ b/samples/mdi/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe
 
 $(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o
-	$(CXX) -o $@ $(MDI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(MDI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\mdi_mdi.o: ./mdi.cpp
 	$(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/mediaplayer/makefile.bcc b/samples/mediaplayer/makefile.bcc
index 38f19120df..ef0733c66e 100644
--- a/samples/mediaplayer/makefile.bcc
+++ b/samples/mediaplayer/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS)  $(OBJS)\mediaplayer_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(MEDIAPLAYER_OBJECTS),$@,, $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mediaplayer_sample.res
+	c0w32.obj $(MEDIAPLAYER_OBJECTS),$@,, $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mediaplayer_sample.res
 |
 
 $(OBJS)\mediaplayer_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc
index 235e48f980..c5c235aa0e 100644
--- a/samples/mediaplayer/makefile.gcc
+++ b/samples/mediaplayer/makefile.gcc
@@ -224,7 +224,7 @@ clean:
 	-if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe
 
 $(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample_rc.o
-	$(CXX) -o $@ $(MEDIAPLAYER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(MEDIAPLAYER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\mediaplayer_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/memcheck/makefile.bcc b/samples/memcheck/makefile.bcc
index 2ae5a77004..5f6b64c6dc 100644
--- a/samples/memcheck/makefile.bcc
+++ b/samples/memcheck/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS)  $(OBJS)\memcheck_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(MEMCHECK_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\memcheck_sample.res
+	c0w32.obj $(MEMCHECK_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\memcheck_sample.res
 |
 
 $(OBJS)\memcheck_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/memcheck/makefile.gcc b/samples/memcheck/makefile.gcc
index 0e60f79893..94296ebc29 100644
--- a/samples/memcheck/makefile.gcc
+++ b/samples/memcheck/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe
 
 $(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_sample_rc.o
-	$(CXX) -o $@ $(MEMCHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(MEMCHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\memcheck_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/menu/makefile.bcc b/samples/menu/makefile.bcc
index f900fa2edb..c32a522c8c 100644
--- a/samples/menu/makefile.bcc
+++ b/samples/menu/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\menu.exe: $(MENU_OBJECTS)  $(OBJS)\menu_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(MENU_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\menu_sample.res
+	c0w32.obj $(MENU_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\menu_sample.res
 |
 
 $(OBJS)\menu_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc
index 87a5216b43..a85ff6e18f 100644
--- a/samples/menu/makefile.gcc
+++ b/samples/menu/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe
 
 $(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_sample_rc.o
-	$(CXX) -o $@ $(MENU_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(MENU_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\menu_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc
index 54dc0e4c48..bffab29c32 100644
--- a/samples/minimal/makefile.bcc
+++ b/samples/minimal/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\minimal.exe: $(MINIMAL_OBJECTS)  $(OBJS)\minimal_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(MINIMAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\minimal_sample.res
+	c0w32.obj $(MINIMAL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\minimal_sample.res
 |
 
 $(OBJS)\minimal_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc
index 41830b907e..711548768c 100644
--- a/samples/minimal/makefile.gcc
+++ b/samples/minimal/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe
 
 $(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample_rc.o
-	$(CXX) -o $@ $(MINIMAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(MINIMAL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\minimal_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/nativdlg/makefile.bcc b/samples/nativdlg/makefile.bcc
index 0b2c397f05..cdd93cb759 100644
--- a/samples/nativdlg/makefile.bcc
+++ b/samples/nativdlg/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS)  $(OBJS)\nativdlg_nativdlg.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(NATIVDLG_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nativdlg_nativdlg.res
+	c0w32.obj $(NATIVDLG_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\nativdlg_nativdlg.res
 |
 
 $(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp
diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc
index ecfc98a195..0bc86b5a7f 100644
--- a/samples/nativdlg/makefile.gcc
+++ b/samples/nativdlg/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe
 
 $(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg_rc.o
-	$(CXX) -o $@ $(NATIVDLG_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(NATIVDLG_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\nativdlg_nativdlg.o: ./nativdlg.cpp
 	$(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc
index 564fad40f0..7d3b94d54c 100644
--- a/samples/notebook/makefile.bcc
+++ b/samples/notebook/makefile.bcc
@@ -236,7 +236,7 @@ clean:
 
 $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS)  $(OBJS)\notebook_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\notebook_sample.res
+	c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\notebook_sample.res
 |
 
 $(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc
index 63dd763309..a806301c70 100644
--- a/samples/notebook/makefile.gcc
+++ b/samples/notebook/makefile.gcc
@@ -226,7 +226,7 @@ clean:
 	-if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
 
 $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample_rc.o
-	$(CXX) -o $@ $(NOTEBOOK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(NOTEBOOK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\notebook_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/oleauto/makefile.bcc b/samples/oleauto/makefile.bcc
index c55b679b58..c7ecd889ab 100644
--- a/samples/oleauto/makefile.bcc
+++ b/samples/oleauto/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS)  $(OBJS)\oleauto_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(OLEAUTO_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\oleauto_sample.res
+	c0w32.obj $(OLEAUTO_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\oleauto_sample.res
 |
 
 $(OBJS)\oleauto_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc
index 9523461c22..fcffcc9629 100644
--- a/samples/oleauto/makefile.gcc
+++ b/samples/oleauto/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe
 
 $(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_sample_rc.o
-	$(CXX) -o $@ $(OLEAUTO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(OLEAUTO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\oleauto_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/opengl/cube/makefile.bcc b/samples/opengl/cube/makefile.bcc
index b4904cf64d..e87c2e5b29 100644
--- a/samples/opengl/cube/makefile.bcc
+++ b/samples/opengl/cube/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 !if "$(USE_OPENGL)" == "1"
 $(OBJS)\cube.exe: $(CUBE_OBJECTS)  $(OBJS)\cube_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\cube_sample.res
+	c0w32.obj $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\cube_sample.res
 |
 !endif
 
diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc
index ae98ae7e43..ca0543d428 100644
--- a/samples/opengl/cube/makefile.gcc
+++ b/samples/opengl/cube/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 
 ifeq ($(USE_OPENGL),1)
 $(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_sample_rc.o
-	$(CXX) -o $@ $(CUBE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(CUBE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\cube_sample_rc.o: ./../../../samples/sample.rc
diff --git a/samples/opengl/isosurf/makefile.bcc b/samples/opengl/isosurf/makefile.bcc
index b30f10fe32..5759c79737 100644
--- a/samples/opengl/isosurf/makefile.bcc
+++ b/samples/opengl/isosurf/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 !if "$(USE_OPENGL)" == "1"
 $(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS)  $(OBJS)\isosurf_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(ISOSURF_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\isosurf_sample.res
+	c0w32.obj $(ISOSURF_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\isosurf_sample.res
 |
 !endif
 
diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc
index 1a3e836b9b..bf59d3f9d9 100644
--- a/samples/opengl/isosurf/makefile.gcc
+++ b/samples/opengl/isosurf/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 
 ifeq ($(USE_OPENGL),1)
 $(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample_rc.o
-	$(CXX) -o $@ $(ISOSURF_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(ISOSURF_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 data: 
diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc
index 1d92eb5dae..42ba6a7339 100644
--- a/samples/opengl/penguin/makefile.bcc
+++ b/samples/opengl/penguin/makefile.bcc
@@ -240,7 +240,7 @@ clean:
 !if "$(USE_OPENGL)" == "1"
 $(OBJS)\penguin.exe: $(PENGUIN_OBJECTS)  $(OBJS)\penguin_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_sample.res
+	c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_sample.res
 |
 !endif
 
diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc
index d78bec52f8..b98a5dd0dd 100644
--- a/samples/opengl/penguin/makefile.gcc
+++ b/samples/opengl/penguin/makefile.gcc
@@ -230,7 +230,7 @@ clean:
 
 ifeq ($(USE_OPENGL),1)
 $(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_sample_rc.o
-	$(CXX) -o $@ $(PENGUIN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(PENGUIN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 data: 
diff --git a/samples/opengl/pyramid/makefile.bcc b/samples/opengl/pyramid/makefile.bcc
index a921cb1372..f081413209 100644
--- a/samples/opengl/pyramid/makefile.bcc
+++ b/samples/opengl/pyramid/makefile.bcc
@@ -235,7 +235,7 @@ clean:
 !if "$(USE_OPENGL)" == "1"
 $(OBJS)\pyramid.exe: $(PYRAMID_OBJECTS)  $(OBJS)\pyramid_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(PYRAMID_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\pyramid_sample.res
+	c0w32.obj $(PYRAMID_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\pyramid_sample.res
 |
 !endif
 
diff --git a/samples/opengl/pyramid/makefile.gcc b/samples/opengl/pyramid/makefile.gcc
index d5b36f1fbb..8fea2b8e9f 100644
--- a/samples/opengl/pyramid/makefile.gcc
+++ b/samples/opengl/pyramid/makefile.gcc
@@ -225,7 +225,7 @@ clean:
 
 ifeq ($(USE_OPENGL),1)
 $(OBJS)\pyramid.exe: $(PYRAMID_OBJECTS) $(OBJS)\pyramid_sample_rc.o
-	$(CXX) -o $@ $(PYRAMID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(PYRAMID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\pyramid_sample_rc.o: ./../../../samples/sample.rc
diff --git a/samples/ownerdrw/makefile.bcc b/samples/ownerdrw/makefile.bcc
index ebd9ccd7a8..791fbbca1a 100644
--- a/samples/ownerdrw/makefile.bcc
+++ b/samples/ownerdrw/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS)  $(OBJS)\ownerdrw_ownerdrw.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(OWNERDRW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ownerdrw_ownerdrw.res
+	c0w32.obj $(OWNERDRW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ownerdrw_ownerdrw.res
 |
 
 data: 
diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc
index 1df36b4e42..62538a219c 100644
--- a/samples/ownerdrw/makefile.gcc
+++ b/samples/ownerdrw/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe
 
 $(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw_rc.o
-	$(CXX) -o $@ $(OWNERDRW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(OWNERDRW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/popup/makefile.bcc b/samples/popup/makefile.bcc
index 29b477d4ac..cce36235d0 100644
--- a/samples/popup/makefile.bcc
+++ b/samples/popup/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\popup.exe: $(POPUP_OBJECTS)  $(OBJS)\popup_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(POPUP_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\popup_sample.res
+	c0w32.obj $(POPUP_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\popup_sample.res
 |
 
 $(OBJS)\popup_popup.obj: .\popup.cpp
diff --git a/samples/popup/makefile.gcc b/samples/popup/makefile.gcc
index d83e980c5e..babb06554d 100644
--- a/samples/popup/makefile.gcc
+++ b/samples/popup/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe
 
 $(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample_rc.o
-	$(CXX) -o $@ $(POPUP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(POPUP_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\popup_popup.o: ./popup.cpp
 	$(CXX) -c -o $@ $(POPUP_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/power/makefile.bcc b/samples/power/makefile.bcc
index 40206995a6..cd8c2596b7 100644
--- a/samples/power/makefile.bcc
+++ b/samples/power/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\power.exe: $(POWER_OBJECTS)  $(OBJS)\power_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(POWER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\power_sample.res
+	c0w32.obj $(POWER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\power_sample.res
 |
 
 $(OBJS)\power_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc
index 847a64d091..3a35fd7644 100644
--- a/samples/power/makefile.gcc
+++ b/samples/power/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\power.exe del $(OBJS)\power.exe
 
 $(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample_rc.o
-	$(CXX) -o $@ $(POWER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(POWER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\power_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/preferences/makefile.bcc b/samples/preferences/makefile.bcc
index 3788266b20..b418bdb53a 100644
--- a/samples/preferences/makefile.bcc
+++ b/samples/preferences/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\preferences.exe: $(PREFERENCES_OBJECTS)  $(OBJS)\preferences_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(PREFERENCES_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\preferences_sample.res
+	c0w32.obj $(PREFERENCES_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\preferences_sample.res
 |
 
 $(OBJS)\preferences_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/preferences/makefile.gcc b/samples/preferences/makefile.gcc
index 10b21bbb02..deb3cd9cbc 100644
--- a/samples/preferences/makefile.gcc
+++ b/samples/preferences/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\preferences.exe del $(OBJS)\preferences.exe
 
 $(OBJS)\preferences.exe: $(PREFERENCES_OBJECTS) $(OBJS)\preferences_sample_rc.o
-	$(CXX) -o $@ $(PREFERENCES_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(PREFERENCES_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\preferences_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/printing/makefile.bcc b/samples/printing/makefile.bcc
index 29a7f05217..41ea718904 100644
--- a/samples/printing/makefile.bcc
+++ b/samples/printing/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\printing.exe: $(PRINTING_OBJECTS)  $(OBJS)\printing_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(PRINTING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\printing_sample.res
+	c0w32.obj $(PRINTING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\printing_sample.res
 |
 
 $(OBJS)\printing_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc
index 74ca4081c2..c434648c8d 100644
--- a/samples/printing/makefile.gcc
+++ b/samples/printing/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe
 
 $(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_sample_rc.o
-	$(CXX) -o $@ $(PRINTING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(PRINTING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\printing_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/propgrid/makefile.bcc b/samples/propgrid/makefile.bcc
index 018a800b31..d58518cf89 100644
--- a/samples/propgrid/makefile.bcc
+++ b/samples/propgrid/makefile.bcc
@@ -239,7 +239,7 @@ clean:
 
 $(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS)  $(OBJS)\propgrid_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(PROPGRID_OBJECTS),$@,, $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\propgrid_sample.res
+	c0w32.obj $(PROPGRID_OBJECTS),$@,, $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\propgrid_sample.res
 |
 
 $(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp
diff --git a/samples/propgrid/makefile.gcc b/samples/propgrid/makefile.gcc
index a7be5b6cdd..33bf48e163 100644
--- a/samples/propgrid/makefile.gcc
+++ b/samples/propgrid/makefile.gcc
@@ -229,7 +229,7 @@ clean:
 	-if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe
 
 $(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample_rc.o
-	$(CXX) -o $@ $(PROPGRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(PROPGRID_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\propgrid_propgrid.o: ./propgrid.cpp
 	$(CXX) -c -o $@ $(PROPGRID_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/regtest/makefile.bcc b/samples/regtest/makefile.bcc
index a850a8cee0..65896405aa 100644
--- a/samples/regtest/makefile.bcc
+++ b/samples/regtest/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\regtest.exe: $(REGTEST_OBJECTS)  $(OBJS)\regtest_regtest.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(REGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\regtest_regtest.res
+	c0w32.obj $(REGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\regtest_regtest.res
 |
 
 $(OBJS)\regtest_regtest.obj: .\regtest.cpp
diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc
index ec10368d30..8cee01e2f1 100644
--- a/samples/regtest/makefile.gcc
+++ b/samples/regtest/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe
 
 $(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest_rc.o
-	$(CXX) -o $@ $(REGTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(REGTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\regtest_regtest.o: ./regtest.cpp
 	$(CXX) -c -o $@ $(REGTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc
index 4b69d5994e..581ff0cec6 100644
--- a/samples/render/makefile.bcc
+++ b/samples/render/makefile.bcc
@@ -253,13 +253,13 @@ clean:
 
 $(OBJS)\render.exe: $(RENDER_OBJECTS)  $(OBJS)\render_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0w32.obj $(RENDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res
+	c0w32.obj $(RENDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res
 |
 
 !if "$(SHARED)" == "1"
 $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll: $(RENDDLL_OBJECTS)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(RENDDLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,
+	c0d32.obj $(RENDDLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,
 |
 !endif
 
diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc
index c8ad42db98..780f193448 100644
--- a/samples/render/makefile.gcc
+++ b/samples/render/makefile.gcc
@@ -239,11 +239,11 @@ clean:
 	-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll
 
 $(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample_rc.o
-	$(CXX) -o $@ $(RENDER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(RENDER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 ifeq ($(SHARED),1)
 $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll: $(RENDDLL_OBJECTS)
-	$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\render_sample_rc.o: ./../../samples/sample.rc
diff --git a/samples/ribbon/makefile.bcc b/samples/ribbon/makefile.bcc
index f161a7846d..149bba1de7 100644
--- a/samples/ribbon/makefile.bcc
+++ b/samples/ribbon/makefile.bcc
@@ -236,7 +236,7 @@ clean:
 
 $(OBJS)\ribbon.exe: $(RIBBON_OBJECTS)  $(OBJS)\ribbon_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(RIBBON_OBJECTS),$@,, $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ribbon_sample.res
+	c0w32.obj $(RIBBON_OBJECTS),$@,, $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\ribbon_sample.res
 |
 
 $(OBJS)\ribbon_ribbondemo.obj: .\ribbondemo.cpp
diff --git a/samples/ribbon/makefile.gcc b/samples/ribbon/makefile.gcc
index ccd496dbc8..ebc9a77175 100644
--- a/samples/ribbon/makefile.gcc
+++ b/samples/ribbon/makefile.gcc
@@ -226,7 +226,7 @@ clean:
 	-if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe
 
 $(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample_rc.o
-	$(CXX) -o $@ $(RIBBON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(RIBBON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_RIBBON_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\ribbon_ribbondemo.o: ./ribbondemo.cpp
 	$(CXX) -c -o $@ $(RIBBON_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/richtext/makefile.bcc b/samples/richtext/makefile.bcc
index 20de2ba196..fbd940d06f 100644
--- a/samples/richtext/makefile.bcc
+++ b/samples/richtext/makefile.bcc
@@ -244,7 +244,7 @@ clean:
 
 $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS)  $(OBJS)\richtext_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(RICHTEXT_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\richtext_sample.res
+	c0w32.obj $(RICHTEXT_OBJECTS),$@,, $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\richtext_sample.res
 |
 
 $(OBJS)\richtext_richtext.obj: .\richtext.cpp
diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc
index 92800d9ce5..792011b285 100644
--- a/samples/richtext/makefile.gcc
+++ b/samples/richtext/makefile.gcc
@@ -234,7 +234,7 @@ clean:
 	-if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe
 
 $(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample_rc.o
-	$(CXX) -o $@ $(RICHTEXT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(RICHTEXT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\richtext_richtext.o: ./richtext.cpp
 	$(CXX) -c -o $@ $(RICHTEXT_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc
index 397573c108..6e2ea07aa1 100644
--- a/samples/sashtest/makefile.bcc
+++ b/samples/sashtest/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS)  $(OBJS)\sashtest_sashtest.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(SASHTEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sashtest_sashtest.res
+	c0w32.obj $(SASHTEST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sashtest_sashtest.res
 |
 
 $(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp
diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc
index 9ad5b6e05c..5042132793 100644
--- a/samples/sashtest/makefile.gcc
+++ b/samples/sashtest/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe
 
 $(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest_rc.o
-	$(CXX) -o $@ $(SASHTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SASHTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\sashtest_sashtest.o: ./sashtest.cpp
 	$(CXX) -c -o $@ $(SASHTEST_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/scroll/makefile.bcc b/samples/scroll/makefile.bcc
index e5fcf6ace4..894644cee4 100644
--- a/samples/scroll/makefile.bcc
+++ b/samples/scroll/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\scroll.exe: $(SCROLL_OBJECTS)  $(OBJS)\scroll_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(SCROLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\scroll_sample.res
+	c0w32.obj $(SCROLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\scroll_sample.res
 |
 
 $(OBJS)\scroll_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc
index 18e377a155..3d3fd5b1d1 100644
--- a/samples/scroll/makefile.gcc
+++ b/samples/scroll/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe
 
 $(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_sample_rc.o
-	$(CXX) -o $@ $(SCROLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SCROLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\scroll_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/secretstore/makefile.bcc b/samples/secretstore/makefile.bcc
index 00bc5570df..fe4f092d64 100644
--- a/samples/secretstore/makefile.bcc
+++ b/samples/secretstore/makefile.bcc
@@ -194,7 +194,7 @@ clean:
 
 $(OBJS)\secretstore.exe: $(SECRETSTORE_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0x32.obj $(SECRETSTORE_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+	c0x32.obj $(SECRETSTORE_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
 |
 
 $(OBJS)\secretstore_secretstore.obj: .\secretstore.cpp
diff --git a/samples/secretstore/makefile.gcc b/samples/secretstore/makefile.gcc
index aa8346da6a..346e92ba0e 100644
--- a/samples/secretstore/makefile.gcc
+++ b/samples/secretstore/makefile.gcc
@@ -183,7 +183,7 @@ clean:
 	-if exist $(OBJS)\secretstore.exe del $(OBJS)\secretstore.exe
 
 $(OBJS)\secretstore.exe: $(SECRETSTORE_OBJECTS)
-	$(CXX) -o $@ $(SECRETSTORE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SECRETSTORE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\secretstore_secretstore.o: ./secretstore.cpp
 	$(CXX) -c -o $@ $(SECRETSTORE_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/shaped/makefile.bcc b/samples/shaped/makefile.bcc
index d9364280c1..b49c335c77 100644
--- a/samples/shaped/makefile.bcc
+++ b/samples/shaped/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\shaped.exe: $(SHAPED_OBJECTS)  $(OBJS)\shaped_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(SHAPED_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\shaped_sample.res
+	c0w32.obj $(SHAPED_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\shaped_sample.res
 |
 
 data: 
diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc
index b99bd96405..694e5d40b0 100644
--- a/samples/shaped/makefile.gcc
+++ b/samples/shaped/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe
 
 $(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_sample_rc.o
-	$(CXX) -o $@ $(SHAPED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SHAPED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/sockets/makefile.bcc b/samples/sockets/makefile.bcc
index 5696d7a4c6..5472b953d5 100644
--- a/samples/sockets/makefile.bcc
+++ b/samples/sockets/makefile.bcc
@@ -287,25 +287,25 @@ clean:
 !if "$(USE_GUI)" == "1"
 $(OBJS)\client.exe: $(CLIENT_OBJECTS)  $(OBJS)\client_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\client_sample.res
+	c0w32.obj $(CLIENT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\client_sample.res
 |
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\server.exe: $(SERVER_OBJECTS)  $(OBJS)\server_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\server_sample.res
+	c0w32.obj $(SERVER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\server_sample.res
 |
 !endif
 
 $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(BASECLIENT_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+	c0x32.obj $(BASECLIENT_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 
 $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(BASESERVER_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+	c0x32.obj $(BASESERVER_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 
 $(OBJS)\client_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index acfb41723e..3ee865a079 100644
--- a/samples/sockets/makefile.gcc
+++ b/samples/sockets/makefile.gcc
@@ -266,19 +266,19 @@ clean:
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample_rc.o
-	$(CXX) -o $@ $(CLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(CLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample_rc.o
-	$(CXX) -o $@ $(SERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS)
-	$(CXX) -o $@ $(BASECLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(BASECLIENT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS)
-	$(CXX) -o $@ $(BASESERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(BASESERVER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\client_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__NDEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_0) --include-dir ./../../samples --define NOPCH
diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc
index a73f1639ec..429b23f6b9 100644
--- a/samples/sound/makefile.bcc
+++ b/samples/sound/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\sound.exe: $(SOUND_OBJECTS)  $(OBJS)\sound_sound.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(SOUND_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sound_sound.res
+	c0w32.obj $(SOUND_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\sound_sound.res
 |
 
 data: 
diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index fd3c557e99..ae05bb6214 100644
--- a/samples/sound/makefile.gcc
+++ b/samples/sound/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe
 
 $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound_rc.o
-	$(CXX) -o $@ $(SOUND_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SOUND_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/splash/makefile.bcc b/samples/splash/makefile.bcc
index 95bf06b0de..c18fb1813f 100644
--- a/samples/splash/makefile.bcc
+++ b/samples/splash/makefile.bcc
@@ -236,7 +236,7 @@ clean:
 
 $(OBJS)\splash.exe: $(SPLASH_OBJECTS)  $(OBJS)\splash_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(SPLASH_OBJECTS),$@,, $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splash_sample.res
+	c0w32.obj $(SPLASH_OBJECTS),$@,, $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splash_sample.res
 |
 
 data: 
diff --git a/samples/splash/makefile.gcc b/samples/splash/makefile.gcc
index 23d1f222ef..3e03ef7d07 100644
--- a/samples/splash/makefile.gcc
+++ b/samples/splash/makefile.gcc
@@ -228,7 +228,7 @@ clean:
 	-if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe
 
 $(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample_rc.o
-	$(CXX) -o $@ $(SPLASH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SPLASH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_MEDIA_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/splitter/makefile.bcc b/samples/splitter/makefile.bcc
index 2d323f3d25..032d52d4ac 100644
--- a/samples/splitter/makefile.bcc
+++ b/samples/splitter/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\splitter.exe: $(SPLITTER_OBJECTS)  $(OBJS)\splitter_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(SPLITTER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splitter_sample.res
+	c0w32.obj $(SPLITTER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\splitter_sample.res
 |
 
 $(OBJS)\splitter_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc
index 4725d12e8b..46e06aacc4 100644
--- a/samples/splitter/makefile.gcc
+++ b/samples/splitter/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe
 
 $(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_sample_rc.o
-	$(CXX) -o $@ $(SPLITTER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SPLITTER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\splitter_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/statbar/makefile.bcc b/samples/statbar/makefile.bcc
index bbc6801397..5fb4a3bce8 100644
--- a/samples/statbar/makefile.bcc
+++ b/samples/statbar/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\statbar.exe: $(STATBAR_OBJECTS)  $(OBJS)\statbar_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(STATBAR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\statbar_sample.res
+	c0w32.obj $(STATBAR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\statbar_sample.res
 |
 
 $(OBJS)\statbar_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc
index 087cdb66ec..b2e3c3bcc9 100644
--- a/samples/statbar/makefile.gcc
+++ b/samples/statbar/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe
 
 $(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_sample_rc.o
-	$(CXX) -o $@ $(STATBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(STATBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\statbar_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/stc/makefile.bcc b/samples/stc/makefile.bcc
index 2c0471f390..1f5abac5ee 100644
--- a/samples/stc/makefile.bcc
+++ b/samples/stc/makefile.bcc
@@ -234,7 +234,7 @@ clean:
 
 $(OBJS)\stctest.exe: $(STCTEST_OBJECTS)  $(OBJS)\stctest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(STCTEST_OBJECTS),$@,, $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\stctest_sample.res
+	c0w32.obj $(STCTEST_OBJECTS),$@,, $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\stctest_sample.res
 |
 
 data: 
diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index 7068cc1c28..d4f8e1ee87 100644
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/makefile.gcc
@@ -224,7 +224,7 @@ clean:
 	-if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe
 
 $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample_rc.o
-	$(CXX) -o $@ $(STCTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(STCTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_STC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/samples/svg/makefile.bcc b/samples/svg/makefile.bcc
index 5a8fb3416a..4a24390170 100644
--- a/samples/svg/makefile.bcc
+++ b/samples/svg/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(SVGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\svgtest_sample.res
+	c0w32.obj $(SVGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\svgtest_sample.res
 |
 
 $(OBJS)\svgtest_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc
index 7a43007ef0..552fb5c36d 100644
--- a/samples/svg/makefile.gcc
+++ b/samples/svg/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
 
 $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o
-	$(CXX) -o $@ $(SVGTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SVGTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\svgtest_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/taborder/makefile.bcc b/samples/taborder/makefile.bcc
index 40072d3ec1..dd67a9579d 100644
--- a/samples/taborder/makefile.bcc
+++ b/samples/taborder/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\taborder.exe: $(TABORDER_OBJECTS)  $(OBJS)\taborder_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TABORDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taborder_sample.res
+	c0w32.obj $(TABORDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taborder_sample.res
 |
 
 $(OBJS)\taborder_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/taborder/makefile.gcc b/samples/taborder/makefile.gcc
index 20dee394ad..14df6dbab7 100644
--- a/samples/taborder/makefile.gcc
+++ b/samples/taborder/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe
 
 $(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample_rc.o
-	$(CXX) -o $@ $(TABORDER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TABORDER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\taborder_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/taskbar/makefile.bcc b/samples/taskbar/makefile.bcc
index 92c5d070d5..1d8663e6cc 100644
--- a/samples/taskbar/makefile.bcc
+++ b/samples/taskbar/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS)  $(OBJS)\taskbar_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TASKBAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taskbar_sample.res
+	c0w32.obj $(TASKBAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taskbar_sample.res
 |
 
 $(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc
index 26ff3a160b..7c31714436 100644
--- a/samples/taskbar/makefile.gcc
+++ b/samples/taskbar/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe
 
 $(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample_rc.o
-	$(CXX) -o $@ $(TASKBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TASKBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\taskbar_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/taskbarbutton/makefile.bcc b/samples/taskbarbutton/makefile.bcc
index 9530d7d3cb..46af1b1614 100644
--- a/samples/taskbarbutton/makefile.bcc
+++ b/samples/taskbarbutton/makefile.bcc
@@ -233,7 +233,7 @@ clean:
 
 $(OBJS)\taskbarbutton.exe: $(TASKBARBUTTON_OBJECTS)  $(OBJS)\taskbarbutton_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TASKBARBUTTON_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taskbarbutton_sample.res
+	c0w32.obj $(TASKBARBUTTON_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\taskbarbutton_sample.res
 |
 
 $(OBJS)\taskbarbutton_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/taskbarbutton/makefile.gcc b/samples/taskbarbutton/makefile.gcc
index a1a1aec807..270d932eb7 100644
--- a/samples/taskbarbutton/makefile.gcc
+++ b/samples/taskbarbutton/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\taskbarbutton.exe del $(OBJS)\taskbarbutton.exe
 
 $(OBJS)\taskbarbutton.exe: $(TASKBARBUTTON_OBJECTS) $(OBJS)\taskbarbutton_sample_rc.o
-	$(CXX) -o $@ $(TASKBARBUTTON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TASKBARBUTTON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\taskbarbutton_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/text/makefile.bcc b/samples/text/makefile.bcc
index 4b5068058f..61fafca75e 100644
--- a/samples/text/makefile.bcc
+++ b/samples/text/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\text.exe: $(TEXT_OBJECTS)  $(OBJS)\text_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TEXT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\text_sample.res
+	c0w32.obj $(TEXT_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\text_sample.res
 |
 
 $(OBJS)\text_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc
index b4c631ce3d..88bd779632 100644
--- a/samples/text/makefile.gcc
+++ b/samples/text/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\text.exe del $(OBJS)\text.exe
 
 $(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_sample_rc.o
-	$(CXX) -o $@ $(TEXT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TEXT_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\text_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/thread/makefile.bcc b/samples/thread/makefile.bcc
index 9e2777c994..0e68b1245b 100644
--- a/samples/thread/makefile.bcc
+++ b/samples/thread/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\thread.exe: $(THREAD_OBJECTS)  $(OBJS)\thread_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(THREAD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\thread_sample.res
+	c0w32.obj $(THREAD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\thread_sample.res
 |
 
 $(OBJS)\thread_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc
index c54db207d9..9496885ffe 100644
--- a/samples/thread/makefile.gcc
+++ b/samples/thread/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe
 
 $(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_sample_rc.o
-	$(CXX) -o $@ $(THREAD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(THREAD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\thread_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc
index ee4d43b3e2..1e9588082b 100644
--- a/samples/toolbar/makefile.bcc
+++ b/samples/toolbar/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS)  $(OBJS)\toolbar_toolbar.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TOOLBAR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\toolbar_toolbar.res
+	c0w32.obj $(TOOLBAR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\toolbar_toolbar.res
 |
 
 $(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp
diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc
index b24e9c9255..39cfc15da1 100644
--- a/samples/toolbar/makefile.gcc
+++ b/samples/toolbar/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe
 
 $(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar_rc.o
-	$(CXX) -o $@ $(TOOLBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TOOLBAR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\toolbar_toolbar.o: ./toolbar.cpp
 	$(CXX) -c -o $@ $(TOOLBAR_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/treectrl/makefile.bcc b/samples/treectrl/makefile.bcc
index 3020dc0bce..36147d8ef9 100644
--- a/samples/treectrl/makefile.bcc
+++ b/samples/treectrl/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS)  $(OBJS)\treectrl_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TREECTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treectrl_sample.res
+	c0w32.obj $(TREECTRL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treectrl_sample.res
 |
 
 $(OBJS)\treectrl_treetest.obj: .\treetest.cpp
diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc
index fcb94c13a7..2f2bd2f81e 100644
--- a/samples/treectrl/makefile.gcc
+++ b/samples/treectrl/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe
 
 $(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample_rc.o
-	$(CXX) -o $@ $(TREECTRL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TREECTRL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\treectrl_treetest.o: ./treetest.cpp
 	$(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/treelist/makefile.bcc b/samples/treelist/makefile.bcc
index 71c88403ae..56ae50b0de 100644
--- a/samples/treelist/makefile.bcc
+++ b/samples/treelist/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\treelist.exe: $(TREELIST_OBJECTS)  $(OBJS)\treelist_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TREELIST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treelist_sample.res
+	c0w32.obj $(TREELIST_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treelist_sample.res
 |
 
 $(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/treelist/makefile.gcc b/samples/treelist/makefile.gcc
index a7532b5e63..5722408326 100644
--- a/samples/treelist/makefile.gcc
+++ b/samples/treelist/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe
 
 $(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample_rc.o
-	$(CXX) -o $@ $(TREELIST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TREELIST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\treelist_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc
index 55cb5a25f9..dc86ea88a3 100644
--- a/samples/typetest/makefile.bcc
+++ b/samples/typetest/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS)  $(OBJS)\typetest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\typetest_sample.res
+	c0w32.obj $(TYPETEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\typetest_sample.res
 |
 
 $(OBJS)\typetest_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc
index 4324575635..720a649100 100644
--- a/samples/typetest/makefile.gcc
+++ b/samples/typetest/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe
 
 $(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_sample_rc.o
-	$(CXX) -o $@ $(TYPETEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TYPETEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\typetest_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/uiaction/makefile.bcc b/samples/uiaction/makefile.bcc
index 6d784b19ea..cdb748bae8 100644
--- a/samples/uiaction/makefile.bcc
+++ b/samples/uiaction/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\uiaction.exe: $(UIACTION_OBJECTS)  $(OBJS)\uiaction_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(UIACTION_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\uiaction_sample.res
+	c0w32.obj $(UIACTION_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\uiaction_sample.res
 |
 
 $(OBJS)\uiaction_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/uiaction/makefile.gcc b/samples/uiaction/makefile.gcc
index 34c20d5f88..f8e48a86ee 100644
--- a/samples/uiaction/makefile.gcc
+++ b/samples/uiaction/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\uiaction.exe del $(OBJS)\uiaction.exe
 
 $(OBJS)\uiaction.exe: $(UIACTION_OBJECTS) $(OBJS)\uiaction_sample_rc.o
-	$(CXX) -o $@ $(UIACTION_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(UIACTION_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\uiaction_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc
index 772e235411..71d29961f5 100644
--- a/samples/validate/makefile.bcc
+++ b/samples/validate/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\validate.exe: $(VALIDATE_OBJECTS)  $(OBJS)\validate_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(VALIDATE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\validate_sample.res
+	c0w32.obj $(VALIDATE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\validate_sample.res
 |
 
 $(OBJS)\validate_validate.obj: .\validate.cpp
diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc
index f399ef8643..f611f488da 100644
--- a/samples/validate/makefile.gcc
+++ b/samples/validate/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe
 
 $(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample_rc.o
-	$(CXX) -o $@ $(VALIDATE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(VALIDATE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\validate_validate.o: ./validate.cpp
 	$(CXX) -c -o $@ $(VALIDATE_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/vscroll/makefile.bcc b/samples/vscroll/makefile.bcc
index 6789e6409f..73ccbd0f66 100644
--- a/samples/vscroll/makefile.bcc
+++ b/samples/vscroll/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\vstest.exe: $(VSTEST_OBJECTS)  $(OBJS)\vstest_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(VSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\vstest_sample.res
+	c0w32.obj $(VSTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\vstest_sample.res
 |
 
 $(OBJS)\vstest_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc
index bcab66cd7a..68a708193c 100644
--- a/samples/vscroll/makefile.gcc
+++ b/samples/vscroll/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe
 
 $(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample_rc.o
-	$(CXX) -o $@ $(VSTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(VSTEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\vstest_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/webview/makefile.bcc b/samples/webview/makefile.bcc
index 8981245443..4ff6d6874c 100644
--- a/samples/webview/makefile.bcc
+++ b/samples/webview/makefile.bcc
@@ -240,7 +240,7 @@ clean:
 
 $(OBJS)\webview.exe: $(WEBVIEW_OBJECTS)  $(OBJS)\webview_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(WEBVIEW_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\webview_sample.res
+	c0w32.obj $(WEBVIEW_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\webview_sample.res
 |
 
 $(OBJS)\webview_webview.obj: .\webview.cpp
diff --git a/samples/webview/makefile.gcc b/samples/webview/makefile.gcc
index 57a7588fe2..d16887afac 100644
--- a/samples/webview/makefile.gcc
+++ b/samples/webview/makefile.gcc
@@ -232,7 +232,7 @@ clean:
 	-if exist $(OBJS)\webview.exe del $(OBJS)\webview.exe
 
 $(OBJS)\webview.exe: $(WEBVIEW_OBJECTS) $(OBJS)\webview_sample_rc.o
-	$(CXX) -o $@ $(WEBVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WEBVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\webview_webview.o: ./webview.cpp
 	$(CXX) -c -o $@ $(WEBVIEW_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc
index eed63ce521..e6f3e2220d 100644
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -263,7 +263,7 @@ clean:
 
 $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS)  $(OBJS)\widgets_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widgets_sample.res
+	c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widgets_sample.res
 |
 
 $(OBJS)\widgets_activityindicator.obj: .\activityindicator.cpp
diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc
index 3976414ba5..a26d9361a4 100644
--- a/samples/widgets/makefile.gcc
+++ b/samples/widgets/makefile.gcc
@@ -253,7 +253,7 @@ clean:
 	-if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
 
 $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample_rc.o
-	$(CXX) -o $@ $(WIDGETS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WIDGETS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\widgets_activityindicator.o: ./activityindicator.cpp
 	$(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/wizard/makefile.bcc b/samples/wizard/makefile.bcc
index 525e01c33a..8869710699 100644
--- a/samples/wizard/makefile.bcc
+++ b/samples/wizard/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\wizard.exe: $(WIZARD_OBJECTS)  $(OBJS)\wizard_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(WIZARD_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wizard_sample.res
+	c0w32.obj $(WIZARD_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wizard_sample.res
 |
 
 $(OBJS)\wizard_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc
index 8af250f323..9ae7bbd11e 100644
--- a/samples/wizard/makefile.gcc
+++ b/samples/wizard/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe
 
 $(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_sample_rc.o
-	$(CXX) -o $@ $(WIZARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WIZARD_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\wizard_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/wrapsizer/makefile.bcc b/samples/wrapsizer/makefile.bcc
index b96d7e2c41..3191bf1c1c 100644
--- a/samples/wrapsizer/makefile.bcc
+++ b/samples/wrapsizer/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS)  $(OBJS)\wrapsizer_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(WRAPSIZER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wrapsizer_sample.res
+	c0w32.obj $(WRAPSIZER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wrapsizer_sample.res
 |
 
 $(OBJS)\wrapsizer_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/wrapsizer/makefile.gcc b/samples/wrapsizer/makefile.gcc
index 23a2e4452d..c2a4c55f4b 100644
--- a/samples/wrapsizer/makefile.gcc
+++ b/samples/wrapsizer/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe
 
 $(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample_rc.o
-	$(CXX) -o $@ $(WRAPSIZER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WRAPSIZER_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\wrapsizer_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index f4303d6c86..a1f179be54 100644
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -256,7 +256,7 @@ clean:
 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_RIBBON_p)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_sample.res
+	c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_RIBBON_p)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_sample.res
 |
 
 data: 
diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index 90f58ce2dc..1ed99d8d18 100644
--- a/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@ -246,7 +246,7 @@ clean:
 	-if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
 
 $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o
-	$(CXX) -o $@ $(XRCDEMO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_RIBBON_p)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(XRCDEMO_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_RIBBON_p)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS)\rc mkdir $(OBJS)\rc
diff --git a/samples/xti/makefile.bcc b/samples/xti/makefile.bcc
index 179381e49c..0fc3917322 100644
--- a/samples/xti/makefile.bcc
+++ b/samples/xti/makefile.bcc
@@ -234,7 +234,7 @@ clean:
 
 $(OBJS)\xti.exe: $(XTI_OBJECTS)  $(OBJS)\xti_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(XTI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xti_sample.res
+	c0w32.obj $(XTI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xti_sample.res
 |
 
 $(OBJS)\xti_sample.res: .\..\..\samples\sample.rc
diff --git a/samples/xti/makefile.gcc b/samples/xti/makefile.gcc
index 5afbb6a398..bda6ab0420 100644
--- a/samples/xti/makefile.gcc
+++ b/samples/xti/makefile.gcc
@@ -224,7 +224,7 @@ clean:
 	-if exist $(OBJS)\xti.exe del $(OBJS)\xti.exe
 
 $(OBJS)\xti.exe: $(XTI_OBJECTS) $(OBJS)\xti_sample_rc.o
-	$(CXX) -o $@ $(XTI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(XTI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\xti_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/src/aui/barartmsw.cpp b/src/aui/barartmsw.cpp
index 68700ca832..b01f5dcdeb 100644
--- a/src/aui/barartmsw.cpp
+++ b/src/aui/barartmsw.cpp
@@ -60,8 +60,7 @@
 
 wxAuiMSWToolBarArt::wxAuiMSWToolBarArt()
 {
-    wxUxThemeEngine* te = wxUxThemeEngine::GetIfActive();
-    if ( te && te->IsAppThemed() )
+    if ( wxUxThemeIsActive() )
     {
         m_themed = true;
 
@@ -70,24 +69,24 @@ wxAuiMSWToolBarArt::wxAuiMSWToolBarArt()
         wxUxThemeHandle hTheme(window, L"Rebar");
 
         SIZE overflowSize;
-        te->GetThemePartSize(hTheme, NULL, RP_CHEVRON, 0,
+        ::GetThemePartSize(hTheme, NULL, RP_CHEVRON, 0,
             NULL, TS_TRUE, &overflowSize);
         m_overflowSize = overflowSize.cx;
 
         SIZE gripperSize;
-        te->GetThemePartSize(hTheme, NULL, RP_GRIPPER, 0,
+        ::GetThemePartSize(hTheme, NULL, RP_GRIPPER, 0,
             NULL, TS_TRUE, &gripperSize);
         m_gripperSize = gripperSize.cx;
 
         wxUxThemeHandle hThemeToolbar(window, L"Toolbar");
 
         SIZE seperatorSize;
-        te->GetThemePartSize(hThemeToolbar, NULL, TP_SEPARATOR, 0,
+        ::GetThemePartSize(hThemeToolbar, NULL, TP_SEPARATOR, 0,
             NULL, TS_TRUE, &seperatorSize);
         m_separatorSize = seperatorSize.cx;
 
         SIZE buttonSize;
-        te->GetThemePartSize(hThemeToolbar, NULL, TP_BUTTON, 0,
+        ::GetThemePartSize(hThemeToolbar, NULL, TP_BUTTON, 0,
             NULL, TS_TRUE, &buttonSize);
         m_buttonSize.Set(buttonSize.cx, buttonSize.cy);
     }
@@ -112,7 +111,7 @@ void wxAuiMSWToolBarArt::DrawBackground(
 
         wxUxThemeHandle hTheme(wnd, L"Rebar");
 
-        wxUxThemeEngine::Get()->DrawThemeBackground(
+        ::DrawThemeBackground(
             hTheme,
             GetHdcOf(dc.GetTempHDC()),
             RP_BACKGROUND,
@@ -152,8 +151,6 @@ void wxAuiMSWToolBarArt::DrawButton(
 
         wxUxThemeHandle hTheme(wnd, L"Toolbar");
 
-        wxUxThemeEngine* te = wxUxThemeEngine::Get();
-
         int btnState;
         if ( item.GetState() & wxAUI_BUTTON_STATE_DISABLED )
             btnState = TS_DISABLED;
@@ -169,7 +166,7 @@ void wxAuiMSWToolBarArt::DrawButton(
         else
             btnState = TS_NORMAL;
 
-        te->DrawThemeBackground(
+        ::DrawThemeBackground(
             hTheme,
             GetHdcOf(dc.GetTempHDC()),
             TP_BUTTON,
@@ -252,7 +249,6 @@ void wxAuiMSWToolBarArt::DrawDropDownButton(
     if ( m_themed )
     {
         wxUxThemeHandle hTheme(wnd, L"Toolbar");
-        wxUxThemeEngine* const te = wxUxThemeEngine::Get();
 
         int dropDownWidth = 14;
 
@@ -297,7 +293,7 @@ void wxAuiMSWToolBarArt::DrawDropDownButton(
         else
             btnState = TS_NORMAL;
 
-        te->DrawThemeBackground(
+        ::DrawThemeBackground(
             hTheme,
             GetHdcOf(dc.GetTempHDC()),
             TP_SPLITBUTTON,
@@ -305,7 +301,7 @@ void wxAuiMSWToolBarArt::DrawDropDownButton(
             &btnR,
             NULL);
 
-        te->DrawThemeBackground(
+        ::DrawThemeBackground(
             hTheme,
             GetHdcOf(dc.GetTempHDC()),
             TP_SPLITBUTTONDROPDOWN,
@@ -390,7 +386,7 @@ void wxAuiMSWToolBarArt::DrawSeparator(
 
         wxUxThemeHandle hTheme(wnd, L"Toolbar");
 
-        wxUxThemeEngine::Get()->DrawThemeBackground(
+        ::DrawThemeBackground(
             hTheme,
             GetHdcOf(dc.GetTempHDC()),
             (m_flags & wxAUI_TB_VERTICAL) ? TP_SEPARATORVERT : TP_SEPARATOR,
@@ -414,7 +410,7 @@ void wxAuiMSWToolBarArt::DrawGripper(
 
         wxUxThemeHandle hTheme(wnd, L"Rebar");
 
-        wxUxThemeEngine::Get()->DrawThemeBackground(
+        ::DrawThemeBackground(
             hTheme,
             GetHdcOf(dc.GetTempHDC()),
             (m_flags & wxAUI_TB_VERTICAL) ? RP_GRIPPERVERT : RP_GRIPPER,
@@ -447,7 +443,7 @@ void wxAuiMSWToolBarArt::DrawOverflowButton(
         else
             chevState = CHEVS_NORMAL;
 
-        wxUxThemeEngine::Get()->DrawThemeBackground(
+        ::DrawThemeBackground(
             hTheme,
             GetHdcOf(dc.GetTempHDC()),
             (m_flags & wxAUI_TB_VERTICAL) ? RP_CHEVRONVERT : RP_CHEVRON,
diff --git a/src/aui/tabartmsw.cpp b/src/aui/tabartmsw.cpp
index df91b303a0..477fd1341a 100644
--- a/src/aui/tabartmsw.cpp
+++ b/src/aui/tabartmsw.cpp
@@ -64,13 +64,7 @@ wxAuiMSWTabArt::wxAuiMSWTabArt()
     m_closeBtnSize = wxDefaultSize;
     m_maxTabHeight = 0;
 
-    wxUxThemeEngine* te = wxUxThemeEngine::GetIfActive();
-    if ( te && te->IsAppThemed() )
-    {
-        m_themed = true;
-    }
-    else
-        m_themed = false;
+    m_themed = wxUxThemeIsActive();
 }
 
 wxAuiMSWTabArt::~wxAuiMSWTabArt()
@@ -113,7 +107,7 @@ void wxAuiMSWTabArt::DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect)
 
     wxUxThemeHandle hTheme(wnd, L"TAB");
 
-    wxUxThemeEngine::Get()->DrawThemeBackground(
+    ::DrawThemeBackground(
         hTheme,
         GetHdcOf(dc.GetTempHDC()),
         TABP_PANE,
@@ -153,7 +147,7 @@ void wxAuiMSWTabArt::DrawBackground(wxDC& dc,
 
     wxUxThemeHandle hTheme(wnd, L"TAB");
 
-    wxUxThemeEngine::Get()->DrawThemeBackground(
+    ::DrawThemeBackground(
         hTheme,
         GetHdcOf(dc.GetTempHDC()),
         TABP_PANE,
@@ -223,12 +217,10 @@ void wxAuiMSWTabArt::DrawTab(wxDC& dc,
     else
         tabState = TIS_NORMAL;
 
-    wxUxThemeEngine* te = wxUxThemeEngine::Get();
-
     wxUxThemeHandle hTabTheme(wnd, L"Tab");
     RECT tabR;
     wxCopyRectToRECT(tabRect, tabR);
-    te->DrawThemeBackground(hTabTheme, GetHdcOf(dc.GetTempHDC()), TABP_TABITEM,
+    ::DrawThemeBackground(hTabTheme, GetHdcOf(dc.GetTempHDC()), TABP_TABITEM,
         tabState,
         &tabR, NULL);
 
@@ -237,7 +229,7 @@ void wxAuiMSWTabArt::DrawTab(wxDC& dc,
     // separately, or it wouldn't be drawn at all.
     if ( tabX == GetIndentSize() )
     {
-        te->DrawThemeBackground
+        ::DrawThemeBackground
             (
                 hTabTheme,
                 GetHdcOf(dc.GetTempHDC()),
@@ -290,7 +282,7 @@ void wxAuiMSWTabArt::DrawTab(wxDC& dc,
 
         RECT btnR;
         wxCopyRectToRECT(rect, btnR);
-        te->DrawThemeBackground(hToolTipTheme, GetHdcOf(dc.GetTempHDC()), TTP_CLOSE, btnState, &btnR, NULL);
+        ::DrawThemeBackground(hToolTipTheme, GetHdcOf(dc.GetTempHDC()), TTP_CLOSE, btnState, &btnR, NULL);
 
         if ( out_button_rect )
             *out_button_rect = rect;
@@ -399,8 +391,6 @@ void wxAuiMSWTabArt::DrawButton(wxDC& dc,
         return;
     }
 
-    wxUxThemeEngine* te = wxUxThemeEngine::Get();
-
     const wchar_t* themeId = NULL;
     int part = 0;
 
@@ -468,7 +458,7 @@ void wxAuiMSWTabArt::DrawButton(wxDC& dc,
 
     RECT btnR;
     wxCopyRectToRECT(btnRect, btnR);
-    te->DrawThemeBackground(hTheme, GetHdcOf(dc.GetTempHDC()), part, btnState, &btnR, NULL);
+    ::DrawThemeBackground(hTheme, GetHdcOf(dc.GetTempHDC()), part, btnState, &btnR, NULL);
 
     if ( out_rect )
         *out_rect = rect;
@@ -490,18 +480,17 @@ int wxAuiMSWTabArt::GetBestTabCtrlSize(wxWindow* wnd,
 
 void wxAuiMSWTabArt::InitSizes(wxWindow* wnd, wxDC& dc)
 {
-    wxUxThemeEngine* te = wxUxThemeEngine::Get();
     SIZE uxSize;
 
     // Borrow close button from tooltip (best fit on various backgrounds)
     wxUxThemeHandle hTooltipTheme(wnd, L"Tooltip");
 
-    te->GetThemePartSize(hTooltipTheme, GetHdcOf(dc.GetTempHDC()),
+    ::GetThemePartSize(hTooltipTheme, GetHdcOf(dc.GetTempHDC()),
         TTP_CLOSE, 0, NULL, TS_TRUE, &uxSize);
     m_closeBtnSize.Set(uxSize.cx, uxSize.cy);
 
     wxUxThemeHandle hTabTheme(wnd, L"Tab");
-    te->GetThemePartSize(hTabTheme, GetHdcOf(dc.GetTempHDC()),
+    ::GetThemePartSize(hTabTheme, GetHdcOf(dc.GetTempHDC()),
         TABP_TABITEM, 0, NULL, TS_TRUE, &uxSize);
     m_tabSize.Set(uxSize.cx, uxSize.cy);
 }
diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index 0e79b2cdf7..1bac5e630e 100644
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -125,14 +125,7 @@ bool wxGenericComboCtrl::Create(wxWindow *parent,
         border = wxBORDER_SIMPLE;
 #elif defined(__WXMSW__)
     if ( !border )
-        // For XP, have 1-width custom border, for older version use sunken
-        /*if ( wxUxThemeEngine::GetIfActive() )
-        {
-            border = wxBORDER_NONE;
-            m_widthCustomBorder = 1;
-        }
-        else*/
-            border = wxBORDER_SUNKEN;
+        border = wxBORDER_SUNKEN;
 #else
 
     //
diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp
index 0b3ed6a4bf..49b393a14d 100644
--- a/src/generic/richtooltipg.cpp
+++ b/src/generic/richtooltipg.cpp
@@ -95,13 +95,12 @@ public:
 #ifdef __WXMSW__
             // When using themes MSW tooltips use larger bluish version of the
             // normal font.
-            wxUxThemeEngine* const theme = GetTooltipTheme();
-            if ( theme )
+            if ( UseTooltipTheme() )
             {
                 titleFont.MakeLarger();
 
                 COLORREF c;
-                if ( FAILED(theme->GetThemeColor
+                if ( FAILED(::GetThemeColor
                                    (
                                         wxUxThemeHandle(parent, L"TOOLTIP"),
                                         TTP_BALLOONTITLE,
@@ -140,7 +139,7 @@ public:
         wxSizer* sizerText = wrapper.CreateSizer(message, -1 /* No wrapping */);
 
 #ifdef __WXMSW__
-        if ( icon.IsOk() && GetTooltipTheme() )
+        if ( icon.IsOk() && UseTooltipTheme() )
         {
             // Themed tooltips under MSW align the text with the title, not
             // with the icon, so use a helper horizontal sizer in this case.
@@ -175,13 +174,12 @@ public:
         {
             // Determine the best colour(s) to use on our own.
 #ifdef __WXMSW__
-            wxUxThemeEngine* const theme = GetTooltipTheme();
-            if ( theme )
+            if ( UseTooltipTheme() )
             {
                 wxUxThemeHandle hTheme(GetParent(), L"TOOLTIP");
 
                 COLORREF c1, c2;
-                if ( FAILED(theme->GetThemeColor
+                if ( FAILED(::GetThemeColor
                                    (
                                         hTheme,
                                         TTP_BALLOONTITLE,
@@ -189,7 +187,7 @@ public:
                                         TMT_GRADIENTCOLOR1,
                                         &c1
                                     )) ||
-                    FAILED(theme->GetThemeColor
+                    FAILED(::GetThemeColor
                                   (
                                         hTheme,
                                         TTP_BALLOONTITLE,
@@ -280,13 +278,13 @@ protected:
 private:
 #ifdef __WXMSW__
     // Returns non-NULL theme only if we're using Win7-style tooltips.
-    static wxUxThemeEngine* GetTooltipTheme()
+    static bool UseTooltipTheme()
     {
         // Even themed applications under XP still use "classic" tooltips.
         if ( wxGetWinVersion() <= wxWinVersion_XP )
-            return NULL;
-
-        return wxUxThemeEngine::GetIfActive();
+            return false;
+		else
+			return wxUxThemeIsActive();
     }
 #endif // __WXMSW__
 
@@ -295,7 +293,7 @@ private:
     static int GetTipHeight()
     {
 #ifdef __WXMSW__
-        if ( GetTooltipTheme() )
+        if ( UseTooltipTheme() )
             return 20;
 #endif // __WXMSW__
 
diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp
index 2ffe67860f..f8ef711d76 100644
--- a/src/msw/anybutton.cpp
+++ b/src/msw/anybutton.cpp
@@ -533,12 +533,12 @@ void wxAnyButton::AdjustForBitmapSize(wxSize &size) const
         int marginH = 0,
             marginV = 0;
 #if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() )
+        if ( wxUxThemeIsActive() )
         {
             wxUxThemeHandle theme(const_cast<wxAnyButton *>(this), L"BUTTON");
 
             MARGINS margins;
-            wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
+            ::GetThemeMargins(theme, NULL,
                                                     BP_PUSHBUTTON,
                                                     PBS_NORMAL,
                                                     TMT_CONTENTMARGINS,
@@ -632,10 +632,7 @@ WXLRESULT wxAnyButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar
     {
         if (
                 IsEnabled() &&
-                (
-#if wxUSE_UXTHEME
-                wxUxThemeEngine::GetIfActive() ||
-#endif // wxUSE_UXTHEME
+                ( wxUxThemeIsActive() ||
                  (m_imageData && m_imageData->GetBitmap(State_Current).IsOk())
                 )
            )
@@ -696,7 +693,7 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
                       "Must set normal bitmap with the new size first" );
 
 #if wxUSE_UXTHEME
-        if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() )
+        if ( ShowsLabel() && wxUxThemeIsActive() )
         {
             // We can't change the size of the images stored in wxImageList
             // in wxXPButtonImageData::m_iml so force recreating it below but
@@ -716,7 +713,7 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
         // (even if we use BUTTON_IMAGELIST_ALIGN_CENTER alignment and
         // BS_BITMAP style), at least under Windows 2003 so use owner drawn
         // strategy for bitmap-only buttons
-        if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() )
+        if ( ShowsLabel() && wxUxThemeIsActive() )
         {
             m_imageData = new wxXPButtonImageData(this, bitmap);
 
@@ -858,7 +855,7 @@ void DrawButtonText(HDC hdc,
 
     // To get a native look for owner-drawn button in disabled state (without
     // theming) we must use DrawState() to draw the text label.
-    if ( !wxUxThemeEngine::GetIfActive() && !btn->IsEnabled() )
+    if ( !wxUxThemeIsActive() && !btn->IsEnabled() )
     {
         // However using DrawState() has some drawbacks:
         // 1. It generally doesn't support alignment flags (except right
@@ -1100,10 +1097,8 @@ void DrawXPBackground(wxAnyButton *button, HDC hdc, RECT& rectBtn, UINT state)
 
     int iState = uxStates[GetButtonState(button, state)];
 
-    wxUxThemeEngine * const engine = wxUxThemeEngine::Get();
-
     // draw parent background if needed
-    if ( engine->IsThemeBackgroundPartiallyTransparent
+    if ( ::IsThemeBackgroundPartiallyTransparent
                  (
                     theme,
                     BP_PUSHBUTTON,
@@ -1121,18 +1116,18 @@ void DrawXPBackground(wxAnyButton *button, HDC hdc, RECT& rectBtn, UINT state)
         // being the perfect solution.
         wxWindowBeingErased = button;
 
-        engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
+        ::DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
 
         wxWindowBeingErased = NULL;
     }
 
     // draw background
-    engine->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState,
+    ::DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState,
                                 &rectBtn, NULL);
 
     // calculate content area margins
     MARGINS margins;
-    engine->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
+    ::GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
                             TMT_CONTENTMARGINS, &rectBtn, &margins);
     ::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight);
     ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN);
@@ -1249,7 +1244,7 @@ bool wxAnyButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
     if ( !HasFlag(wxBORDER_NONE) )
     {
 #if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() )
+        if ( wxUxThemeIsActive() )
         {
             DrawXPBackground(this, hdc, rectBtn, state);
         }
@@ -1283,7 +1278,7 @@ bool wxAnyButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
             DrawFocusRect(hdc, &rectBtn);
 
 #if wxUSE_UXTHEME
-            if ( !wxUxThemeEngine::GetIfActive() )
+            if ( !wxUxThemeIsActive() )
 #endif // wxUSE_UXTHEME
             {
                 if ( pushed )
diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 34ef696042..f8a7098da6 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -156,14 +156,10 @@ bool wxComboCtrl::Create(wxWindow *parent,
     // Set border
     long border = style & wxBORDER_MASK;
 
-#if wxUSE_UXTHEME
-    wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-#endif
-
     if ( !border )
     {
 #if wxUSE_UXTHEME
-        if ( theme )
+        if ( wxUxThemeIsActive() )
         {
             // For XP, have 1-width custom border, for older version use sunken
             border = wxBORDER_NONE;
@@ -188,11 +184,8 @@ bool wxComboCtrl::Create(wxWindow *parent,
         return false;
 
 #if wxUSE_UXTHEME
-    if ( theme )
-    {
-        if ( ::wxGetWinVersion() >= wxWinVersion_Vista )
+    if ( wxUxThemeIsActive() && ::wxGetWinVersion() >= wxWinVersion_Vista )
             m_iFlags |= wxCC_BUTTON_STAYS_DOWN |wxCC_BUTTON_COVERS_BORDER;
-    }
 #endif
 
     if ( style & wxCC_STD_BUTTON )
@@ -332,10 +325,6 @@ wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
     selRect.x += wcp + focusSpacingX;
     selRect.width -= wcp + (focusSpacingX*2);
 
-    //wxUxThemeEngine* theme = NULL;
-    //if ( hTheme )
-    //    theme = wxUxThemeEngine::GetIfActive();
-
     wxColour fgCol;
     wxColour bgCol;
     bool doDrawDottedEdge = false;
@@ -430,11 +419,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
     HDC hDc = GetHdcOf(*impl);
     HWND hWnd = GetHwndOf(this);
 
-    wxUxThemeEngine* theme = NULL;
     wxUxThemeHandle hTheme(this, L"COMBOBOX");
-
-    if ( hTheme )
-        theme = wxUxThemeEngine::GetIfActive();
 #endif // wxUSE_UXTHEME
 
     wxRect borderRect(0,0,sz.x,sz.y);
@@ -528,19 +513,19 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         // Draw parent's background, if necessary
         RECT* rUseForTb = NULL;
 
-        if ( theme->IsThemeBackgroundPartiallyTransparent( hTheme, comboBoxPart, bgState ) )
+        if ( ::IsThemeBackgroundPartiallyTransparent( hTheme, comboBoxPart, bgState ) )
             rUseForTb = &rFull;
         else if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
             rUseForTb = &rButton;
 
         if ( rUseForTb )
-            theme->DrawThemeParentBackground( hWnd, hDc, rUseForTb );
+            ::DrawThemeParentBackground( hWnd, hDc, rUseForTb );
 
         //
         // Draw the control background (including the border)
         if ( m_widthCustomBorder > 0 )
         {
-            theme->DrawThemeBackground( hTheme, hDc, comboBoxPart, bgState, rUseForBg, NULL );
+            ::DrawThemeBackground( hTheme, hDc, comboBoxPart, bgState, rUseForBg, NULL );
         }
         else
         {
@@ -576,7 +561,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
                     butPart = CP_DROPDOWNBUTTONLEFT;
 
             }
-            theme->DrawThemeBackground( hTheme, hDc, butPart, butState, &rButton, NULL );
+            ::DrawThemeBackground( hTheme, hDc, butPart, butState, &rButton, NULL );
         }
         else if ( useVistaComboBox &&
                   (m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE) )
@@ -795,10 +780,8 @@ bool wxComboCtrl::AnimateShow( const wxRect& rect, int flags )
 
 wxCoord wxComboCtrl::GetNativeTextIndent() const
 {
-#if wxUSE_UXTHEME
-    if ( wxUxThemeEngine::GetIfActive() )
+    if ( wxUxThemeIsActive() )
         return NATIVE_TEXT_INDENT_XP;
-#endif
     return NATIVE_TEXT_INDENT_CLASSIC;
 }
 
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 999cac1717..87dcc61b3e 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -668,7 +668,7 @@ void wxComboBox::DoSetToolTip(wxToolTip *tip)
 bool wxComboBox::SetHint(const wxString& hintOrig)
 {
     wxString hint(hintOrig);
-    if ( wxUxThemeEngine::GetIfActive() )
+    if ( wxUxThemeIsActive() )
     {
         // under XP (but not Vista) there is a bug in cue banners
         // implementation for combobox edit control: the first character is
diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 9622386229..e253935c23 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -410,7 +410,7 @@ wxMSWOwnerDrawnButtonBase::MSWMakeOwnerDrawnIfNecessary(const wxColour& colFg)
 {
     // The only way to change the checkbox foreground colour when using
     // themes is to owner draw it.
-    if ( wxUxThemeEngine::GetIfActive() )
+    if ( wxUxThemeIsActive() )
         MSWMakeOwnerDrawn(colFg.IsOk());
 }
 
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index b294c795f3..8fbbc9f0c2 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -300,13 +300,13 @@ public:
 
     // get the theme engine or NULL if themes
     // are not available or not supported on menu
-    static wxUxThemeEngine *GetUxThemeEngine()
+    static bool IsUxThemeActive()
     {
     #if wxUSE_UXTHEME
         if ( MenuLayout() == FullTheme )
-            return wxUxThemeEngine::GetIfActive();
+            return true;
     #endif // wxUSE_UXTHEME
-        return NULL;
+        return false;
     }
 
 
@@ -321,7 +321,7 @@ public:
     {
         MenuLayoutType menu = Classic;
     #if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() != NULL )
+        if ( wxUxThemeIsActive() )
         {
             static wxWinVersion ver = wxGetWinVersion();
             if ( ver >= wxWinVersion_Vista )
@@ -344,41 +344,40 @@ MenuDrawData* MenuDrawData::ms_instance = NULL;
 void MenuDrawData::Init()
 {
 #if wxUSE_UXTHEME
-    wxUxThemeEngine* theme = GetUxThemeEngine();
-    if ( theme )
+    if ( IsUxThemeActive() )
     {
         wxWindow* window = static_cast<wxApp*>(wxApp::GetInstance())->GetTopWindow();
         wxUxThemeHandle hTheme(window, L"MENU");
 
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPITEM, 0,
+        ::GetThemeMargins(hTheme, NULL, MENU_POPUPITEM, 0,
                                TMT_CONTENTMARGINS, NULL,
                                &ItemMargin);
 
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPCHECK, 0,
+        ::GetThemeMargins(hTheme, NULL, MENU_POPUPCHECK, 0,
                                TMT_CONTENTMARGINS, NULL,
                                &CheckMargin);
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPCHECKBACKGROUND, 0,
+        ::GetThemeMargins(hTheme, NULL, MENU_POPUPCHECKBACKGROUND, 0,
                                TMT_CONTENTMARGINS, NULL,
                                &CheckBgMargin);
 
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPSUBMENU, 0,
+        ::GetThemeMargins(hTheme, NULL, MENU_POPUPSUBMENU, 0,
                                TMT_CONTENTMARGINS, NULL,
                                &ArrowMargin);
 
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPSEPARATOR, 0,
+        ::GetThemeMargins(hTheme, NULL, MENU_POPUPSEPARATOR, 0,
                                TMT_SIZINGMARGINS, NULL,
                                &SeparatorMargin);
 
-        theme->GetThemePartSize(hTheme, NULL, MENU_POPUPCHECK, 0,
+        ::GetThemePartSize(hTheme, NULL, MENU_POPUPCHECK, 0,
                                 NULL, TS_TRUE, &CheckSize);
 
-        theme->GetThemePartSize(hTheme, NULL, MENU_POPUPSUBMENU, 0,
+        ::GetThemePartSize(hTheme, NULL, MENU_POPUPSUBMENU, 0,
                                 NULL, TS_TRUE, &ArrowSize);
 
-        theme->GetThemePartSize(hTheme, NULL, MENU_POPUPSEPARATOR, 0,
+        ::GetThemePartSize(hTheme, NULL, MENU_POPUPSEPARATOR, 0,
                                 NULL, TS_TRUE, &SeparatorSize);
 
-        theme->GetThemeInt(hTheme, MENU_POPUPBACKGROUND, 0, TMT_BORDERSIZE, &TextBorder);
+        ::GetThemeInt(hTheme, MENU_POPUPBACKGROUND, 0, TMT_BORDERSIZE, &TextBorder);
 
         AccelBorder = 34;
         ArrowBorder = 0;
@@ -386,7 +385,7 @@ void MenuDrawData::Init()
         Offset = -14;
 
         wxUxThemeFont themeFont;
-        theme->GetThemeSysFont(hTheme, TMT_MENUFONT, themeFont.GetPtr());
+        ::GetThemeSysFont(hTheme, TMT_MENUFONT, themeFont.GetPtr());
         Font = wxFont(themeFont.GetLOGFONT());
 
         Theme = true;
@@ -960,10 +959,7 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 #if wxUSE_UXTHEME
         // If a custom background colour is explicitly specified, we should use
         // it instead of the default theme background.
-        wxUxThemeEngine* const theme = GetBackgroundColour().IsOk()
-                                        ? NULL
-                                        : MenuDrawData::GetUxThemeEngine();
-        if ( theme )
+        if ( !GetBackgroundColour().IsOk() && MenuDrawData::IsUxThemeActive() )
         {
             POPUPITEMSTATES state;
             if ( stat & wxODDisabled )
@@ -982,26 +978,26 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
             wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU");
 
-            if ( theme->IsThemeBackgroundPartiallyTransparent(hTheme,
+            if ( ::IsThemeBackgroundPartiallyTransparent(hTheme,
                     MENU_POPUPITEM, state) )
             {
-                theme->DrawThemeBackground(hTheme, hdc,
+                ::DrawThemeBackground(hTheme, hdc,
                                            MENU_POPUPBACKGROUND,
                                            0, &rect, NULL);
             }
 
-            theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPGUTTER,
+            ::DrawThemeBackground(hTheme, hdc, MENU_POPUPGUTTER,
                                        0, &rcGutter, NULL);
 
             if ( IsSeparator() )
             {
                 rcSeparator.left = rcGutter.right;
-                theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPSEPARATOR,
+                ::DrawThemeBackground(hTheme, hdc, MENU_POPUPSEPARATOR,
                                            0, &rcSeparator, NULL);
                 return true;
             }
 
-            theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPITEM,
+            ::DrawThemeBackground(hTheme, hdc, MENU_POPUPITEM,
                                        state, &rcSelection, NULL);
 
         }
@@ -1205,8 +1201,7 @@ void wxMenuItem::DrawStdCheckMark(WXHDC hdc_, const RECT* rc, wxODStatus stat)
     HDC hdc = (HDC)hdc_;
 
 #if wxUSE_UXTHEME
-    wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine();
-    if ( theme )
+    if ( MenuDrawData::IsUxThemeActive() )
     {
         wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU");
 
@@ -1220,7 +1215,7 @@ void wxMenuItem::DrawStdCheckMark(WXHDC hdc_, const RECT* rc, wxODStatus stat)
                                                     ? MCB_DISABLED
                                                     : MCB_NORMAL;
 
-        theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECKBACKGROUND,
+        ::DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECKBACKGROUND,
                                    stateCheckBg, &rcBg, NULL);
 
         POPUPCHECKSTATES stateCheck;
@@ -1235,7 +1230,7 @@ void wxMenuItem::DrawStdCheckMark(WXHDC hdc_, const RECT* rc, wxODStatus stat)
                                                : MC_BULLETNORMAL;
         }
 
-        theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECK,
+        ::DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECK,
                                    stateCheck, rc, NULL);
     }
     else
@@ -1283,31 +1278,30 @@ void wxMenuItem::GetFontToUse(wxFont& font) const
 void wxMenuItem::GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const
 {
 #if wxUSE_UXTHEME
-    wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine();
-    if ( theme )
+    if ( MenuDrawData::IsUxThemeActive() )
     {
         wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU");
 
         if ( stat & wxODDisabled)
         {
-            wxRGBToColour(colText, theme->GetThemeSysColor(hTheme, COLOR_GRAYTEXT));
+            wxRGBToColour(colText, ::GetThemeSysColor(hTheme, COLOR_GRAYTEXT));
         }
         else
         {
             colText = GetTextColour();
             if ( !colText.IsOk() )
-                wxRGBToColour(colText, theme->GetThemeSysColor(hTheme, COLOR_MENUTEXT));
+                wxRGBToColour(colText, ::GetThemeSysColor(hTheme, COLOR_MENUTEXT));
         }
 
         if ( stat & wxODSelected )
         {
-            wxRGBToColour(colBack, theme->GetThemeSysColor(hTheme, COLOR_HIGHLIGHT));
+            wxRGBToColour(colBack, ::GetThemeSysColor(hTheme, COLOR_HIGHLIGHT));
         }
         else
         {
             colBack = GetBackgroundColour();
             if ( !colBack.IsOk() )
-                wxRGBToColour(colBack, theme->GetThemeSysColor(hTheme, COLOR_MENU));
+                wxRGBToColour(colBack, ::GetThemeSysColor(hTheme, COLOR_MENU));
         }
     }
     else
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index ce5c20016c..4ba23c88a7 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -260,9 +260,9 @@ bool wxNotebook::Create(wxWindow *parent,
             (style & (wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT)) )
     {
         // check if we use themes at all -- if we don't, we're still okay
-        if ( wxUxThemeEngine::GetIfActive() )
+        if ( wxUxThemeIsActive() )
         {
-            wxUxThemeEngine::GetIfActive()->SetWindowTheme(GetHwnd(), L"", L"");
+            ::SetWindowTheme(GetHwnd(), L"", L"");
 
             // correct the background color for the new non-themed control
             SetBackgroundColour(GetThemeBackgroundColour());
@@ -1116,7 +1116,7 @@ WXHBRUSH wxNotebook::QueryBgBitmap()
     wxCopyRectToRECT(r, rc);
 
     WindowHDC hDC(GetHwnd());
-    wxUxThemeEngine::Get()->GetThemeBackgroundExtent
+    ::GetThemeBackgroundExtent
                             (
                                 theme,
                                 (HDC) hDC,
@@ -1131,7 +1131,7 @@ WXHBRUSH wxNotebook::QueryBgBitmap()
 
     {
         SelectInHDC selectBmp(hDCMem, hBmp);
-        wxUxThemeEngine::Get()->DrawThemeBackground
+        ::DrawThemeBackground
                                 (
                                     theme,
                                     hDCMem,
@@ -1150,7 +1150,7 @@ void wxNotebook::UpdateBgBrush()
     if ( m_hbrBackground )
         ::DeleteObject((HBRUSH)m_hbrBackground);
 
-    if ( !m_hasBgCol && wxUxThemeEngine::GetIfActive() )
+    if ( !m_hasBgCol && wxUxThemeIsActive() )
     {
         m_hbrBackground = QueryBgBitmap();
     }
@@ -1191,7 +1191,7 @@ bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child)
         {
             // we have the content area (page size), but we need to draw all of the
             // background for it to be aligned correctly
-            wxUxThemeEngine::Get()->GetThemeBackgroundExtent
+            ::GetThemeBackgroundExtent
                                     (
                                         theme,
                                         (HDC) hDC,
@@ -1200,7 +1200,7 @@ bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child)
                                         &rc,
                                         &rc
                                     );
-            wxUxThemeEngine::Get()->DrawThemeBackground
+            ::DrawThemeBackground
                                     (
                                         theme,
                                         (HDC) hDC,
@@ -1222,7 +1222,7 @@ bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child)
 wxColour wxNotebook::GetThemeBackgroundColour() const
 {
 #if wxUSE_UXTHEME
-    if (wxUxThemeEngine::Get())
+    if (wxUxThemeIsActive())
     {
         wxUxThemeHandle hTheme((wxNotebook*) this, L"TAB");
         if (hTheme)
@@ -1231,7 +1231,7 @@ wxColour wxNotebook::GetThemeBackgroundColour() const
             // See PlatformSDK\Include\Tmschema.h for values.
             // JACS: can also use 9 (TABP_PANE)
             COLORREF themeColor;
-            bool success = (S_OK == wxUxThemeEngine::Get()->GetThemeColor(
+            bool success = (S_OK == ::GetThemeColor(
                                         hTheme,
                                         10 /* TABP_BODY */,
                                         1 /* NORMAL */,
@@ -1251,7 +1251,7 @@ wxColour wxNotebook::GetThemeBackgroundColour() const
             */
             if (themeColor == 1)
             {
-                wxUxThemeEngine::Get()->GetThemeColor(
+                ::GetThemeColor(
                                             hTheme,
                                             10 /* TABP_BODY */,
                                             1 /* NORMAL */,
@@ -1270,7 +1270,7 @@ wxColour wxNotebook::GetThemeBackgroundColour() const
             {
                 WCHAR szwThemeFile[1024];
                 WCHAR szwThemeColor[256];
-                if (S_OK == wxUxThemeEngine::Get()->GetCurrentThemeName(szwThemeFile, 1024, szwThemeColor, 256, NULL, 0))
+                if (S_OK == ::GetCurrentThemeName(szwThemeFile, 1024, szwThemeColor, 256, NULL, 0))
                 {
                     wxString themeFile(szwThemeFile);
                     if (themeFile.Find(wxT("Aero")) != -1 && wxString(szwThemeColor) == wxT("NormalColor"))
diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 64eaff0ed9..6a3a650997 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -38,6 +38,7 @@
 #include "wx/renderer.h"
 #include "wx/msw/private.h"
 #include "wx/msw/uxtheme.h"
+#include "wx/dynlib.h"
 
 // tmschema.h is in Win32 Platform SDK and might not be available with earlier
 // compilers
@@ -126,6 +127,30 @@
     #define TDLGEBS_EXPANDEDPRESSED 6
 #endif
 
+// These Vista+ only types used by DrawThemeTextEx may not be available in older SDK headers
+typedef int(__stdcall *WXDTT_CALLBACK_PROC)(HDC hdc, const wchar_t * pszText,
+    int cchText, RECT * prc, unsigned int dwFlags, WXLPARAM lParam);
+
+typedef struct _WXDTTOPTS
+{
+    DWORD             dwSize;
+    DWORD             dwFlags;
+    COLORREF          crText;
+    COLORREF          crBorder;
+    COLORREF          crShadow;
+    int               iTextShadowType;
+    POINT             ptShadowOffset;
+    int               iBorderSize;
+    int               iFontPropId;
+    int               iColorPropId;
+    int               iStateId;
+    BOOL              fApplyOverlay;
+    int               iGlowSize;
+    WXDTT_CALLBACK_PROC pfnDrawTextCallback;
+    WXLPARAM          lParam;
+} WXDTTOPTS, *WXPDTTOPTS;
+
+
 // ----------------------------------------------------------------------------
 // methods common to wxRendererMSW and wxRendererXP
 // ----------------------------------------------------------------------------
@@ -450,8 +475,7 @@ void wxRendererMSWBase::DrawComboBox(wxWindow* win,
 wxRendererNative& wxRendererNative::GetDefault()
 {
 #if wxUSE_UXTHEME
-    wxUxThemeEngine *themeEngine = wxUxThemeEngine::Get();
-    if ( themeEngine && themeEngine->IsAppThemed() )
+    if ( wxUxThemeIsActive() )
         return wxRendererXP::Get();
 #endif // wxUSE_UXTHEME
 
@@ -691,7 +715,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
     else
         state = CBXS_NORMAL;
 
-    wxUxThemeEngine::Get()->DrawThemeBackground
+    ::DrawThemeBackground
                             (
                                 hTheme,
                                 GetHdcOf(dc.GetTempHDC()),
@@ -731,7 +755,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
         state = HIS_HOT;
     else
         state = HIS_NORMAL;
-    wxUxThemeEngine::Get()->DrawThemeBackground
+    ::DrawThemeBackground
                             (
                                 hTheme,
                                 GetHdcOf(dc.GetTempHDC()),
@@ -771,7 +795,7 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
     wxCopyRectToRECT(adjustedRect, r);
 
     int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
-    wxUxThemeEngine::Get()->DrawThemeBackground
+    ::DrawThemeBackground
                             (
                                 hTheme,
                                 GetHdcOf(dc.GetTempHDC()),
@@ -844,7 +868,7 @@ wxRendererXP::DoDrawButtonLike(HTHEME htheme,
     else if ( part == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) )
         state = PBS_DEFAULTED;
 
-    wxUxThemeEngine::Get()->DrawThemeBackground
+    ::DrawThemeBackground
                             (
                                 htheme,
                                 GetHdcOf(dc.GetTempHDC()),
@@ -905,12 +929,10 @@ wxSize wxRendererXP::GetCheckBoxSize(wxWindow* win)
     wxUxThemeHandle hTheme(win, L"BUTTON");
     if (hTheme)
     {
-        wxUxThemeEngine* const te = wxUxThemeEngine::Get();
-
-        if (te && te->IsThemePartDefined(hTheme, BP_CHECKBOX, 0))
+        if (::IsThemePartDefined(hTheme, BP_CHECKBOX, 0))
         {
             SIZE checkSize;
-            if (te->GetThemePartSize(hTheme, NULL, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, NULL, TS_DRAW, &checkSize) == S_OK)
+            if (::GetThemePartSize(hTheme, NULL, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, NULL, TS_DRAW, &checkSize) == S_OK)
                 return wxSize(checkSize.cx, checkSize.cy);
         }
     }
@@ -924,7 +946,6 @@ wxRendererXP::DrawCollapseButton(wxWindow *win,
                                  int flags)
 {
     wxUxThemeHandle hTheme(win, L"TASKDIALOG");
-    wxUxThemeEngine* const te = wxUxThemeEngine::Get();
 
     int state;
     if (flags & wxCONTROL_PRESSED)
@@ -937,7 +958,7 @@ wxRendererXP::DrawCollapseButton(wxWindow *win,
     if ( flags & wxCONTROL_EXPANDED )
         state += 3;
 
-    if ( te->IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, 0) )
+    if ( ::IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, 0) )
     {
         if (flags & wxCONTROL_EXPANDED)
             flags |= wxCONTROL_CHECKED;
@@ -947,7 +968,7 @@ wxRendererXP::DrawCollapseButton(wxWindow *win,
         RECT r;
         wxCopyRectToRECT(adjustedRect, r);
 
-        te->DrawThemeBackground
+        ::DrawThemeBackground
             (
             hTheme,
             GetHdcOf(dc.GetTempHDC()),
@@ -964,14 +985,13 @@ wxRendererXP::DrawCollapseButton(wxWindow *win,
 wxSize wxRendererXP::GetCollapseButtonSize(wxWindow *win, wxDC& dc)
 {
     wxUxThemeHandle hTheme(win, L"TASKDIALOG");
-    wxUxThemeEngine* const te = wxUxThemeEngine::Get();
 
     // EXPANDOBUTTON scales ugly if not using the correct size, get size from theme
 
-    if ( te->IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, 0) )
+    if ( ::IsThemePartDefined(hTheme, TDLG_EXPANDOBUTTON, 0) )
     {
         SIZE s;
-        te->GetThemePartSize(hTheme,
+        ::GetThemePartSize(hTheme,
             GetHdcOf(dc.GetTempHDC()),
             TDLG_EXPANDOBUTTON,
             TDLGEBS_NORMAL,
@@ -995,15 +1015,14 @@ wxRendererXP::DrawItemSelectionRect(wxWindow *win,
 
     const int itemState = GetListItemState(flags);
 
-    wxUxThemeEngine* const te = wxUxThemeEngine::Get();
-    if ( te->IsThemePartDefined(hTheme, LVP_LISTITEM, 0) )
+    if ( ::IsThemePartDefined(hTheme, LVP_LISTITEM, 0) )
     {
         RECT rc;
         wxCopyRectToRECT(rect, rc);
-        if ( te->IsThemeBackgroundPartiallyTransparent(hTheme, LVP_LISTITEM, itemState) )
-            te->DrawThemeParentBackground(GetHwndOf(win), GetHdcOf(dc.GetTempHDC()), &rc);
+        if ( ::IsThemeBackgroundPartiallyTransparent(hTheme, LVP_LISTITEM, itemState) )
+            ::DrawThemeParentBackground(GetHwndOf(win), GetHdcOf(dc.GetTempHDC()), &rc);
 
-        te->DrawThemeBackground(hTheme, GetHdcOf(dc.GetTempHDC()), LVP_LISTITEM, itemState, &rc, 0);
+        ::DrawThemeBackground(hTheme, GetHdcOf(dc.GetTempHDC()), LVP_LISTITEM, itemState, &rc, 0);
     }
     else
     {
@@ -1023,14 +1042,22 @@ void wxRendererXP::DrawItemText(wxWindow* win,
 
     const int itemState = GetListItemState(flags);
 
-    wxUxThemeEngine* te = wxUxThemeEngine::Get();
-    if ( te->DrawThemeTextEx && // Might be not available if we're under XP
-            te->IsThemePartDefined(hTheme, LVP_LISTITEM, 0) )
+    typedef HRESULT(__stdcall *DrawThemeTextEx_t)(HTHEME, HDC, int, int, const wchar_t *, int, DWORD, RECT *, const WXDTTOPTS *);
+    static DrawThemeTextEx_t s_DrawThemeTextEx = NULL;
+
+    if (wxGetWinVersion() >= wxWinVersion_Vista)
+    {
+        wxLoadedDLL dllUxTheme(wxS("uxtheme.dll"));
+        wxDL_INIT_FUNC(s_, DrawThemeTextEx, dllUxTheme);
+    }
+
+    if ( s_DrawThemeTextEx && // Might be not available if we're under XP
+            ::IsThemePartDefined(hTheme, LVP_LISTITEM, 0) )
     {
         RECT rc;
         wxCopyRectToRECT(rect, rc);
 
-        DTTOPTS textOpts;
+        WXDTTOPTS textOpts;
         textOpts.dwSize = sizeof(textOpts);
         textOpts.dwFlags = DTT_STATEID;
         textOpts.iStateId = itemState;
@@ -1093,7 +1120,7 @@ void wxRendererXP::DrawItemText(wxWindow* win,
                 break;
         }
 
-        te->DrawThemeTextEx(hTheme, dc.GetHDC(), LVP_LISTITEM, itemState,
+        s_DrawThemeTextEx(hTheme, dc.GetHDC(), LVP_LISTITEM, itemState,
                             drawText->wchar_str(), -1, textFlags, &rc, &textOpts);
     }
     else
@@ -1119,7 +1146,7 @@ void wxRendererXP::DrawTextCtrl(wxWindow* win,
     wxColour bdr;
     COLORREF cref;
 
-    wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+    ::GetThemeColor(hTheme, EP_EDITTEXT,
                                           ETS_NORMAL, TMT_FILLCOLOR, &cref);
     fill = wxRGBToColour(cref);
 
@@ -1129,7 +1156,7 @@ void wxRendererXP::DrawTextCtrl(wxWindow* win,
     else
         etsState = ETS_NORMAL;
 
-    wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+    ::GetThemeColor(hTheme, EP_EDITTEXT,
                                               etsState, TMT_BORDERCOLOR, &cref);
     bdr = wxRGBToColour(cref);
 
@@ -1155,7 +1182,7 @@ void wxRendererXP::DrawGauge(wxWindow* win,
     RECT r;
     wxCopyRectToRECT(rect, r);
 
-    wxUxThemeEngine::Get()->DrawThemeBackground(
+    ::DrawThemeBackground(
         hTheme,
         GetHdcOf(dc.GetTempHDC()),
         PP_BAR,
@@ -1164,7 +1191,7 @@ void wxRendererXP::DrawGauge(wxWindow* win,
         NULL);
 
     RECT contentRect;
-    wxUxThemeEngine::Get()->GetThemeBackgroundContentRect(
+    ::GetThemeBackgroundContentRect(
         hTheme,
         GetHdcOf(dc.GetTempHDC()),
         PP_BAR,
@@ -1177,7 +1204,7 @@ void wxRendererXP::DrawGauge(wxWindow* win,
                                           value,
                                           max);
 
-    wxUxThemeEngine::Get()->DrawThemeBackground(
+    ::DrawThemeBackground(
         hTheme,
         GetHdcOf(dc.GetTempHDC()),
         PP_CHUNK,
diff --git a/src/msw/richtooltip.cpp b/src/msw/richtooltip.cpp
index 0e75794889..2dacd70e84 100644
--- a/src/msw/richtooltip.cpp
+++ b/src/msw/richtooltip.cpp
@@ -192,7 +192,7 @@ wxRichToolTipImpl::Create(const wxString& title, const wxString& message)
 {
     // EM_SHOWBALLOONTIP is only implemented by comctl32.dll v6 so don't even
     // bother using the native implementation if we're not using themes.
-    if ( wxUxThemeEngine::GetIfActive() )
+    if ( wxUxThemeIsActive() )
         return new wxRichToolTipMSWImpl(title, message);
 
     return new wxRichToolTipGenericImpl(title, message);
diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 9ae5c230df..d028b60f30 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -399,7 +399,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT&)
     // background mode doesn't change anything: the static box def window proc
     // still draws the label in its own colours, so we need to redraw the text
     // ourselves if we have a non default fg colour
-    if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() )
+    if ( m_hasFgCol && wxUxThemeIsActive() )
     {
         // draw over the text in default colour in our colour
         HDC hdc = GetHdcOf(*impl);
@@ -421,7 +421,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT&)
             if ( hTheme )
             {
                 wxUxThemeFont themeFont;
-                if ( wxUxThemeEngine::Get()->GetThemeFont
+                if ( ::GetThemeFont
                                              (
                                                 hTheme,
                                                 hdc,
diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index dac53ece3b..52ed30fa79 100644
--- a/src/msw/statusbar.cpp
+++ b/src/msw/statusbar.cpp
@@ -393,7 +393,7 @@ const wxStatusBar::MSWMetrics& wxStatusBar::MSWGetMetrics()
         // pane. Notice that it's not the value returned by SB_GETBORDERS
         // which, at least on this Windows 2003 system, returns {0, 2, 2}
 #if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() )
+        if ( wxUxThemeIsActive() )
         {
             s_metrics.gripWidth = 20;
             s_metrics.textMargin = 8;
@@ -450,7 +450,7 @@ bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const
             r.left -= 2;
         }
 
-        wxUxThemeEngine::Get()->GetThemeBackgroundContentRect(theme, NULL,
+        ::GetThemeBackgroundContentRect(theme, NULL,
                                                               1 /* SP_PANE */, 0,
                                                               &r, &r);
     }
diff --git a/src/msw/systhemectrl.cpp b/src/msw/systhemectrl.cpp
index c705b05e00..8634368514 100644
--- a/src/msw/systhemectrl.cpp
+++ b/src/msw/systhemectrl.cpp
@@ -22,13 +22,10 @@
 
 void wxSystemThemedControlBase::DoEnableSystemTheme(bool enable, wxWindow* window)
 {
-    if ( wxGetWinVersion() >= wxWinVersion_Vista )
+    if ( wxGetWinVersion() >= wxWinVersion_Vista && wxUxThemeIsActive() )
     {
-        if ( wxUxThemeEngine *te = wxUxThemeEngine::GetIfActive() )
-        {
-            const wchar_t* const sysThemeId = enable ? L"EXPLORER" : NULL;
-            te->SetWindowTheme(GetHwndOf(window), sysThemeId, NULL);
-        }
+         const wchar_t* const sysThemeId = enable ? L"EXPLORER" : NULL;
+         ::SetWindowTheme(GetHwndOf(window), sysThemeId, NULL);
     }
 }
 
diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index 3acd21fff1..ba2c901848 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -970,7 +970,7 @@ void wxTextEntry::ForceUpper()
 
 bool wxTextEntry::SetHint(const wxString& hint)
 {
-    if ( wxGetWinVersion() >= wxWinVersion_Vista && wxUxThemeEngine::GetIfActive() )
+    if ( wxGetWinVersion() >= wxWinVersion_Vista && wxUxThemeIsActive() )
     {
         // notice that this message always works with Unicode strings
         //
@@ -987,7 +987,7 @@ bool wxTextEntry::SetHint(const wxString& hint)
 
 wxString wxTextEntry::GetHint() const
 {
-    if ( wxUxThemeEngine::GetIfActive() )
+    if ( wxUxThemeIsActive() )
     {
         wchar_t buf[256];
         if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
diff --git a/src/msw/uxtheme.cpp b/src/msw/uxtheme.cpp
index d488aeba4d..b117f18598 100644
--- a/src/msw/uxtheme.cpp
+++ b/src/msw/uxtheme.cpp
@@ -35,149 +35,13 @@
 
 #include "wx/msw/uxtheme.h"
 
-// ============================================================================
-// wxUxThemeModule
-// ============================================================================
-
-// this module is responsable for deleting the theme engine
-class wxUxThemeModule : public wxModule
+bool wxUxThemeIsActive()
 {
-public:
-    virtual bool OnInit() wxOVERRIDE { return true; }
-    virtual void OnExit() wxOVERRIDE
-    {
-        if ( wxUxThemeEngine::ms_themeEngine )
-        {
-            // this is probably not necessary right now but try to be careful
-            // and avoid the problems which we might have if someone ever
-            // decides to show a message box using the theme engine from
-            // wxUxThemeEngine dtor (e.g. from wxDynamicLibrary dtor...) or
-            // something like this
-            wxUxThemeEngine *themeEngine = wxUxThemeEngine::ms_themeEngine;
-            wxUxThemeEngine::ms_themeEngine = NULL;
-            wxUxThemeEngine::ms_isThemeEngineAvailable = -1;
-
-            delete themeEngine;
-        }
-    }
-
-
-    wxDECLARE_DYNAMIC_CLASS(wxUxThemeModule);
-};
-
-wxIMPLEMENT_DYNAMIC_CLASS(wxUxThemeModule, wxModule);
-
-// ============================================================================
-// wxUxThemeEngine implementation
-// ============================================================================
-
-wxUxThemeEngine *wxUxThemeEngine::ms_themeEngine = NULL;
-int wxUxThemeEngine::ms_isThemeEngineAvailable = -1;        // unknown
-
-wxUxThemeEngine* wxUxThemeEngine::Get()
-{
-    // we assume that themes are only used in the main thread hence no need for
-    // critical section here
-    if ( ms_isThemeEngineAvailable == -1 )
-    {
-        // we're called or the first time, check if the themes are available
-        ms_themeEngine = new wxUxThemeEngine;
-        if ( !ms_themeEngine->Initialize() )
-        {
-            // can't use themes, probably because the system doesn't support
-            // them, don't do it again
-            delete ms_themeEngine;
-            ms_themeEngine = NULL;
-
-            ms_isThemeEngineAvailable = false;
-        }
-        else // initialized ok
-        {
-            ms_isThemeEngineAvailable = true;
-        }
-    }
-
-    return ms_themeEngine;
+	return ::IsAppThemed() && ::IsThemeActive();
 }
-
-bool wxUxThemeEngine::Initialize()
+#else
+bool wxUxThemeIsActive()
 {
-    if ( wxApp::GetComCtl32Version() < 600 )
-    {
-        // not using theme-aware comctl32.dll anyhow, don't even try to use
-        // themes
-        return false;
-    }
-
-    // we're prepared to handle the errors
-    wxLogNull noLog;
-
-    if ( !m_dllUxTheme.Load(wxT("uxtheme.dll")) )
-        return false;
-
-#define RESOLVE_OPTIONAL_UXTHEME_FUNCTION(type, funcname)                     \
-    funcname = (type)m_dllUxTheme.GetSymbol(wxT(#funcname))
-
-#define RESOLVE_UXTHEME_FUNCTION(type, funcname)                              \
-    RESOLVE_OPTIONAL_UXTHEME_FUNCTION(type, funcname);						  \
-    if ( !funcname )                                                          \
-        return false
-
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUOPENTHEMEDATA, OpenThemeData);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUCLOSETHEMEDATA, CloseThemeData);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUDRAWTHEMEBACKGROUND, DrawThemeBackground);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUDRAWTHEMEBACKGROUNDEX, DrawThemeBackgroundEx);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUDRAWTHEMETEXT, DrawThemeText);
-    // This function is not available under XP, so don't fail if it can't be
-    // resolved, we'll check before using it.
-    RESOLVE_OPTIONAL_UXTHEME_FUNCTION(PFNWXUDRAWTHEMETEXTEX, DrawThemeTextEx);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEBACKGROUNDCONTENTRECT, GetThemeBackgroundContentRect);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEBACKGROUNDEXTENT, GetThemeBackgroundExtent);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEPARTSIZE, GetThemePartSize);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMETEXTEXTENT, GetThemeTextExtent);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMETEXTMETRICS, GetThemeTextMetrics);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEBACKGROUNDREGION, GetThemeBackgroundRegion);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUHITTESTTHEMEBACKGROUND, HitTestThemeBackground);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUDRAWTHEMEEDGE, DrawThemeEdge);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUDRAWTHEMEICON, DrawThemeIcon);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUISTHEMEPARTDEFINED, IsThemePartDefined);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUISTHEMEBACKGROUNDPARTIALLYTRANSPARENT, IsThemeBackgroundPartiallyTransparent);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMECOLOR, GetThemeColor);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEMETRIC, GetThemeMetric);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMESTRING, GetThemeString);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEBOOL, GetThemeBool);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEINT, GetThemeInt);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEENUMVALUE, GetThemeEnumValue);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEPOSITION, GetThemePosition);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEFONT, GetThemeFont);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMERECT, GetThemeRect);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEMARGINS, GetThemeMargins);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEINTLIST, GetThemeIntList);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEPROPERTYORIGIN, GetThemePropertyOrigin);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUSETWINDOWTHEME, SetWindowTheme);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEFILENAME, GetThemeFilename);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMESYSCOLOR, GetThemeSysColor);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMESYSCOLORBRUSH, GetThemeSysColorBrush);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMESYSBOOL, GetThemeSysBool);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMESYSSIZE, GetThemeSysSize);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMESYSFONT, GetThemeSysFont);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMESYSSTRING, GetThemeSysString);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMESYSINT, GetThemeSysInt);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUISTHEMEACTIVE, IsThemeActive);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUISAPPTHEMED, IsAppThemed);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETWINDOWTHEME, GetWindowTheme);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUENABLETHEMEDIALOGTEXTURE, EnableThemeDialogTexture);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUISTHEMEDIALOGTEXTUREENABLED, IsThemeDialogTextureEnabled);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEAPPPROPERTIES, GetThemeAppProperties);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUSETTHEMEAPPPROPERTIES, SetThemeAppProperties);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETCURRENTTHEMENAME, GetCurrentThemeName);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUGETTHEMEDOCUMENTATIONPROPERTY, GetThemeDocumentationProperty);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUDRAWTHEMEPARENTBACKGROUND, DrawThemeParentBackground);
-    RESOLVE_UXTHEME_FUNCTION(PFNWXUENABLETHEMING, EnableTheming);
-
-#undef RESOLVE_UXTHEME_FUNCTION
-
-    return true;
+	return false;
 }
-
 #endif // wxUSE_UXTHEME
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 41e84b5559..a63333f0f8 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1461,8 +1461,7 @@ wxBorder wxWindowMSW::TranslateBorder(wxBorder border) const
     {
         if (CanApplyThemeBorder())
         {
-            wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-            if (theme)
+            if ( wxUxThemeIsActive() )
                 return wxBORDER_THEME;
         }
         return wxBORDER_SUNKEN;
@@ -3647,9 +3646,8 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
         // If we want the default themed border then we need to draw it ourselves
         case WM_NCCALCSIZE:
             {
-                wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
                 const wxBorder border = TranslateBorder(GetBorder());
-                if (theme && border == wxBORDER_THEME)
+                if (wxUxThemeIsActive() && border == wxBORDER_THEME)
                 {
                     // first ask the widget to calculate the border size
                     rc.result = MSWDefWindowProc(message, wParam, lParam);
@@ -3674,7 +3672,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                     wxClientDC dc((wxWindow *)this);
                     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
 
-                    if ( theme->GetThemeBackgroundContentRect
+                    if ( ::GetThemeBackgroundContentRect
                                 (
                                  hTheme,
                                  GetHdcOf(*impl),
@@ -3699,9 +3697,8 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 
         case WM_NCPAINT:
             {
-                wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
                 const wxBorder border = TranslateBorder(GetBorder());
-                if (theme && border == wxBORDER_THEME)
+                if (wxUxThemeIsActive() && border == wxBORDER_THEME)
                 {
                     // first ask the widget to paint its non-client area, such as scrollbars, etc.
                     rc.result = MSWDefWindowProc(message, wParam, lParam);
@@ -3716,7 +3713,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                     wxCopyRectToRECT(GetSize(), rcBorder);
 
                     RECT rcClient;
-                    theme->GetThemeBackgroundContentRect(
+                    ::GetThemeBackgroundContentRect(
                         hTheme, GetHdcOf(*impl), EP_EDITTEXT, ETS_NORMAL, &rcBorder, &rcClient);
                     InflateRect(&rcClient, -1, -1);
 
@@ -3724,9 +3721,9 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                                       rcClient.right, rcClient.bottom);
 
                     // Make sure the background is in a proper state
-                    if (theme->IsThemeBackgroundPartiallyTransparent(hTheme, EP_EDITTEXT, ETS_NORMAL))
+                    if (::IsThemeBackgroundPartiallyTransparent(hTheme, EP_EDITTEXT, ETS_NORMAL))
                     {
-                        theme->DrawThemeParentBackground(GetHwnd(), GetHdcOf(*impl), &rcBorder);
+                        ::DrawThemeParentBackground(GetHwnd(), GetHdcOf(*impl), &rcBorder);
                     }
 
                     // Draw the border
@@ -3738,7 +3735,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                     //    nState = ETS_READONLY;
                     else
                         nState = ETS_NORMAL;
-                    theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), EP_EDITTEXT, nState, &rcBorder, NULL);
+                    ::DrawThemeBackground(hTheme, GetHdcOf(*impl), EP_EDITTEXT, nState, &rcBorder, NULL);
                 }
             }
             break;
@@ -4846,8 +4843,7 @@ wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
                                         wxSystemColour fallback) const
 {
 #if wxUSE_UXTHEME
-    const wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-    if ( theme )
+    if ( wxUxThemeIsActive() )
     {
         int themeProperty = 0;
 
@@ -4869,7 +4865,7 @@ wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
 
         wxUxThemeHandle hTheme((const wxWindow *)this, themeName);
         COLORREF col;
-        HRESULT hr = theme->GetThemeColor
+        HRESULT hr = ::GetThemeColor
                             (
                                 hTheme,
                                 themePart,
diff --git a/tests/benchmarks/makefile.bcc b/tests/benchmarks/makefile.bcc
index 5924b9092a..b34d95adee 100644
--- a/tests/benchmarks/makefile.bcc
+++ b/tests/benchmarks/makefile.bcc
@@ -279,7 +279,7 @@ clean:
 
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
+	c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
 |
 
 data: 
@@ -289,14 +289,14 @@ data:
 !if "$(USE_GUI)" == "1"
 $(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS)  $(OBJS)\bench_gui_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(BENCH_GUI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\bench_gui_sample.res
+	c0x32.obj $(BENCH_GUI_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\bench_gui_sample.res
 |
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS)  $(OBJS)\bench_graphics_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(BENCH_GRAPHICS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\bench_graphics_sample.res
+	c0x32.obj $(BENCH_GRAPHICS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\bench_graphics_sample.res
 |
 !endif
 
diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index 661f02003a..54948a8494 100644
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -262,7 +262,7 @@ clean:
 	-if exist $(OBJS)\bench_graphics.exe del $(OBJS)\bench_graphics.exe
 
 $(OBJS)\bench.exe: $(BENCH_OBJECTS)
-	$(CXX) -o $@ $(BENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(BENCH_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
@@ -270,12 +270,12 @@ data:
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample_rc.o
-	$(CXX) -o $@ $(BENCH_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(BENCH_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample_rc.o
-	$(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 data-image: 
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 2466423dad..25f9fc68d1 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -499,27 +499,27 @@ clean:
 
 $(OBJS)\test.exe: $(OBJS)\test_dummy.obj  $(TEST_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+	c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj  $(TEST_DRAWING_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(TEST_DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+	c0x32.obj $(TEST_DRAWING_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 !endif
 
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
 	ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0d32.obj $(TEST_DRAWINGPLUGIN_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
+	c0d32.obj $(TEST_DRAWINGPLUGIN_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,,
 |
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS)  $(OBJS)\test_gui_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|
-	c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res
+	c0x32.obj $(TEST_GUI_OBJECTS),$@,, $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_2).lib,, $(OBJS)\test_gui_sample.res
 |
 !endif
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 6ff71503e1..c6971bac0b 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -481,23 +481,23 @@ clean:
 	-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)
-	$(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TEST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_drawing.exe: $(TEST_DRAWING_OBJECTS)
-	$(CXX) -o $@ $(TEST_DRAWING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TEST_DRAWING_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
-	$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 endif
 
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
-	$(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(TEST_GUI_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p) $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 data: 
diff --git a/utils/emulator/src/makefile.bcc b/utils/emulator/src/makefile.bcc
index 2c94394082..78fc8b8bb4 100644
--- a/utils/emulator/src/makefile.bcc
+++ b/utils/emulator/src/makefile.bcc
@@ -228,7 +228,7 @@ clean:
 
 $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS)  $(OBJS)\wxemulator_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res
+	c0w32.obj $(WXEMULATOR_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxemulator_sample.res
 |
 
 data: 
diff --git a/utils/emulator/src/makefile.gcc b/utils/emulator/src/makefile.gcc
index 0caef3596f..57131c98c3 100644
--- a/utils/emulator/src/makefile.gcc
+++ b/utils/emulator/src/makefile.gcc
@@ -218,7 +218,7 @@ clean:
 	-if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe
 
 $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o
-	$(CXX) -o $@ $(WXEMULATOR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WXEMULATOR_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/utils/execmon/makefile.bcc b/utils/execmon/makefile.bcc
index 2574f751d1..49d128dd8e 100644
--- a/utils/execmon/makefile.bcc
+++ b/utils/execmon/makefile.bcc
@@ -192,7 +192,7 @@ clean:
 !if "$(USE_XRC)" == "1"
 $(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0x32.obj $(EXECMON_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+	c0x32.obj $(EXECMON_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
 |
 !endif
 
diff --git a/utils/execmon/makefile.gcc b/utils/execmon/makefile.gcc
index 6a478494f8..26a7f1325c 100644
--- a/utils/execmon/makefile.gcc
+++ b/utils/execmon/makefile.gcc
@@ -179,7 +179,7 @@ clean:
 
 ifeq ($(USE_XRC),1)
 $(OBJS)\execmon.exe: $(EXECMON_OBJECTS)
-	$(CXX) -o $@ $(EXECMON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(EXECMON_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\execmon_execmon.o: ./execmon.cpp
diff --git a/utils/helpview/src/makefile.bcc b/utils/helpview/src/makefile.bcc
index 5ae7fc971e..d33ee6cebe 100644
--- a/utils/helpview/src/makefile.bcc
+++ b/utils/helpview/src/makefile.bcc
@@ -236,7 +236,7 @@ clean:
 
 $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS)  $(OBJS)\helpview_helpview.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
+	c0w32.obj $(HELPVIEW_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\helpview_helpview.res
 |
 
 data: 
diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc
index 22bafa48f7..74e88de902 100644
--- a/utils/helpview/src/makefile.gcc
+++ b/utils/helpview/src/makefile.gcc
@@ -226,7 +226,7 @@ clean:
 	-if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe
 
 $(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview_rc.o
-	$(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(HELPVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
diff --git a/utils/hhp2cached/makefile.bcc b/utils/hhp2cached/makefile.bcc
index 48fddafef1..016d3a8808 100644
--- a/utils/hhp2cached/makefile.bcc
+++ b/utils/hhp2cached/makefile.bcc
@@ -232,7 +232,7 @@ clean:
 
 $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS)  $(OBJS)\hhp2cached_hhp2cached.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res
+	c0w32.obj $(HHP2CACHED_OBJECTS),$@,, $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\hhp2cached_hhp2cached.res
 |
 
 $(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp
diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc
index 627964f550..2b4c392b34 100644
--- a/utils/hhp2cached/makefile.gcc
+++ b/utils/hhp2cached/makefile.gcc
@@ -222,7 +222,7 @@ clean:
 	-if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe
 
 $(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached_rc.o
-	$(CXX) -o $@ $(HHP2CACHED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(HHP2CACHED_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\hhp2cached_hhp2cached.o: ./hhp2cached.cpp
 	$(CXX) -c -o $@ $(HHP2CACHED_CXXFLAGS) $(CPPDEPS) $<
diff --git a/utils/ifacecheck/src/makefile.bcc b/utils/ifacecheck/src/makefile.bcc
index a68e7d71e6..06689c3ff8 100644
--- a/utils/ifacecheck/src/makefile.bcc
+++ b/utils/ifacecheck/src/makefile.bcc
@@ -193,7 +193,7 @@ clean:
 
 $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+	c0x32.obj $(IFACECHECK_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
 |
 
 $(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp
diff --git a/utils/ifacecheck/src/makefile.gcc b/utils/ifacecheck/src/makefile.gcc
index 20e01304a6..60cdcb016c 100644
--- a/utils/ifacecheck/src/makefile.gcc
+++ b/utils/ifacecheck/src/makefile.gcc
@@ -180,7 +180,7 @@ clean:
 	-if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe
 
 $(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS)
-	$(CXX) -o $@ $(IFACECHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(IFACECHECK_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\ifacecheck_ifacecheck.o: ./ifacecheck.cpp
 	$(CXX) -c -o $@ $(IFACECHECK_CXXFLAGS) $(CPPDEPS) $<
diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc
index d8e7165904..86bf5c8436 100644
--- a/utils/screenshotgen/src/makefile.bcc
+++ b/utils/screenshotgen/src/makefile.bcc
@@ -253,7 +253,7 @@ clean:
 
 $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS)  $(OBJS)\screenshotgen_screenshotgen.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res
+	c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res
 |
 
 bitmaps: 
diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc
index bd76ffc614..3c759d1139 100644
--- a/utils/screenshotgen/src/makefile.gcc
+++ b/utils/screenshotgen/src/makefile.gcc
@@ -242,7 +242,7 @@ clean:
 	-if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe
 
 $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen_rc.o
-	$(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 bitmaps: 
 	if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
diff --git a/utils/wxrc/makefile.bcc b/utils/wxrc/makefile.bcc
index 54e69ddced..2a709cd248 100644
--- a/utils/wxrc/makefile.bcc
+++ b/utils/wxrc/makefile.bcc
@@ -196,7 +196,7 @@ clean:
 !if "$(USE_XRC)" == "1"
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+	c0x32.obj $(WXRC_OBJECTS),$@,, $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
 |
 !endif
 
diff --git a/utils/wxrc/makefile.gcc b/utils/wxrc/makefile.gcc
index e16e5df9ab..4ee929cc02 100644
--- a/utils/wxrc/makefile.gcc
+++ b/utils/wxrc/makefile.gcc
@@ -183,7 +183,7 @@ clean:
 
 ifeq ($(USE_XRC),1)
 $(OBJS)\wxrc.exe: $(WXRC_OBJECTS)
-	$(CXX) -o $@ $(WXRC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc
+	$(CXX) -o $@ $(WXRC_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\wxrc_wxrc.o: ./wxrc.cpp

From d9306f127a9968a86a5fa3ca720fe05b48bccf40 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Sun, 21 Jan 2018 15:45:01 +0100
Subject: [PATCH 180/916] Remove unused definitions in msw/checkbox.cpp

---
 src/msw/checkbox.cpp | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 8fa7609571..fa8ca811ce 100644
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -39,40 +39,6 @@
 #include "wx/msw/private/button.h"
 #include "wx/msw/missing.h"
 
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-#ifndef BP_CHECKBOX
-    #define BP_CHECKBOX 3
-#endif
-
-// these values are defined in tmschema.h (except the first one)
-enum
-{
-    CBS_INVALID,
-    CBS_UNCHECKEDNORMAL,
-    CBS_UNCHECKEDHOT,
-    CBS_UNCHECKEDPRESSED,
-    CBS_UNCHECKEDDISABLED,
-    CBS_CHECKEDNORMAL,
-    CBS_CHECKEDHOT,
-    CBS_CHECKEDPRESSED,
-    CBS_CHECKEDDISABLED,
-    CBS_MIXEDNORMAL,
-    CBS_MIXEDHOT,
-    CBS_MIXEDPRESSED,
-    CBS_MIXEDDISABLED
-};
-
-// these are our own
-enum
-{
-    CBS_HOT_OFFSET = 1,
-    CBS_PRESSED_OFFSET = 2,
-    CBS_DISABLED_OFFSET = 3
-};
-
 // ============================================================================
 // implementation
 // ============================================================================

From 2d064ea3b9cfc48cf0f4b4584a7c3052a7b19951 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Sun, 21 Jan 2018 17:04:09 +0100
Subject: [PATCH 181/916] Move UXTheme symbol definitions for Vista+ to
 msw/uxtheme.h

Remove various definitions and symbol declarations from
numerous files using msw/uxtheme.h to a single file.
When possible vssym32.h is included from the Windows SDK.
For older SDKs tmschema.h is included and missing symbols
are defined in msw/uxtheme.h.
---
 include/wx/msw/uxtheme.h     | 139 +++++++++++++++++++++++++++++++++++
 src/aui/barartmsw.cpp        |  31 --------
 src/aui/tabartmsw.cpp        |  36 +--------
 src/generic/richtooltipg.cpp |   6 --
 src/msw/anybutton.cpp        |  13 ----
 src/msw/bmpbuttn.cpp         |  15 ----
 src/msw/combo.cpp            |  71 ------------------
 src/msw/menuitem.cpp         |  47 ------------
 src/msw/renderer.cpp         |  87 ----------------------
 src/msw/statbox.cpp          |   7 --
 src/msw/window.cpp           |   8 --
 11 files changed, 140 insertions(+), 320 deletions(-)

diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index b081ed2fc5..876744975a 100644
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -16,6 +16,145 @@
 #include "wx/msw/private.h"     // we use GetHwndOf()
 #include <uxtheme.h>
 
+#if defined(DTPB_WINDOWDC)
+// DTPB_WINDOWDC has been added for Vista so it's save to assume that an SDK
+// including it has vssym32.h available
+#define HAVE_VSSYM32
+#endif
+
+#if defined(HAVE_VSSYM32)
+#include <vssym32.h>
+#else
+#include <tmschema.h>
+#endif
+
+// ----------------------------------------------------------------------------
+// Definitions for legacy Windows SDKs
+// ----------------------------------------------------------------------------
+// Some defintions introduced with Windows Vista might be missing in older SDKs
+// Missing defintions are added here for compatiblity
+
+#ifndef VSCLASS_LISTVIEW
+#define LISS_NORMAL 1
+#define LISS_HOT 2
+#define LISS_SELECTED 3
+#define LISS_DISABLED 4
+#define LISS_SELECTEDNOTFOCUS 5
+#define LISS_HOTSELECTED 6
+#endif
+
+#ifndef DTT_TEXTCOLOR
+#define DTT_TEXTCOLOR       (1UL << 0)      // crText has been specified
+#define DTT_STATEID         (1UL << 8)      // IStateId has been specified
+#endif
+
+#ifndef DSS_HIDEPREFIX
+#define DSS_HIDEPREFIX  0x0200
+#define DSS_PREFIXONLY  0x0400
+#endif
+
+#ifndef TMT_FONT
+#define TMT_FONT	210
+#endif
+
+#ifndef HAVE_VSSYM32
+enum EXPANDOBUTTONSTATES {
+    TDLGEBS_NORMAL = 1,
+    TDLGEBS_HOVER = 2,
+    TDLGEBS_PRESSED = 3,
+    TDLGEBS_EXPANDEDNORMAL = 4,
+    TDLGEBS_EXPANDEDHOVER = 5,
+    TDLGEBS_EXPANDEDPRESSED = 6,
+    TDLGEBS_NORMALDISABLED = 7,
+    TDLGEBS_EXPANDEDDISABLED = 8,
+};
+
+enum TASKDIALOGPARTS {
+    TDLG_PRIMARYPANEL = 1,
+    TDLG_MAININSTRUCTIONPANE = 2,
+    TDLG_MAINICON = 3,
+    TDLG_CONTENTPANE = 4,
+    TDLG_CONTENTICON = 5,
+    TDLG_EXPANDEDCONTENT = 6,
+    TDLG_COMMANDLINKPANE = 7,
+    TDLG_SECONDARYPANEL = 8,
+    TDLG_CONTROLPANE = 9,
+    TDLG_BUTTONSECTION = 10,
+    TDLG_BUTTONWRAPPER = 11,
+    TDLG_EXPANDOTEXT = 12,
+    TDLG_EXPANDOBUTTON = 13,
+    TDLG_VERIFICATIONTEXT = 14,
+    TDLG_FOOTNOTEPANE = 15,
+    TDLG_FOOTNOTEAREA = 16,
+    TDLG_FOOTNOTESEPARATOR = 17,
+    TDLG_EXPANDEDFOOTERAREA = 18,
+    TDLG_PROGRESSBAR = 19,
+    TDLG_IMAGEALIGNMENT = 20,
+    TDLG_RADIOBUTTONPANE = 21,
+};
+
+#define CP_BACKGROUND 2
+#define CP_TRANSPARENTBACKGROUND 3
+#define CP_BORDER 4
+#define CP_READONLY 5
+#define CP_DROPDOWNBUTTONRIGHT 6
+#define CP_DROPDOWNBUTTONLEFT 7
+#define CP_CUEBANNER 8
+
+#define RP_BACKGROUND 6
+#define RP_SPLITTER 7
+#define RP_SPLITTERVERT 8
+
+enum BORDERSTATES {
+    CBB_NORMAL = 1,
+    CBB_HOT = 2,
+    CBB_FOCUSED = 3,
+    CBB_DISABLED = 4,
+};
+
+enum MENUPARTS
+{
+    MENU_MENUITEM_TMSCHEMA = 1,
+    MENU_SEPARATOR_TMSCHEMA = 6,
+    MENU_POPUPBACKGROUND = 9,
+    MENU_POPUPBORDERS = 10,
+    MENU_POPUPCHECK = 11,
+    MENU_POPUPCHECKBACKGROUND = 12,
+    MENU_POPUPGUTTER = 13,
+    MENU_POPUPITEM = 14,
+    MENU_POPUPSEPARATOR = 15,
+    MENU_POPUPSUBMENU = 16,
+};
+
+enum POPUPITEMSTATES
+{
+    MPI_NORMAL = 1,
+    MPI_HOT = 2,
+    MPI_DISABLED = 3,
+    MPI_DISABLEDHOT = 4,
+};
+
+enum POPUPCHECKBACKGROUNDSTATES
+{
+    MCB_DISABLED = 1,
+    MCB_NORMAL = 2,
+    MCB_BITMAP = 3,
+};
+
+enum POPUPCHECKSTATES
+{
+    MC_CHECKMARKNORMAL = 1,
+    MC_CHECKMARKDISABLED = 2,
+    MC_BULLETNORMAL = 3,
+    MC_BULLETDISABLED = 4,
+};
+
+#endif
+
+// ----------------------------------------------------------------------------
+// End definitions for legacy Windows SDKs
+// ----------------------------------------------------------------------------
+
 // Amazingly, GetThemeFont() and GetThemeSysFont() functions use LOGFONTA under
 // XP but LOGFONTW (even in non-Unicode build) under later versions of Windows.
 // If we declare them as taking LOGFONT below, the code would be able to
diff --git a/src/aui/barartmsw.cpp b/src/aui/barartmsw.cpp
index b01f5dcdeb..87eb536ce7 100644
--- a/src/aui/barartmsw.cpp
+++ b/src/aui/barartmsw.cpp
@@ -27,37 +27,6 @@
 
 #if wxUSE_AUI
 
-#define RP_GRIPPER 1
-#define RP_GRIPPERVERT 2
-#define RP_BAND 3
-#define RP_CHEVRON 4
-#define RP_CHEVRONVERT 5
-#define RP_BACKGROUND 6
-#define RP_SPLITTER 7
-#define RP_SPLITTERVERT 8
-
-#define CHEVS_NORMAL 1
-#define CHEVS_HOT 2
-#define CHEVS_PRESSED 3
-
-#define TP_BUTTON 1
-#define TP_DROPDOWNBUTTON 2
-#define TP_SPLITBUTTON 3
-#define TP_SPLITBUTTONDROPDOWN 4
-#define TP_SEPARATOR 5
-#define TP_SEPARATORVERT 6
-#define TP_DROPDOWNBUTTONGLYPH 7
-
-#define TS_NORMAL 1
-#define TS_HOT 2
-#define TS_PRESSED 3
-#define TS_DISABLED 4
-#define TS_CHECKED 5
-#define TS_HOTCHECKED 6
-#define TS_NEARHOT 7
-#define TS_OTHERSIDEHOT 8
-
-
 wxAuiMSWToolBarArt::wxAuiMSWToolBarArt()
 {
     if ( wxUxThemeIsActive() )
diff --git a/src/aui/tabartmsw.cpp b/src/aui/tabartmsw.cpp
index 477fd1341a..9276070124 100644
--- a/src/aui/tabartmsw.cpp
+++ b/src/aui/tabartmsw.cpp
@@ -25,40 +25,6 @@
 
 #if wxUSE_AUI
 
-#ifndef CP_DROPDOWNBUTTON
-
-    #define TABP_TABITEM 1
-    #define TABP_TABITEMLEFTEDGE 2
-    #define TABP_TABITEMRIGHTEDGE 3
-    #define TABP_TABITEMBOTHEDGE 4
-    #define TABP_TOPTABITEM 5
-    #define TABP_TOPTABITEMLEFTEDGE 6
-    #define TABP_TOPTABITEMRIGHTEDGE 7
-    #define TABP_TOPTABITEMBOTHEDGE 8
-    #define TABP_PANE 9
-    #define TABP_BODY 10
-    #define TABP_AEROWIZARDBODY 11
-
-    #define TIS_NORMAL 1
-    #define TIS_HOT 2
-    #define TIS_SELECTED 3
-    #define TIS_DISABLED 4
-    #define TIS_FOCUSED 5
-
-    #define TTP_CLOSE 5
-
-    #define TTCS_NORMAL 1
-    #define TTCS_HOT 2
-    #define TTCS_PRESSED 3
-
-    #define SPNP_UPHORZ 3
-    #define SPNP_DOWNHORZ 4
-
-    #define CP_DROPDOWNBUTTON1  1
-
-    #define WP_CLOSEBUTTON 18
-#endif
-
 wxAuiMSWTabArt::wxAuiMSWTabArt()
 {
     m_closeBtnSize = wxDefaultSize;
@@ -410,7 +376,7 @@ void wxAuiMSWTabArt::DrawButton(wxDC& dc,
         break;
     case wxAUI_BUTTON_WINDOWLIST:
         themeId = L"Combobox";
-        part = CP_DROPDOWNBUTTON1;
+        part = CP_DROPDOWNBUTTON;
         break;
     }
 
diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp
index 49b393a14d..5ebc1603ef 100644
--- a/src/generic/richtooltipg.cpp
+++ b/src/generic/richtooltipg.cpp
@@ -48,12 +48,6 @@
 
 #ifdef __WXMSW__
     #include "wx/msw/uxtheme.h"
-
-    static const int TTP_BALLOONTITLE = 4;
-
-    static const int TMT_TEXTCOLOR = 3803;
-    static const int TMT_GRADIENTCOLOR1 = 3810;
-    static const int TMT_GRADIENTCOLOR2 = 3811;
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp
index f8ef711d76..d896566b6f 100644
--- a/src/msw/anybutton.cpp
+++ b/src/msw/anybutton.cpp
@@ -55,19 +55,6 @@
 using namespace wxMSWImpl;
 
 #if wxUSE_UXTHEME
-    // no need to include tmschema.h
-    #ifndef BP_PUSHBUTTON
-        #define BP_PUSHBUTTON 1
-
-        #define PBS_NORMAL    1
-        #define PBS_HOT       2
-        #define PBS_PRESSED   3
-        #define PBS_DISABLED  4
-        #define PBS_DEFAULTED 5
-
-        #define TMT_CONTENTMARGINS 3602
-    #endif
-
     // provide the necessary declarations ourselves if they're missing from
     // headers
     #ifndef BCM_SETIMAGELIST
diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index cf16308670..3f23f6b1d8 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -30,21 +30,6 @@
 
 #include "wx/msw/uxtheme.h"
 
-#if wxUSE_UXTHEME
-    // no need to include tmschema.h
-    #ifndef BP_PUSHBUTTON
-        #define BP_PUSHBUTTON 1
-
-        #define PBS_NORMAL    1
-        #define PBS_HOT       2
-        #define PBS_PRESSED   3
-        #define PBS_DISABLED  4
-        #define PBS_DEFAULTED 5
-
-        #define TMT_CONTENTMARGINS 3602
-    #endif
-#endif // wxUSE_UXTHEME
-
 #ifndef ODS_NOFOCUSRECT
     #define ODS_NOFOCUSRECT     0x0200
 #endif
diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index f8a7098da6..2923f575c7 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -42,77 +42,6 @@
 #endif
 #include "wx/msw/dc.h"
 
-// Change to #if 1 to include tmschema.h for easier testing of theme
-// parameters.
-#if 0
-    #include <tmschema.h>
-    #include <VSStyle.h>
-#else
-    //----------------------------------
-    #define EP_EDITTEXT         1
-    #define ETS_NORMAL          1
-    #define ETS_HOT             2
-    #define ETS_SELECTED        3
-    #define ETS_DISABLED        4
-    #define ETS_FOCUSED         5
-    #define ETS_READONLY        6
-    #define ETS_ASSIST          7
-    #define TMT_FILLCOLOR       3802
-    #define TMT_TEXTCOLOR       3803
-    #define TMT_BORDERCOLOR     3801
-    #define TMT_EDGEFILLCOLOR   3808
-    #define TMT_BGTYPE          4001
-
-    #define BT_IMAGEFILE        0
-    #define BT_BORDERFILL       1
-
-    #define CP_DROPDOWNBUTTON           1
-    #define CP_BACKGROUND               2 // This and above are Vista and later only
-    #define CP_TRANSPARENTBACKGROUND    3
-    #define CP_BORDER                   4
-    #define CP_READONLY                 5
-    #define CP_DROPDOWNBUTTONRIGHT      6
-    #define CP_DROPDOWNBUTTONLEFT       7
-    #define CP_CUEBANNER                8
-
-    #define CBXS_NORMAL                 1
-    #define CBXS_HOT                    2
-    #define CBXS_PRESSED                3
-    #define CBXS_DISABLED               4
-
-    #define CBXSR_NORMAL                1
-    #define CBXSR_HOT                   2
-    #define CBXSR_PRESSED               3
-    #define CBXSR_DISABLED              4
-
-    #define CBXSL_NORMAL                1
-    #define CBXSL_HOT                   2
-    #define CBXSL_PRESSED               3
-    #define CBXSL_DISABLED              4
-
-    #define CBTBS_NORMAL                1
-    #define CBTBS_HOT                   2
-    #define CBTBS_DISABLED              3
-    #define CBTBS_FOCUSED               4
-
-    #define CBB_NORMAL                  1
-    #define CBB_HOT                     2
-    #define CBB_FOCUSED                 3
-    #define CBB_DISABLED                4
-
-    #define CBRO_NORMAL                 1
-    #define CBRO_HOT                    2
-    #define CBRO_PRESSED                3
-    #define CBRO_DISABLED               4
-
-    #define CBCB_NORMAL                 1
-    #define CBCB_HOT                    2
-    #define CBCB_PRESSED                3
-    #define CBCB_DISABLED               4
-
-#endif
-
-
 #define NATIVE_TEXT_INDENT_XP       4
 #define NATIVE_TEXT_INDENT_CLASSIC  2
 
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 8fbbc9f0c2..f39af0763f 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -143,53 +143,6 @@ inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
 #include "wx/fontutil.h"
 #include "wx/msw/private/metrics.h"
 
-#if wxUSE_UXTHEME
-
-enum MENUPARTS
-{
-    MENU_MENUITEM_TMSCHEMA = 1,
-    MENU_SEPARATOR_TMSCHEMA = 6,
-    MENU_POPUPBACKGROUND = 9,
-    MENU_POPUPBORDERS = 10,
-    MENU_POPUPCHECK = 11,
-    MENU_POPUPCHECKBACKGROUND = 12,
-    MENU_POPUPGUTTER = 13,
-    MENU_POPUPITEM = 14,
-    MENU_POPUPSEPARATOR = 15,
-    MENU_POPUPSUBMENU = 16,
-};
-
-
-enum POPUPITEMSTATES
-{
-    MPI_NORMAL = 1,
-    MPI_HOT = 2,
-    MPI_DISABLED = 3,
-    MPI_DISABLEDHOT = 4,
-};
-
-enum POPUPCHECKBACKGROUNDSTATES
-{
-    MCB_DISABLED = 1,
-    MCB_NORMAL = 2,
-    MCB_BITMAP = 3,
-};
-
-enum POPUPCHECKSTATES
-{
-    MC_CHECKMARKNORMAL = 1,
-    MC_CHECKMARKDISABLED = 2,
-    MC_BULLETNORMAL = 3,
-    MC_BULLETDISABLED = 4,
-};
-
-const int TMT_MENUFONT       = 803;
-const int TMT_BORDERSIZE     = 2403;
-const int TMT_CONTENTMARGINS = 3602;
-const int TMT_SIZINGMARGINS  = 3601;
-
-#endif // wxUSE_UXTHEME
-
 #endif // wxUSE_OWNER_DRAWN
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 6a3a650997..fff5432e6d 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -40,93 +40,6 @@
 #include "wx/msw/uxtheme.h"
 #include "wx/dynlib.h"
 
-// tmschema.h is in Win32 Platform SDK and might not be available with earlier
-// compilers
-#ifndef CP_DROPDOWNBUTTON
-    #define BP_PUSHBUTTON      1
-    #define BP_RADIOBUTTON     2
-    #define BP_CHECKBOX        3
-    #define RBS_UNCHECKEDNORMAL 1
-    #define RBS_CHECKEDNORMAL   (RBS_UNCHECKEDNORMAL + 4)
-    #define RBS_MIXEDNORMAL     (RBS_CHECKEDNORMAL + 4)
-    #define CBS_UNCHECKEDNORMAL 1
-    #define CBS_CHECKEDNORMAL   (CBS_UNCHECKEDNORMAL + 4)
-    #define CBS_MIXEDNORMAL     (CBS_CHECKEDNORMAL + 4)
-
-    #define PBS_NORMAL          1
-    #define PBS_HOT             2
-    #define PBS_PRESSED         3
-    #define PBS_DISABLED        4
-    #define PBS_DEFAULTED       5
-
-    #define CP_DROPDOWNBUTTON  1
-
-    #define CBXS_NORMAL        1
-    #define CBXS_HOT           2
-    #define CBXS_PRESSED       3
-    #define CBXS_DISABLED      4
-
-    #define TVP_GLYPH           2
-
-    #define GLPS_CLOSED         1
-    #define GLPS_OPENED         2
-
-    #define HP_HEADERITEM       1
-
-    #define HIS_NORMAL          1
-    #define HIS_HOT             2
-    #define HIS_PRESSED         3
-
-    #define TMT_HEIGHT          2417
-
-    #define HP_HEADERSORTARROW  4
-    #define HSAS_SORTEDUP       1
-    #define HSAS_SORTEDDOWN     2
-
-    #define EP_EDITTEXT         1
-    #define ETS_NORMAL          1
-    #define ETS_HOT             2
-    #define ETS_SELECTED        3
-    #define ETS_DISABLED        4
-    #define ETS_FOCUSED         5
-    #define ETS_READONLY        6
-    #define ETS_ASSIST          7
-    #define TMT_FILLCOLOR       3802
-    #define TMT_TEXTCOLOR       3803
-    #define TMT_BORDERCOLOR     3801
-    #define TMT_EDGEFILLCOLOR   3808
-
-    #define WP_MINBUTTON 15
-    #define WP_MAXBUTTON 17
-    #define WP_CLOSEBUTTON 18
-    #define WP_RESTOREBUTTON 21
-    #define WP_HELPBUTTON 23
-
-    #define PP_BAR 1
-    #define PP_CHUNK 3
-
-    #define LISS_NORMAL 1
-    #define LISS_HOT 2
-    #define LISS_SELECTED 3
-    #define LISS_DISABLED 4
-    #define LISS_SELECTEDNOTFOCUS 5
-    #define LISS_HOTSELECTED 6
-
-    #define LVP_LISTITEM 1
-
-    #define DTT_TEXTCOLOR       (1UL << 0)      // crText has been specified
-    #define DTT_STATEID         (1UL << 8)      // IStateId has been specified
-
-    #define TDLG_EXPANDOBUTTON 13
-
-    #define TDLGEBS_NORMAL 1
-    #define TDLGEBS_HOVER 2
-    #define TDLGEBS_PRESSED 3
-    #define TDLGEBS_EXPANDEDNORMAL 4
-    #define TDLGEBS_EXPANDEDHOVER 5
-    #define TDLGEBS_EXPANDEDPRESSED 6
-#endif
-
 // These Vista+ only types used by DrawThemeTextEx may not be available in older SDK headers
 typedef int(__stdcall *WXDTT_CALLBACK_PROC)(HDC hdc, const wchar_t * pszText,
     int cchText, RECT * prc, unsigned int dwFlags, WXLPARAM lParam);
diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index d028b60f30..1dc7228864 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -47,13 +47,6 @@
 #include "wx/msw/dc.h"
 #include "wx/msw/private/winstyle.h"
 
-// the values coincide with those in tmschema.h
-#define BP_GROUPBOX 4
-
-#define GBS_NORMAL 1
-
-#define TMT_FONT 210
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index a63333f0f8..ead90f0321 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -113,14 +113,6 @@
 
 #if wxUSE_UXTHEME
     #include "wx/msw/uxtheme.h"
-    #define EP_EDITTEXT         1
-    #define ETS_NORMAL          1
-    #define ETS_HOT             2
-    #define ETS_SELECTED        3
-    #define ETS_DISABLED        4
-    #define ETS_FOCUSED         5
-    #define ETS_READONLY        6
-    #define ETS_ASSIST          7
 #endif
 
 #if wxUSE_DYNLIB_CLASS

From 95595d660b771c96ca5f56ebe0d256294abd7fd4 Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Mon, 22 Jan 2018 10:44:27 +0100
Subject: [PATCH 182/916] Add #undef HAVE_XLOCALE_H

---
 setup.h_vms | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.h_vms b/setup.h_vms
index 5e4e41afc7..363134616a 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 12 December 2017                                                   *
+ * Date : 22 January 2018                                                    *
  *                                                                           *
  *****************************************************************************/
 
@@ -1387,6 +1387,9 @@ typedef pid_t GPid;
 /* Define if setpriority() is available. */
 #undef HAVE_SETPRIORITY
 
+/* Define if xlocale.h header file exists. */
+#undef HAVE_XLOCALE_H
+
 /* Define if locale_t is available */
 #undef HAVE_LOCALE_T
 

From 9981a0216f841d02d306afaa01990c5ae749cf51 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Jan 2018 19:54:36 +0100
Subject: [PATCH 183/916] Add "windowlabel" element of wxStaticBoxSizer to the
 schema

This was forgotten in the commit updating the sizer XRC handler.
---
 misc/schema/xrc_schema.rnc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index b298088e45..ba9a688340 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -1864,6 +1864,7 @@ wxStaticBoxSizer_horz =
         stdObjectNodeAttributes &
         stdSizerProperties &
         [xrc:p="important"] element label {_, t_text }* &
+        element windowlabel {windowNode}* &
         [xrc:p="o"] element orient  {_, "wxHORIZONTAL" }* &
         (wxBoxSizer_horz_item | objectRef)*
     }
@@ -1874,6 +1875,7 @@ wxStaticBoxSizer_vert =
         stdObjectNodeAttributes &
         stdSizerProperties &
         [xrc:p="important"] element label {_, t_text }* &
+        element windowlabel {windowNode}* &
         element orient {_, "wxVERTICAL" } &
         (wxBoxSizer_vert_item | objectRef)*
     }

From 9364690c0e2b589c5ea30793fe19884563c348bb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 23 Jan 2018 17:53:18 +0100
Subject: [PATCH 184/916] Correct check for <windows.h> inclusion to fix MinGW
 build

MinGW compiler predefines WIN32, meaning that wx/msw/winundef.h was
always included from wx/defs.h, even when it was completely unnecessary.
This was just inefficient, but harmless, until the changes of
042d922e88da988875d043b837dc548eb4b930b0 which broke MinGW compilation
as wxUSE_UNICODE_WINDOWS_H was incorrectly defined during the very first
inclusion of wx/msw/winundef.h, before _UNICODE could be defined
correctly by windows.h.

Fix this by checking whether windows.h was really already included.
---
 include/wx/defs.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index b1d11474a0..98bb7244bf 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -26,10 +26,10 @@
  */
 #ifdef __cplusplus
     /*
-        Test for WIN32, defined by windows.h itself, not our own __WINDOWS__,
-        which is not defined yet.
+        Test for _WINDOWS_, used as header guard by windows.h itself, not our
+        own __WINDOWS__, which is not defined yet.
      */
-#   ifdef WIN32
+#   ifdef _WINDOWS_
 #       include "wx/msw/winundef.h"
 #   endif /* WIN32 */
 #endif /* __cplusplus */

From 76617ddb1e2236202a922c43caf1b22f1477b806 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 20 Jan 2018 00:27:02 +0100
Subject: [PATCH 185/916] CMake: Add missing OpenGL files in GTK build

---
 build/cmake/files.cmake           | 10 ++++++++++
 build/cmake/lib/gl/CMakeLists.txt |  2 ++
 build/files                       |  8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 1253477e0b..f48332ddc7 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -3099,6 +3099,16 @@ set(OPENGL_MSW_HDR
     wx/msw/glcanvas.h
 )
 
+set(OPENGL_GTK_SRC
+    src/gtk/glcanvas.cpp
+    src/unix/glx11.cpp
+)
+
+set(OPENGL_GTK_HDR
+    wx/gtk/glcanvas.h
+    wx/unix/glx11.h
+)
+
 set(OPENGL_OSX_SHARED_SRC
     src/osx/cocoa/glcanvas.mm
     src/osx/glcanvas_osx.cpp
diff --git a/build/cmake/lib/gl/CMakeLists.txt b/build/cmake/lib/gl/CMakeLists.txt
index 4b656a8217..18ac4ac855 100644
--- a/build/cmake/lib/gl/CMakeLists.txt
+++ b/build/cmake/lib/gl/CMakeLists.txt
@@ -13,6 +13,8 @@ wx_append_sources(GL_FILES OPENGL_CMN)
 
 if(WIN32)
     wx_append_sources(GL_FILES OPENGL_MSW)
+elseif(WXGTK)
+    wx_append_sources(GL_FILES OPENGL_GTK)
 elseif(APPLE)
     wx_append_sources(GL_FILES OPENGL_OSX_SHARED)
 endif()
diff --git a/build/files b/build/files
index e38e8fd584..91dc2c0db9 100644
--- a/build/files
+++ b/build/files
@@ -3005,6 +3005,14 @@ OPENGL_CMN_HDR =
 OPENGL_MSW_SRC =
     src/msw/glcanvas.cpp
 
+OPENGL_GTK_HDR =
+    wx/gtk/glcanvas.h
+    wx/unix/glx11.h
+
+OPENGL_GTK_SRC =
+    src/gtk/glcanvas.cpp
+    src/unix/glx11.cpp
+
 OPENGL_MSW_HDR =
     wx/msw/glcanvas.h
 

From fb8403a06400bce6aeb85978a3d473dadd47aaca Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 20 Jan 2018 00:55:43 +0100
Subject: [PATCH 186/916] CMake: Only link executables to enabled libraries

---
 build/cmake/functions.cmake              |  2 +-
 build/cmake/tests/base/CMakeLists.txt    |  3 +++
 build/cmake/tests/drawing/CMakeLists.txt |  3 +++
 build/cmake/tests/gui/CMakeLists.txt     | 24 +++++++++++++++++++++++-
 build/cmake/utils/CMakeLists.txt         |  5 ++++-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 75e0f1f2ba..c92abdd9e4 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -701,7 +701,7 @@ function(wx_add_test name)
     endif()
     add_executable(${name} ${test_src})
     target_include_directories(${name} PRIVATE "${wxSOURCE_DIR}/tests" "${wxSOURCE_DIR}/3rdparty/catch/include")
-    wx_exe_link_libraries(${name} base net)
+    wx_exe_link_libraries(${name} base)
     if(wxBUILD_SHARED)
         target_compile_definitions(${name} PRIVATE WXUSINGDLL)
     endif()
diff --git a/build/cmake/tests/base/CMakeLists.txt b/build/cmake/tests/base/CMakeLists.txt
index 2dc9f50c97..25f614e885 100644
--- a/build/cmake/tests/base/CMakeLists.txt
+++ b/build/cmake/tests/base/CMakeLists.txt
@@ -99,6 +99,9 @@ endif()
 
 wx_add_test(test_base ${TEST_SRC})
 target_compile_definitions(test_base PRIVATE wxUSE_GUI=0 wxUSE_BASE=1)
+if(wxUSE_SOCKETS)
+    wx_exe_link_libraries(test_base net)
+endif()
 if(wxUSE_XML)
     wx_exe_link_libraries(test_base xml)
 endif()
diff --git a/build/cmake/tests/drawing/CMakeLists.txt b/build/cmake/tests/drawing/CMakeLists.txt
index 599bbfa91e..f9dbc7c0cf 100644
--- a/build/cmake/tests/drawing/CMakeLists.txt
+++ b/build/cmake/tests/drawing/CMakeLists.txt
@@ -22,6 +22,9 @@ set(TEST_DRAWING_SRC
     drawing/fonttest.cpp
     )
 wx_add_test(test_drawing ${TEST_DRAWING_SRC})
+if(wxUSE_SOCKETS)
+    wx_exe_link_libraries(test_drawing net)
+endif()
 wx_exe_link_libraries(test_drawing core)
 wx_test_enable_precomp(test_drawing)
 
diff --git a/build/cmake/tests/gui/CMakeLists.txt b/build/cmake/tests/gui/CMakeLists.txt
index fe32199597..9394ce3710 100644
--- a/build/cmake/tests/gui/CMakeLists.txt
+++ b/build/cmake/tests/gui/CMakeLists.txt
@@ -107,5 +107,27 @@ set(TEST_GUI_SRC
     xml/xrctest.cpp
     )
 wx_add_test(test_gui ${TEST_GUI_SRC})
-wx_exe_link_libraries(test_gui core richtext media xrc xml adv html net webview)
+wx_exe_link_libraries(test_gui core)
+if(wxUSE_RICHTEXT)
+    wx_exe_link_libraries(test_gui richtext)
+endif()
+if(wxUSE_MEDIACTRL)
+    wx_exe_link_libraries(test_gui media)
+endif()
+if(wxUSE_XRC)
+    wx_exe_link_libraries(test_gui xrc)
+endif()
+if(wxUSE_XML)
+    wx_exe_link_libraries(test_gui xml)
+endif()
+wx_exe_link_libraries(test_gui adv)
+if(wxUSE_HTML)
+    wx_exe_link_libraries(test_gui html)
+endif()
+if(wxUSE_SOCKETS)
+    wx_exe_link_libraries(test_gui net)
+endif()
+if(wxUSE_WEBVIEW)
+    wx_exe_link_libraries(test_gui webview)
+endif()
 wx_test_enable_precomp(test_gui)
diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt
index bbb604e60e..bf29f72156 100644
--- a/build/cmake/utils/CMakeLists.txt
+++ b/build/cmake/utils/CMakeLists.txt
@@ -13,7 +13,10 @@ if(wxUSE_XRC)
     if(wxBUILD_SHARED)
         target_compile_definitions(wxrc PRIVATE WXUSINGDLL)
     endif()
-    wx_exe_link_libraries(wxrc xml base)
+    if(wxUSE_XML)
+        wx_exe_link_libraries(wxrc xml)
+    endif()
+    wx_exe_link_libraries(wxrc base)
     # TODO: install
     set_target_properties(wxrc PROPERTIES FOLDER "Utilities")
 endif()

From dc0d93ccccab893099769c2ac6ad6ee81a284f8d Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 20 Jan 2018 15:15:57 +0100
Subject: [PATCH 187/916] CMake: Fix library order in wxMSW build

uuid should be linked before oleacc, otherwise it causes multiple definition of `IID_IAccessible' (with MinGW64 gcc).
To simplify even more, specify all required libraries in wxTOOLKIT_LIBRARIES, in the same order as in the makefiles.
Add uxtheme library, it is required since wxUxThemeEngine wrapper has been removed.
---
 build/cmake/lib/base/CMakeLists.txt | 16 +---------------
 build/cmake/toolkit.cmake           | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt
index 1871c54bde..28377c4772 100644
--- a/build/cmake/lib/base/CMakeLists.txt
+++ b/build/cmake/lib/base/CMakeLists.txt
@@ -58,21 +58,7 @@ endif()
 if(wxUSE_THREADS AND CMAKE_THREAD_LIBS_INIT)
     wx_lib_link_libraries(base PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 endif()
-if(WIN32)
-    wx_lib_link_libraries(base PUBLIC
-        kernel32
-        user32
-        shell32
-        ole32
-        oleaut32
-        uuid
-        rpcrt4
-        advapi32
-        Shlwapi
-        version
-        uuid
-    )
-elseif(APPLE)
+if(APPLE)
     wx_lib_link_libraries(base
         PRIVATE
         "-framework Security"
diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake
index 6dfbe4e7f3..49b798451d 100644
--- a/build/cmake/toolkit.cmake
+++ b/build/cmake/toolkit.cmake
@@ -68,13 +68,25 @@ endif()
 
 if(WXMSW)
     set(wxTOOLKIT_LIBRARIES
+        kernel32
+        user32
         gdi32
         comdlg32
         winspool
+        winmm
         shell32
+        shlwapi
         comctl32
+        ole32
+        oleaut32
+        uuid
         rpcrt4
-        Oleacc
+        advapi32
+        version
+        wsock32
+        wininet
+        oleacc
+        uxtheme
         )
 elseif(WXGTK)
     if(WXGTK3)

From 6d12732f52f1f4c3b63748493cf860174b6514a2 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 20 Jan 2018 17:26:46 +0100
Subject: [PATCH 188/916] CMake: Remove Unix-only from OnFatalException
 description

---
 build/cmake/options.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index 1b0427f088..fd0dab3cbe 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -93,7 +93,7 @@ wx_option(wxUSE_APPLE_IEEE "use the Apple IEEE codec")
 wx_option(wxUSE_ARCHIVE_STREAMS "use wxArchive streams")
 wx_option(wxUSE_BASE64 "use base64 encoding/decoding functions")
 wx_option(wxUSE_STACKWALKER "use wxStackWalker class for getting backtraces")
-wx_option(wxUSE_ON_FATAL_EXCEPTION "catch signals in wxApp::OnFatalException (Unix only)")
+wx_option(wxUSE_ON_FATAL_EXCEPTION "catch signals in wxApp::OnFatalException")
 wx_option(wxUSE_CMDLINE_PARSER "use wxCmdLineParser class")
 wx_option(wxUSE_DATETIME "use wxDateTime class")
 wx_option(wxUSE_DEBUGREPORT "use wxDebugReport class")

From 5ca19288f6396a4761f1b54f991b08e9cdec8ceb Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 20 Jan 2018 17:30:25 +0100
Subject: [PATCH 189/916] CMake: Fix building samples with MinGW64

Do not enable debugrpt and flash examples.
Define UNICODE when building on Windows. This allows the sdk_exe example to build, because it includes the windows headers directly.
---
 build/cmake/functions.cmake        | 3 +++
 build/cmake/samples/CMakeLists.txt | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index c92abdd9e4..87cd46ef36 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -166,6 +166,9 @@ function(wx_set_target_properties target_name is_base)
     endif()
 
     if(wxUSE_UNICODE)
+        if(WIN32)
+            target_compile_definitions(${target_name} PUBLIC UNICODE)
+        endif()
         target_compile_definitions(${target_name} PUBLIC _UNICODE)
     endif()
 
diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index f8b7ac28fa..51eae43b51 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -19,7 +19,9 @@ wx_add_sample(combo LIBRARIES adv DATA dropbuth.png dropbutn.png dropbutp.png)
 wx_add_sample(config conftest.cpp)
 wx_add_sample(console CONSOLE IMPORTANT)
 wx_add_sample(dataview IMPORTANT dataview.cpp mymodels.cpp mymodels.h LIBRARIES adv)
-wx_add_sample(debugrpt LIBRARIES qa)
+if(wxUSE_ON_FATAL_EXCEPTION AND (NOT WIN32 OR MSVC))
+    wx_add_sample(debugrpt LIBRARIES qa)
+endif()
 wx_add_sample(dialogs dialogs.cpp dialogs.h LIBRARIES adv DATA tips.txt)
 wx_add_sample(dialup nettest.cpp)
 wx_add_sample(display)
@@ -229,7 +231,9 @@ if(WIN32)
     endif()
 
     wx_add_sample(dll sdk_exe.cpp my_dll.h NAME sdk_exe FOLDER dll LIBRARIES my_dll)
-    wx_add_sample(flash)
+    if(MSVC)
+        wx_add_sample(flash)
+    endif()
     #TODO: renable when sample is fixed
     #wx_add_sample(mfc mfctest.cpp mfctest.h resource.h stdafx.h RES mfctest.rc)
     wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc)

From 9f917561082765d096b195cb19d2026633baad84 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 16:23:45 +0100
Subject: [PATCH 190/916] Remove hard TABs from CMake policies file

No real changes, just use spaces for indentation as everywhere else.
---
 build/cmake/policies.cmake | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/build/cmake/policies.cmake b/build/cmake/policies.cmake
index 9c4fd224c2..668988c7c5 100644
--- a/build/cmake/policies.cmake
+++ b/build/cmake/policies.cmake
@@ -8,41 +8,41 @@
 #############################################################################
 
 if(POLICY CMP0025)
-	# Compiler id for Apple Clang is now AppleClang
-	cmake_policy(SET CMP0025 NEW)
+    # Compiler id for Apple Clang is now AppleClang
+    cmake_policy(SET CMP0025 NEW)
 endif()
 
 if(POLICY CMP0038)
-	# targets may not link directly to themselves
-	cmake_policy(SET CMP0038 NEW)
+    # targets may not link directly to themselves
+    cmake_policy(SET CMP0038 NEW)
 endif()
 
 if(POLICY CMP0045)
-	# error on non-existent target in get_target_property
-	cmake_policy(SET CMP0045 NEW)
+    # error on non-existent target in get_target_property
+    cmake_policy(SET CMP0045 NEW)
 endif()
 
 if(POLICY CMP0046)
-	# error on non-existent dependency in add_dependencies
-	cmake_policy(SET CMP0046 NEW)
+    # error on non-existent dependency in add_dependencies
+    cmake_policy(SET CMP0046 NEW)
 endif()
 
 if(POLICY CMP0049)
-	# do not expand variables in target source entries
-	cmake_policy(SET CMP0049 NEW)
+    # do not expand variables in target source entries
+    cmake_policy(SET CMP0049 NEW)
 endif()
 
 if(POLICY CMP0053)
-	# simplify variable reference and escape sequence evaluation
-	cmake_policy(SET CMP0053 NEW)
+    # simplify variable reference and escape sequence evaluation
+    cmake_policy(SET CMP0053 NEW)
 endif()
 
 if(POLICY CMP0054)
-	# only interpret if() arguments as variables or keywords when unquoted
-	cmake_policy(SET CMP0054 NEW)
+    # only interpret if() arguments as variables or keywords when unquoted
+    cmake_policy(SET CMP0054 NEW)
 endif()
 
 if(POLICY CMP0042)
-	# MACOSX_RPATH is enabled by default.
-	cmake_policy(SET CMP0042 NEW)
+    # MACOSX_RPATH is enabled by default.
+    cmake_policy(SET CMP0042 NEW)
 endif()

From 9567adb8cc5e478766c89f9b9c3fe810ebb14dba Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 16:24:28 +0100
Subject: [PATCH 191/916] Order policies by their numbers in CMake policies
 file

Just make it easier to maintain this file by enabling all policies in
order of their numbers.

No real changes.
---
 build/cmake/policies.cmake | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/cmake/policies.cmake b/build/cmake/policies.cmake
index 668988c7c5..843b593aef 100644
--- a/build/cmake/policies.cmake
+++ b/build/cmake/policies.cmake
@@ -7,6 +7,8 @@
 # Licence:     wxWindows licence
 #############################################################################
 
+# Please keep the policies in the order of their numbers.
+
 if(POLICY CMP0025)
     # Compiler id for Apple Clang is now AppleClang
     cmake_policy(SET CMP0025 NEW)
@@ -17,6 +19,11 @@ if(POLICY CMP0038)
     cmake_policy(SET CMP0038 NEW)
 endif()
 
+if(POLICY CMP0042)
+    # MACOSX_RPATH is enabled by default.
+    cmake_policy(SET CMP0042 NEW)
+endif()
+
 if(POLICY CMP0045)
     # error on non-existent target in get_target_property
     cmake_policy(SET CMP0045 NEW)
@@ -41,8 +48,3 @@ if(POLICY CMP0054)
     # only interpret if() arguments as variables or keywords when unquoted
     cmake_policy(SET CMP0054 NEW)
 endif()
-
-if(POLICY CMP0042)
-    # MACOSX_RPATH is enabled by default.
-    cmake_policy(SET CMP0042 NEW)
-endif()

From 746bbd08cc3e3945596b52d60d34bfb0f4c0cdb2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 16:25:28 +0100
Subject: [PATCH 192/916] Use C++11 for tests during CMake configuration if
 necessary

Enable CMake policy CMP0067 to ensure that the tests are done using the
same C++ dialect that is actually used for compiling the library.
---
 build/cmake/policies.cmake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/cmake/policies.cmake b/build/cmake/policies.cmake
index 843b593aef..46c35011a4 100644
--- a/build/cmake/policies.cmake
+++ b/build/cmake/policies.cmake
@@ -48,3 +48,8 @@ if(POLICY CMP0054)
     # only interpret if() arguments as variables or keywords when unquoted
     cmake_policy(SET CMP0054 NEW)
 endif()
+
+if(POLICY CMP0067)
+    # Honor language standard in try_compile() source-file signature.
+    cmake_policy(SET CMP0067 NEW)
+endif()

From 7d300183a22c3c4c27810a9593c2b069053462bf Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 16:27:05 +0100
Subject: [PATCH 193/916] Revert "Check for HAVE_TYPE_TRAITS in CMake build not
 only for MSVC"

This reverts commit acdd0ef09ec4bf8518a5b0fe6640cddc5d7b662a as it
shouldn't be necessary according to this comment:

https://github.com/wxWidgets/wxWidgets/pull/658#issuecomment-358759875
---
 build/cmake/setup.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index 1bc1a10fd8..9e0e4d24d4 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -580,7 +580,7 @@ endif()
 check_cxx_symbol_exists(round math.h HAVE_ROUND)
 
 # Check includes
-if(NOT MSVC_VERSION OR NOT MSVC_VERSION LESS 1600)
+if(NOT MSVC_VERSION LESS 1600)
     check_include_file_cxx(tr1/type_traits HAVE_TR1_TYPE_TRAITS)
     check_include_file_cxx(type_traits HAVE_TYPE_TRAITS)
 endif()

From f0d5e9541254f5e0ae81dc55fb667d101cf55a6a Mon Sep 17 00:00:00 2001
From: John Roberts <johnr@iinet.net.au>
Date: Wed, 24 Jan 2018 16:40:26 +0100
Subject: [PATCH 194/916] Fix crash when clearing read-only
 wxOwnerDrawnComboBox

Check that we have an associated text entry before clearing it.

Fixes a crash introduced by 72fe57ec182ba0bc9a51ad27adc883a945d39b81
without reverting it as it still seems reasonable to use Clear() here.

Closes #18013.
---
 src/generic/odcombo.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 89ec54016b..d77833bb16 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -991,7 +991,9 @@ void wxOwnerDrawnComboBox::DoClear()
 
     GetVListBoxComboPopup()->Clear();
 
-    wxTextEntry::Clear();
+    // There is no text entry when using wxCB_READONLY style, so test for it.
+    if ( GetTextCtrl() )
+        wxTextEntry::Clear();
 }
 
 void wxOwnerDrawnComboBox::Clear()

From 9b51ef82afac0982223387afa42fc081bbfb66e2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 17:43:58 +0100
Subject: [PATCH 195/916] Install wx/osx/appprogress as part of "make install"

Add the file to the files list, this should have been part of
11a5b83e2c503850980d15ce369f41def60b5e7a (see #16638).

Closes #18059.
---
 Makefile.in               | 2 ++
 build/bakefiles/files.bkl | 1 +
 build/cmake/files.cmake   | 1 +
 build/files               | 1 +
 4 files changed, 5 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 9c8279c3ef..cbca768f71 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3299,6 +3299,7 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR =  \
 	wx/generic/listctrl.h \
 	wx/generic/prntdlgg.h \
 	wx/generic/statusbr.h \
+	wx/osx/appprogress.h \
 	wx/osx/cocoa/chkconf.h \
 	wx/osx/cocoa/evtloop.h \
 	wx/osx/cocoa/private.h \
@@ -3395,6 +3396,7 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR =  \
 	wx/generic/listctrl.h \
 	wx/generic/prntdlgg.h \
 	wx/generic/statusbr.h \
+	wx/osx/appprogress.h \
 	wx/osx/iphone/chkconf.h \
 	wx/osx/iphone/evtloop.h \
 	wx/osx/iphone/private.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 429136f79a..0f38e0952f 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2417,6 +2417,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/listctrl.h
     wx/generic/prntdlgg.h
     wx/generic/statusbr.h
+    wx/osx/appprogress.h
 </set>
 
 <!-- ====================================================================== -->
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index f48332ddc7..d6d9c6becb 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -2280,6 +2280,7 @@ set(OSX_SHARED_HDR
     wx/generic/listctrl.h
     wx/generic/prntdlgg.h
     wx/generic/statusbr.h
+    wx/osx/appprogress.h
 )
 
 set(OSX_COCOA_SRC
diff --git a/build/files b/build/files
index 91dc2c0db9..e81c72ebdc 100644
--- a/build/files
+++ b/build/files
@@ -2174,6 +2174,7 @@ OSX_SHARED_HDR =
     wx/osx/accel.h
     wx/osx/anybutton.h
     wx/osx/app.h
+    wx/osx/appprogress.h
     wx/osx/bitmap.h
     wx/osx/bmpbuttn.h
     wx/osx/brush.h

From 3b22d9a56bd5b3f3365fda346bb8486ad79fb428 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 24 Jan 2018 17:59:25 +0100
Subject: [PATCH 196/916] Test wxTreeListCtrl::DeleteAllItems() in the sample

Add a menu command to invoke this method for testing.
---
 samples/treelist/treelist.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/samples/treelist/treelist.cpp b/samples/treelist/treelist.cpp
index 2bdc74507a..0614f0ef84 100644
--- a/samples/treelist/treelist.cpp
+++ b/samples/treelist/treelist.cpp
@@ -65,6 +65,8 @@ enum
     Id_CheckboxesUser3State,
     Id_Checkboxes_End,
 
+    Id_DeleteAllItems,
+
     Id_DumpSelection,
     Id_Check_HTMLDocs,
     Id_Uncheck_HTMLDocs,
@@ -187,6 +189,8 @@ private:
     void OnAbout(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
 
+    void OnDeleteAllItems(wxCommandEvent& event);
+
     void OnSelectionChanged(wxTreeListEvent& event);
     void OnItemExpanding(wxTreeListEvent& event);
     void OnItemExpanded(wxTreeListEvent& event);
@@ -272,6 +276,8 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
     EVT_MENU(wxID_EXIT, MyFrame::OnExit)
 
+    EVT_MENU(Id_DeleteAllItems, MyFrame::OnDeleteAllItems)
+
     EVT_TREELIST_SELECTION_CHANGED(wxID_ANY, MyFrame::OnSelectionChanged)
     EVT_TREELIST_ITEM_EXPANDING(wxID_ANY, MyFrame::OnItemExpanding)
     EVT_TREELIST_ITEM_EXPANDED(wxID_ANY, MyFrame::OnItemExpanded)
@@ -314,6 +320,8 @@ MyFrame::MyFrame()
     treeOper->Append(Id_Indet_HTMLDocs, "Make Doc/HTML &indeterminate\tCtrl-I");
     treeOper->Append(Id_Select_HTMLDocs, "&Select Doc/HTML item\tCtrl-S");
 
+    treeOper->Append(Id_DeleteAllItems, "DeleteAllItems");
+
     wxMenu* helpMenu = new wxMenu;
     helpMenu->Append(wxID_ABOUT);
 
@@ -577,6 +585,11 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
     Close(true);
 }
 
+void MyFrame::OnDeleteAllItems(wxCommandEvent& WXUNUSED(event))
+{
+    m_treelist->DeleteAllItems();
+}
+
 wxString MyFrame::DumpItem(wxTreeListItem item) const
 {
     return item.IsOk() ? m_treelist->GetItemText(item) : wxString("NONE");

From 0cea0a67f1c8d66a4abd916b9ffb9a11bd0feb30 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 18:18:22 +0100
Subject: [PATCH 197/916] Use RAII SelectionEventsSuppressor in wxGTK
 wxDataViewCtrl code

This is simpler and safer than always remembering to call
GtkDisableSelectionEvents() and GtkEnableSelectionEvents() in pairs.

No real changes.
---
 include/wx/gtk/dataview.h | 19 +++++++++++++++++++
 src/gtk/dataview.cpp      | 20 +++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index a6d1d45c3b..059f1dc367 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -188,6 +188,25 @@ public:
 
     int GTKGetUniformRowHeight() const { return m_uniformRowHeight; }
 
+    // Simple RAII helper for disabling selection events during its lifetime.
+    class SelectionEventsSuppressor
+    {
+    public:
+        explicit SelectionEventsSuppressor(wxDataViewCtrl* ctrl)
+            : m_ctrl(ctrl)
+        {
+            m_ctrl->GtkDisableSelectionEvents();
+        }
+
+        ~SelectionEventsSuppressor()
+        {
+            m_ctrl->GtkEnableSelectionEvents();
+        }
+
+    private:
+        wxDataViewCtrl* const m_ctrl;
+    };
+
 protected:
     virtual void DoSetExpanderColumn() wxOVERRIDE;
     virtual void DoSetIndent() wxOVERRIDE;
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index d78d075559..3ca8b55e60 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -5068,7 +5068,7 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
 {
     wxCHECK_RET( m_internal, "model must be associated before calling SetSelections" );
 
-    GtkDisableSelectionEvents();
+    SelectionEventsSuppressor noSelection(this);
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
@@ -5093,8 +5093,6 @@ void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
         iter.user_data = (gpointer) item.GetID();
         gtk_tree_selection_select_iter( selection, &iter );
     }
-
-    GtkEnableSelectionEvents();
 }
 
 void wxDataViewCtrl::Select( const wxDataViewItem & item )
@@ -5103,7 +5101,7 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item )
 
     ExpandAncestors(item);
 
-    GtkDisableSelectionEvents();
+    SelectionEventsSuppressor noSelection(this);
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
@@ -5111,15 +5109,13 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item )
     iter.stamp = m_internal->GetGtkModel()->stamp;
     iter.user_data = (gpointer) item.GetID();
     gtk_tree_selection_select_iter( selection, &iter );
-
-    GtkEnableSelectionEvents();
 }
 
 void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
 {
     wxCHECK_RET( m_internal, "model must be associated before calling Unselect" );
 
-    GtkDisableSelectionEvents();
+    SelectionEventsSuppressor noSelection(this);
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
@@ -5127,8 +5123,6 @@ void wxDataViewCtrl::Unselect( const wxDataViewItem & item )
     iter.stamp = m_internal->GetGtkModel()->stamp;
     iter.user_data = (gpointer) item.GetID();
     gtk_tree_selection_unselect_iter( selection, &iter );
-
-    GtkEnableSelectionEvents();
 }
 
 bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
@@ -5146,24 +5140,20 @@ bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const
 
 void wxDataViewCtrl::SelectAll()
 {
-    GtkDisableSelectionEvents();
+    SelectionEventsSuppressor noSelection(this);
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     gtk_tree_selection_select_all( selection );
-
-    GtkEnableSelectionEvents();
 }
 
 void wxDataViewCtrl::UnselectAll()
 {
-    GtkDisableSelectionEvents();
+    SelectionEventsSuppressor noSelection(this);
 
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
 
     gtk_tree_selection_unselect_all( selection );
-
-    GtkEnableSelectionEvents();
 }
 
 void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item,

From 27f705686de5dd83c8cd2df68e3ff070d13021da Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 22:05:14 +0100
Subject: [PATCH 198/916] Avoid using the already deleted model items when
 clearing it

There is an impedance mismatch between wxDataViewCtrl API, which allows
deleting all items of the model at once, and GtkTreeView, which only
allows deleting them one by one, so bad things happen when we start
deleting the items from the GTK+ model after already having deleted them
from the wxDataViewModel, due to dereferencing the already freed
pointers.

Work around this by explicitly marking the model as being "temporarily
unsafe to use" by setting the stamp, uniquely identifying it, to 0 (and
ensuring that it's never 0 during the normal operation), and checking
for it in all functions that are called by GTK+ from inside
gtk_tree_model_row_deleted() that we call from Cleared().

The fix is not ideal, as the list of these functions was determined
empirically and could change in the future GTK+ versions, and also ugly,
but there doesn't seem to be any other way around this and at least now
Valgrind doesn't report invalid memory reads after calling
wxTreeListCtrl::DeleteAllItems() as it did before.
---
 src/gtk/dataview.cpp | 43 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 3ca8b55e60..ee482cd68c 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -680,7 +680,13 @@ wxgtk_tree_model_init(GTypeInstance* instance, void*)
 {
     GtkWxTreeModel* tree_model = GTK_WX_TREE_MODEL(instance);
     tree_model->internal = NULL;
-    tree_model->stamp = g_random_int();
+
+    // 0 is handled specially in wxGtkTreeCellDataFunc, so don't use it as the
+    // stamp.
+    do
+    {
+        tree_model->stamp = g_random_int();
+    } while ( tree_model->stamp == 0 );
 }
 
 } // extern "C"
@@ -746,9 +752,18 @@ static GtkTreePath *
 wxgtk_tree_model_get_path (GtkTreeModel *tree_model,
                            GtkTreeIter  *iter)
 {
-    GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
-    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), NULL);
-    g_return_val_if_fail (iter->stamp == GTK_WX_TREE_MODEL (wxtree_model)->stamp, NULL);
+    g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (tree_model), NULL);
+
+    GtkWxTreeModel *wxtree_model = GTK_WX_TREE_MODEL (tree_model);
+    if ( wxtree_model->stamp == 0 )
+    {
+        // The model is temporarily invalid and can't be used, see Cleared(),
+        // but we need to return some valid path from here -- just return an
+        // empty one.
+        return gtk_tree_path_new();
+    }
+
+    g_return_val_if_fail (iter->stamp == wxtree_model->stamp, NULL);
 
     return wxtree_model->internal->get_path( iter );
 }
@@ -1891,12 +1906,25 @@ bool wxGtkDataViewModelNotifier::Cleared()
 
     GtkTreePath *path = gtk_tree_path_new_first();  // points to root
 
+    // It is important to avoid selection changed events being generated from
+    // here as they would reference the already deleted model items, which
+    // would result in crashes in any code attempting to handle these events.
+    wxDataViewCtrl::SelectionEventsSuppressor noSelection(m_internal->GetOwner());
+
+    // We also need to prevent wxGtkTreeCellDataFunc from using the model items
+    // not existing any longer, so change the model stamp to indicate that it
+    // temporarily can't be used.
+    const gint stampOrig = wxgtk_model->stamp;
+    wxgtk_model->stamp = 0;
+
     int i;
     for (i = 0; i < count; i++)
         gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path );
 
     gtk_tree_path_free( path );
 
+    wxgtk_model->stamp = stampOrig;
+
     m_internal->Cleared();
 
     return true;
@@ -3059,6 +3087,13 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *WXUNUSED(column),
     g_return_if_fail (GTK_IS_WX_TREE_MODEL (model));
     GtkWxTreeModel *tree_model = (GtkWxTreeModel *) model;
 
+    if ( !tree_model->stamp )
+    {
+        // The model is temporarily invalid and can't be used, see the code in
+        // wxGtkDataViewModelNotifier::Cleared().
+        return;
+    }
+
     wxDataViewRenderer *cell = (wxDataViewRenderer*) data;
 
     wxDataViewItem item( (void*) iter->user_data );

From e1d8137e70ab7697a27b9439476e83ebd9cad1d0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 23:08:15 +0100
Subject: [PATCH 199/916] Use wxGtkTreePath instead of calling
 gtk_tree_path_free()

Use RAII helper class instead of freeing the object manually.

Also add a couple of "const"s and other minor style fixes.

No real changes.
---
 src/gtk/dataview.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index ee482cd68c..91b7621fde 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1902,10 +1902,6 @@ bool wxGtkDataViewModelNotifier::Cleared()
     // has been deleted so call row_deleted() for every
     // child of root...
 
-    int count = m_internal->iter_n_children( NULL ); // number of children of root
-
-    GtkTreePath *path = gtk_tree_path_new_first();  // points to root
-
     // It is important to avoid selection changed events being generated from
     // here as they would reference the already deleted model items, which
     // would result in crashes in any code attempting to handle these events.
@@ -1917,11 +1913,12 @@ bool wxGtkDataViewModelNotifier::Cleared()
     const gint stampOrig = wxgtk_model->stamp;
     wxgtk_model->stamp = 0;
 
-    int i;
-    for (i = 0; i < count; i++)
-        gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path );
-
-    gtk_tree_path_free( path );
+    {
+        wxGtkTreePath path(gtk_tree_path_new_first());  // points to root
+        const int count = m_internal->iter_n_children( NULL ); // number of children of root
+        for (int i = 0; i < count; i++)
+            gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path );
+    }
 
     wxgtk_model->stamp = stampOrig;
 

From ad03c8475d05f7f63a1a9082658100f78b93bb8f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Jan 2018 18:00:29 +0100
Subject: [PATCH 200/916] Revert "Fix crash when deleting all wxTreeListCtrl
 items with wxGTK3"

This reverts commit 1dd102d741dc9858df2b7e933761ed7cc7a51093 as it
introduced a crash in the same method when using generic wxDataViewCtrl
implementation, e.g. under MSW, and is not necessary to avoid the crash
with wxGTK3 any longer after the few previous commits.
---
 src/generic/treelist.cpp            | 8 ++------
 tests/controls/treelistctrltest.cpp | 9 ---------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/generic/treelist.cpp b/src/generic/treelist.cpp
index 3c6f26d955..6c599100ae 100644
--- a/src/generic/treelist.cpp
+++ b/src/generic/treelist.cpp
@@ -572,16 +572,12 @@ void wxTreeListModel::DeleteItem(Node* item)
 
 void wxTreeListModel::DeleteAllItems()
 {
-    // Note that this must be called before actually deleting the items as
-    // clearing GTK+ wxDataViewCtrl results in SELECTION_CHANGED events being
-    // sent and these events contain pointers to the model items, so they must
-    // still be valid.
-    Cleared();
-
     while ( m_root->GetChild() )
     {
         m_root->DeleteChild();
     }
+
+    Cleared();
 }
 
 const wxString& wxTreeListModel::GetItemText(Node* item, unsigned col) const
diff --git a/tests/controls/treelistctrltest.cpp b/tests/controls/treelistctrltest.cpp
index 02164ab3a1..d4a3ac96d6 100644
--- a/tests/controls/treelistctrltest.cpp
+++ b/tests/controls/treelistctrltest.cpp
@@ -39,7 +39,6 @@ private:
         CPPUNIT_TEST( Traversal );
         CPPUNIT_TEST( ItemText );
         CPPUNIT_TEST( ItemCheck );
-        CPPUNIT_TEST( DeleteAll );
     CPPUNIT_TEST_SUITE_END();
 
     // Create the control with the given style.
@@ -56,7 +55,6 @@ private:
     void Traversal();
     void ItemText();
     void ItemCheck();
-    void DeleteAll();
 
 
     // The control itself.
@@ -233,11 +231,4 @@ void TreeListCtrlTestCase::ItemCheck()
                           m_treelist->GetCheckedState(m_code) );
 }
 
-void TreeListCtrlTestCase::DeleteAll()
-{
-    m_treelist->DeleteAllItems();
-
-    CHECK( !m_treelist->GetFirstChild(m_treelist->GetRootItem()).IsOk() );
-}
-
 #endif // wxUSE_TREELISTCTRL

From d8b3fc84c2239effb1824e7094c7bf24db45a7ba Mon Sep 17 00:00:00 2001
From: Daniel Kulp <dan@kulp.com>
Date: Wed, 24 Jan 2018 23:40:36 +0100
Subject: [PATCH 201/916] Fix sorting in generic wxDataViewCtrl broken by
 recent changes

The comparator used with std::sort() must return true only if the first
item is strictly less than the second one, this is a requirement of the
sorting algorithm and not respecting it results in wrong final order.

See https://github.com/wxWidgets/wxWidgets/pull/642
---
 src/generic/datavgen.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index ad336e3067..c06e72fc11 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1666,12 +1666,11 @@ public:
                                 m_sortOrder.IsAscending());
     }
 
-    // Return true if the items are in order, i.e. the first item is less than
-    // or equal (because it's useless to exchange them in this case) than the
-    // second one. This is used by std::sort().
+    // Return true if the items are (strictly) in order, i.e. the first item is
+    // less than the second one. This is used by std::sort().
     bool operator()(wxDataViewTreeNode* first, wxDataViewTreeNode* second) const
     {
-        return Compare(first, second) <= 0;
+        return Compare(first, second) < 0;
     }
 
 private:

From bdcf21a5bdae38ed58ae21819dcd6f07d475c188 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 12:22:34 +0100
Subject: [PATCH 202/916] Explicitly use libc++ in C++11 CMake macOS builds on
 Travis CI

Just using -DCMAKE_CXX_STANDARD=11 isn't enough, as it doesn't seem to
use C++11 for configuration checks, so set CMAKE_CXX_FLAGS explicitly
too.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 36f7e40fa4..afc314c983 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
           env: wxCONFIGURE_FLAGS="--enable-cxx11" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" wxSKIP_SAMPLES=1
         - os: osx
           compiler: clang
-          env: wxTOOLSET=cmake wxCMAKE_GENERATOR=Xcode wxCMAKE_DEFINES="-DCMAKE_CXX_STANDARD=11"
+          env: wxTOOLSET=cmake wxCMAKE_GENERATOR=Xcode wxCMAKE_DEFINES="-DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-stdlib=libc++"
 
 branches:
     only:

From a9b44af251b8e58cd598335cde85cdb90477a414 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 13:02:14 +0100
Subject: [PATCH 203/916] Fix crash with wxDataViewVirtualListModel in generic
 wxDataViewCtrl

Recent sorting-related changes resulted in calling FindNode(), which
can only be used with the non-"virtual list" models, unconditionally,
after the items values was changed by user, resulting in a crash.

Add the missing IsVirtualList() check and also add a comment explicitly
stating that all code involving wxDataViewTreeNode can only be used
after checking that IsVirtualList() returns false.

Closes #18057.
---
 src/generic/datavgen.cpp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index c06e72fc11..9a4f08276e 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -458,6 +458,11 @@ class wxDataViewTreeNode;
 
 typedef wxVector<wxDataViewTreeNode*> wxDataViewTreeNodes;
 
+// Note: this class is not used at all for virtual list models, so all code
+// using it, i.e. any functions taking or returning objects of this type,
+// including wxDataViewMainWindow::m_root, can only be called after checking
+// that we're using a non-"virtual list" model.
+
 class wxDataViewTreeNode
 {
 public:
@@ -2942,17 +2947,20 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
 
 bool wxDataViewMainWindow::DoItemChanged(const wxDataViewItem & item, int view_column)
 {
-    // Move this node to its new correct place after it was updated.
-    //
-    // In principle, we could skip the call to PutInSortOrder() if the modified
-    // column is not the sort column, but in real-world applications it's fully
-    // possible and likely that custom compare uses not only the selected model
-    // column but also falls back to other values for comparison. To ensure
-    // consistency it is better to treat a value change as if it was an item
-    // change.
-    wxDataViewTreeNode* const node = FindNode(item);
-    wxCHECK_MSG( node, false, "invalid item" );
-    node->PutInSortOrder(this);
+    if ( !IsVirtualList() )
+    {
+        // Move this node to its new correct place after it was updated.
+        //
+        // In principle, we could skip the call to PutInSortOrder() if the modified
+        // column is not the sort column, but in real-world applications it's fully
+        // possible and likely that custom compare uses not only the selected model
+        // column but also falls back to other values for comparison. To ensure
+        // consistency it is better to treat a value change as if it was an item
+        // change.
+        wxDataViewTreeNode* const node = FindNode(item);
+        wxCHECK_MSG( node, false, "invalid item" );
+        node->PutInSortOrder(this);
+    }
 
     wxDataViewColumn* column;
     if ( view_column == wxNOT_FOUND )

From 8bad0d4d587802b47f587fd8e9cc59b50460006d Mon Sep 17 00:00:00 2001
From: Lauri Nurmi <lanurmi@iki.fi>
Date: Thu, 25 Jan 2018 15:27:07 +0200
Subject: [PATCH 204/916] Fix attribution in docs/changes.txt

Fix wrong attribution for the changes of
https://github.com/wxWidgets/wxWidgets/pull/552

A fix for 56323b5aba82017f86d62695ef4e37eb99adcc5e

See https://github.com/wxWidgets/wxWidgets/pull/684
---
 docs/changes.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index a4a6a53749..c8e851886d 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -93,7 +93,7 @@ All:
   wxLog::SetVerbose() which now only affects wxLogVerbose().
 - Add wxFileType::GetExpandedCommand() (troelsk).
 - Make it easier to convert to/from UTF-8-encoded std::string (ARATA Mizuki).
-- Support custom conversions in wxLogStream and wxLogStderr (Catalin Raceanu).
+- Support custom conversions in wxLogStream and wxLogStderr (Lauri Nurmi).
 - Add support for loading dynamic lexer in wxStyledTextCtrl (New Pagodi).
 - Handle strings with embedded NULs in wxDataStream (Nitch).
 - Don't crash in wxTextFile::GetLastLine() if the file is empty (crohr).

From afe0e776b94eb1544da706c5166a246578d80ab8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Jan 2018 14:14:05 +0100
Subject: [PATCH 205/916] Remove confusing "base_type" typedef from wxGTK3 wxDC
 code

This typedef isn't really useful in base class initializer lists and it
wasn't really used anywhere else.
---
 include/wx/gtk/dc.h |  7 -------
 src/gtk/dc.cpp      | 25 +++++++++++++------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 2c08c1f200..6c8fb391e3 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -15,7 +15,6 @@
 
 class wxGTKCairoDCImpl: public wxGCDCImpl
 {
-    typedef wxGCDCImpl base_type;
 public:
     wxGTKCairoDCImpl(wxDC* owner);
     wxGTKCairoDCImpl(wxDC* owner, int);
@@ -42,7 +41,6 @@ protected:
 
 class wxWindowDCImpl: public wxGTKCairoDCImpl
 {
-    typedef wxGTKCairoDCImpl base_type;
 public:
     wxWindowDCImpl(wxWindowDC* owner, wxWindow* window);
 
@@ -52,7 +50,6 @@ public:
 
 class wxClientDCImpl: public wxGTKCairoDCImpl
 {
-    typedef wxGTKCairoDCImpl base_type;
 public:
     wxClientDCImpl(wxClientDC* owner, wxWindow* window);
 
@@ -62,7 +59,6 @@ public:
 
 class wxPaintDCImpl: public wxGTKCairoDCImpl
 {
-    typedef wxGTKCairoDCImpl base_type;
 public:
     wxPaintDCImpl(wxPaintDC* owner, wxWindow* window);
 
@@ -72,7 +68,6 @@ public:
 
 class wxScreenDCImpl: public wxGTKCairoDCImpl
 {
-    typedef wxGTKCairoDCImpl base_type;
 public:
     wxScreenDCImpl(wxScreenDC* owner);
 
@@ -82,7 +77,6 @@ public:
 
 class wxMemoryDCImpl: public wxGTKCairoDCImpl
 {
-    typedef wxGTKCairoDCImpl base_type;
 public:
     wxMemoryDCImpl(wxMemoryDC* owner);
     wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap);
@@ -102,7 +96,6 @@ private:
 
 class WXDLLIMPEXP_CORE wxGTKCairoDC: public wxDC
 {
-    typedef wxDC base_type;
 public:
     wxGTKCairoDC(cairo_t* cr, wxWindow* window);
 
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 401551b7f7..711b96d517 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -21,21 +21,21 @@
 #include <gtk/gtk.h>
 
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
-    : base_type(owner)
+    : wxGCDCImpl(owner)
 {
     m_width = 0;
     m_height = 0;
 }
 
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, int)
-    : base_type(owner, 0)
+    : wxGCDCImpl(owner, 0)
 {
     m_width = 0;
     m_height = 0;
 }
 
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
-    : base_type(owner, 0)
+    : wxGCDCImpl(owner, 0)
 {
     m_width = 0;
     m_height = 0;
@@ -43,7 +43,7 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
 }
 
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
-    : base_type(owner, 0)
+    : wxGCDCImpl(owner, 0)
 {
     m_window = window;
     m_font = window->GetFont();
@@ -236,10 +236,11 @@ void* wxGTKCairoDCImpl::GetCairoContext() const
         cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
     return cr;
 }
+
 //-----------------------------------------------------------------------------
 
 wxWindowDCImpl::wxWindowDCImpl(wxWindowDC* owner, wxWindow* window)
-    : base_type(owner, window)
+    : wxGTKCairoDCImpl(owner, window)
 {
     GtkWidget* widget = window->m_wxwindow;
     if (widget == NULL)
@@ -285,7 +286,7 @@ wxWindowDCImpl::wxWindowDCImpl(wxWindowDC* owner, wxWindow* window)
 //-----------------------------------------------------------------------------
 
 wxClientDCImpl::wxClientDCImpl(wxClientDC* owner, wxWindow* window)
-    : base_type(owner, window)
+    : wxGTKCairoDCImpl(owner, window)
 {
     GtkWidget* widget = window->m_wxwindow;
     if (widget == NULL)
@@ -325,7 +326,7 @@ wxClientDCImpl::wxClientDCImpl(wxClientDC* owner, wxWindow* window)
 //-----------------------------------------------------------------------------
 
 wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
-    : base_type(owner, window)
+    : wxGTKCairoDCImpl(owner, window)
 {
     cairo_t* cr = window->GTKPaintContext();
     wxCHECK_RET(cr, "using wxPaintDC without being in a native paint event");
@@ -339,7 +340,7 @@ wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
 //-----------------------------------------------------------------------------
 
 wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
-    : base_type(owner, 0)
+    : wxGTKCairoDCImpl(owner, 0)
 {
     GdkWindow* window = gdk_get_default_root_window();
     m_width = gdk_window_get_width(window);
@@ -353,20 +354,20 @@ wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
 //-----------------------------------------------------------------------------
 
 wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner)
-    : base_type(owner)
+    : wxGTKCairoDCImpl(owner)
 {
     m_ok = false;
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap)
-    : base_type(owner, 0)
+    : wxGTKCairoDCImpl(owner, 0)
     , m_bitmap(bitmap)
 {
     Setup();
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxDC*)
-    : base_type(owner)
+    : wxGTKCairoDCImpl(owner)
 {
     m_ok = false;
 }
@@ -411,7 +412,7 @@ void wxMemoryDCImpl::Setup()
 //-----------------------------------------------------------------------------
 
 wxGTKCairoDC::wxGTKCairoDC(cairo_t* cr, wxWindow* window)
-    : base_type(new wxGTKCairoDCImpl(this, window->GetContentScaleFactor()))
+    : wxDC(new wxGTKCairoDCImpl(this, window->GetContentScaleFactor()))
 {
     wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(cr);
     gc->EnableOffset(window->GetContentScaleFactor() <= 1);

From 4ad1a3d9695c118ac85c3ea9f6fba519122f5ab4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Jan 2018 14:58:08 +0100
Subject: [PATCH 206/916] Return display PPI from wxDC::GetPPI() in wxGTK3

For wxDC associated with a window, such as wx{Window,Client,Paint}DC,
this method should return the window PPI, not the hard coded 72 DPI of
Cairo graphics context.

This still doesn't work correctly when using multiple monitors with
different DPI settings, but is still a (modest) improvement.
---
 include/wx/gtk/dc.h |  5 +++++
 src/gtk/dc.cpp      | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 6c8fb391e3..de09ee2494 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -32,9 +32,14 @@ public:
     virtual bool DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask) wxOVERRIDE;
     virtual void* GetCairoContext() const wxOVERRIDE;
 
+    virtual wxSize GetPPI() const wxOVERRIDE;
+
 protected:
     int m_width, m_height;
 
+private:
+    bool TryGetWindowSize(wxSize& size, wxSize& sizeMM) const;
+
     wxDECLARE_NO_COPY_CLASS(wxGTKCairoDCImpl);
 };
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 711b96d517..ed846c0899 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -15,6 +15,7 @@
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/dcscreen.h"
+#include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/gtk/dc.h"
 
@@ -237,6 +238,18 @@ void* wxGTKCairoDCImpl::GetCairoContext() const
     return cr;
 }
 
+wxSize wxGTKCairoDCImpl::GetPPI() const
+{
+    if ( m_window )
+    {
+        return wxGetDisplayPPI();
+    }
+
+    // For a non-window-based DC the concept of PPI doesn't make much sense
+    // anyhow, so just return the hardcoded value used by the base class.
+    return wxGCDCImpl::GetPPI();
+}
+
 //-----------------------------------------------------------------------------
 
 wxWindowDCImpl::wxWindowDCImpl(wxWindowDC* owner, wxWindow* window)

From a1cb2eb12a0ea295deb1d13afcba5ce566849ed6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 14:55:31 +0100
Subject: [PATCH 207/916] Also return display DPI from wxScreenDC in wxGTK3

This is similar to the previous commit and is done for the same reasons:
screen DC needs to use the same DPI as the screen itself, instead of the
default Cairo 72 DPI.
---
 include/wx/gtk/dc.h | 2 ++
 src/gtk/dc.cpp      | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index de09ee2494..3e3b600f68 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -76,6 +76,8 @@ class wxScreenDCImpl: public wxGTKCairoDCImpl
 public:
     wxScreenDCImpl(wxScreenDC* owner);
 
+    virtual wxSize GetPPI() const wxOVERRIDE;
+
     wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index ed846c0899..ccd61f9b02 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -364,6 +364,12 @@ wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
     gc->EnableOffset(m_contentScaleFactor <= 1);
     SetGraphicsContext(gc);
 }
+
+wxSize wxScreenDCImpl::GetPPI() const
+{
+    return wxGetDisplayPPI();
+}
+
 //-----------------------------------------------------------------------------
 
 wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner)

From 0be81cb34be50597593fe422b1e3cd72c0e0395a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 14:40:10 +0100
Subject: [PATCH 208/916] Add wxGTKCairoDCImpl::SetSize() helper

Avoid repeating gdk_window_get_{width,height}() calls in several places.
---
 include/wx/gtk/dc.h |  6 +++---
 src/gtk/dc.cpp      | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 3e3b600f68..3c8619cb8a 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -35,10 +35,10 @@ public:
     virtual wxSize GetPPI() const wxOVERRIDE;
 
 protected:
-    int m_width, m_height;
+    // Set m_width and m_height from the given (valid) GdkWindow.
+    void InitSize(GdkWindow* window);
 
-private:
-    bool TryGetWindowSize(wxSize& size, wxSize& sizeMM) const;
+    int m_width, m_height;
 
     wxDECLARE_NO_COPY_CLASS(wxGTKCairoDCImpl);
 };
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index ccd61f9b02..79c90e20d2 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -55,6 +55,12 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
     m_contentScaleFactor = window->GetContentScaleFactor();
 }
 
+void wxGTKCairoDCImpl::InitSize(GdkWindow* window)
+{
+    m_width = gdk_window_get_width(window);
+    m_height = gdk_window_get_height(window);
+}
+
 void wxGTKCairoDCImpl::DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask)
 {
     wxCHECK_RET(IsOk(), "invalid DC");
@@ -343,9 +349,7 @@ wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
 {
     cairo_t* cr = window->GTKPaintContext();
     wxCHECK_RET(cr, "using wxPaintDC without being in a native paint event");
-    GdkWindow* gdkWindow = gtk_widget_get_window(window->m_wxwindow);
-    m_width = gdk_window_get_width(gdkWindow);
-    m_height = gdk_window_get_height(gdkWindow);
+    InitSize(gtk_widget_get_window(window->m_wxwindow));
     wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(cr);
     gc->EnableOffset(m_contentScaleFactor <= 1);
     SetGraphicsContext(gc);
@@ -356,8 +360,8 @@ wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
     : wxGTKCairoDCImpl(owner, 0)
 {
     GdkWindow* window = gdk_get_default_root_window();
-    m_width = gdk_window_get_width(window);
-    m_height = gdk_window_get_height(window);
+    InitSize(window);
+
     cairo_t* cr = gdk_cairo_create(window);
     wxGraphicsContext* gc = wxGraphicsContext::CreateFromNative(cr);
     cairo_destroy(cr);

From 4c8e701d84dbaf8d20ee7a1d22721ad34ca36fcb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 14:48:14 +0100
Subject: [PATCH 209/916] Remove wxGTKCairoDCImpl ctor taking dummy int

We can reuse another ctor taking wxWindow* instead. Although this does
require an ugly cast, it's more explicit than just passing 0 which
could, in principle, match both the ctor taking wxWindow* and another
one taking double, and so is still preferable.
---
 include/wx/gtk/dc.h |  1 -
 src/gtk/dc.cpp      | 25 +++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 3c8619cb8a..f0807e3d12 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -17,7 +17,6 @@ class wxGTKCairoDCImpl: public wxGCDCImpl
 {
 public:
     wxGTKCairoDCImpl(wxDC* owner);
-    wxGTKCairoDCImpl(wxDC* owner, int);
     wxGTKCairoDCImpl(wxDC* owner, double scaleFactor);
     wxGTKCairoDCImpl(wxDC* owner, wxWindow* window);
 
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 79c90e20d2..61f3951724 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -28,13 +28,6 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
     m_height = 0;
 }
 
-wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, int)
-    : wxGCDCImpl(owner, 0)
-{
-    m_width = 0;
-    m_height = 0;
-}
-
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
     : wxGCDCImpl(owner, 0)
 {
@@ -46,13 +39,17 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
     : wxGCDCImpl(owner, 0)
 {
-    m_window = window;
-    m_font = window->GetFont();
-    m_textForegroundColour = window->GetForegroundColour();
-    m_textBackgroundColour = window->GetBackgroundColour();
     m_width = 0;
     m_height = 0;
-    m_contentScaleFactor = window->GetContentScaleFactor();
+
+    if ( window )
+    {
+        m_window = window;
+        m_font = window->GetFont();
+        m_textForegroundColour = window->GetForegroundColour();
+        m_textBackgroundColour = window->GetBackgroundColour();
+        m_contentScaleFactor = window->GetContentScaleFactor();
+    }
 }
 
 void wxGTKCairoDCImpl::InitSize(GdkWindow* window)
@@ -357,7 +354,7 @@ wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
 //-----------------------------------------------------------------------------
 
 wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
-    : wxGTKCairoDCImpl(owner, 0)
+    : wxGTKCairoDCImpl(owner, static_cast<wxWindow*>(NULL))
 {
     GdkWindow* window = gdk_get_default_root_window();
     InitSize(window);
@@ -383,7 +380,7 @@ wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner)
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap)
-    : wxGTKCairoDCImpl(owner, 0)
+    : wxGTKCairoDCImpl(owner, static_cast<wxWindow*>(NULL))
     , m_bitmap(bitmap)
 {
     Setup();

From ee0dd4edb1445c91dcfdb61d903a26ac23745e79 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 14:52:29 +0100
Subject: [PATCH 210/916] Replace wxGTKCairoDCImpl::m_{width,height} with
 m_size

This allows to avoid initializing the variables to 0 in all the
overloaded ctors: wxSize default ctor already does it.

It's also more convenient to use GetScaledSize() rather than assigning
m_width and m_height separately, even if the rest of the code is broadly
unchanged.
---
 include/wx/gtk/dc.h |  4 ++--
 src/gtk/dc.cpp      | 38 +++++++++++++++-----------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index f0807e3d12..88e46392f6 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -34,10 +34,10 @@ public:
     virtual wxSize GetPPI() const wxOVERRIDE;
 
 protected:
-    // Set m_width and m_height from the given (valid) GdkWindow.
+    // Set m_size from the given (valid) GdkWindow.
     void InitSize(GdkWindow* window);
 
-    int m_width, m_height;
+    wxSize m_size;
 
     wxDECLARE_NO_COPY_CLASS(wxGTKCairoDCImpl);
 };
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 61f3951724..4a6603f5ee 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -24,24 +24,17 @@
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
     : wxGCDCImpl(owner)
 {
-    m_width = 0;
-    m_height = 0;
 }
 
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, double scaleFactor)
     : wxGCDCImpl(owner, 0)
 {
-    m_width = 0;
-    m_height = 0;
     m_contentScaleFactor = scaleFactor;
 }
 
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
     : wxGCDCImpl(owner, 0)
 {
-    m_width = 0;
-    m_height = 0;
-
     if ( window )
     {
         m_window = window;
@@ -54,8 +47,8 @@ wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
 
 void wxGTKCairoDCImpl::InitSize(GdkWindow* window)
 {
-    m_width = gdk_window_get_width(window);
-    m_height = gdk_window_get_height(window);
+    m_size.x = gdk_window_get_width(window);
+    m_size.y = gdk_window_get_height(window);
 }
 
 void wxGTKCairoDCImpl::DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask)
@@ -122,9 +115,9 @@ bool wxGTKCairoDCImpl::DoGetPixel(int x, int y, wxColour* col) const
 void wxGTKCairoDCImpl::DoGetSize(int* width, int* height) const
 {
     if (width)
-        *width = m_width;
+        *width = m_size.x;
     if (height)
-        *height = m_height;
+        *height = m_size.y;
 }
 
 bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask)
@@ -279,15 +272,15 @@ wxWindowDCImpl::wxWindowDCImpl(wxWindowDC* owner, wxWindow* window)
         int x, y;
         if (gtk_widget_get_has_window(widget))
         {
-            m_width = gdk_window_get_width(gdkWindow);
-            m_height = gdk_window_get_height(gdkWindow);
-            x = m_width - a.width;
-            y = m_height - a.height;
+            m_size.x = gdk_window_get_width(gdkWindow);
+            m_size.y = gdk_window_get_height(gdkWindow);
+            x = m_size.x - a.width;
+            y = m_size.y - a.height;
         }
         else
         {
-            m_width = a.width;
-            m_height = a.height;
+            m_size.x = a.width;
+            m_size.y = a.height;
             x = a.x;
             y = a.y;
             cairo_rectangle(cr, a.x, a.y, a.width, a.height);
@@ -322,15 +315,15 @@ wxClientDCImpl::wxClientDCImpl(wxClientDC* owner, wxWindow* window)
         SetGraphicsContext(gc);
         if (gtk_widget_get_has_window(widget))
         {
-            m_width = gdk_window_get_width(gdkWindow);
-            m_height = gdk_window_get_height(gdkWindow);
+            m_size.x = gdk_window_get_width(gdkWindow);
+            m_size.y = gdk_window_get_height(gdkWindow);
         }
         else
         {
             GtkAllocation a;
             gtk_widget_get_allocation(widget, &a);
-            m_width = a.width;
-            m_height = a.height;
+            m_size.x = a.width;
+            m_size.y = a.height;
             cairo_rectangle(cr, a.x, a.y, a.width, a.height);
             cairo_clip(cr);
             SetDeviceLocalOrigin(a.x, a.y);
@@ -419,8 +412,7 @@ void wxMemoryDCImpl::Setup()
     m_ok = m_bitmap.IsOk();
     if (m_ok)
     {
-        m_width = int(m_bitmap.GetScaledWidth());
-        m_height = int(m_bitmap.GetScaledHeight());
+        m_size = m_bitmap.GetScaledSize();
         m_contentScaleFactor = m_bitmap.GetScaleFactor();
         cairo_t* cr = m_bitmap.CairoCreate();
         gc = wxGraphicsContext::CreateFromNative(cr);

From b936bfe85efaf0e179ec6ce071853934aecdf43a Mon Sep 17 00:00:00 2001
From: New Pagodi <NewPagodi@users.noreply.github.com>
Date: Thu, 25 Jan 2018 16:07:54 -0600
Subject: [PATCH 211/916] Add Direct2D support to wxSTC

---
 include/wx/msw/private/graphicsd2d.h |   28 +
 include/wx/stc/stc.h                 |    6 +
 interface/wx/stc/stc.h               |   27 +-
 src/msw/graphicsd2d.cpp              |   51 +-
 src/stc/PlatWX.cpp                   | 1196 +++++++++++++++++++++++++-
 src/stc/PlatWX.h                     |   66 ++
 src/stc/ScintillaWX.cpp              |   40 +-
 src/stc/ScintillaWX.h                |    4 +
 src/stc/gen_docs.py                  |   26 +-
 src/stc/gen_iface.py                 |    2 -
 src/stc/stc.cpp                      |   16 +
 src/stc/stc.cpp.in                   |    4 +
 12 files changed, 1449 insertions(+), 17 deletions(-)
 create mode 100644 include/wx/msw/private/graphicsd2d.h

diff --git a/include/wx/msw/private/graphicsd2d.h b/include/wx/msw/private/graphicsd2d.h
new file mode 100644
index 0000000000..993f61a960
--- /dev/null
+++ b/include/wx/msw/private/graphicsd2d.h
@@ -0,0 +1,28 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/private/graphicsd2d.h
+// Purpose:     Allow functions from graphicsd2d.cpp to be used in othe files
+// Author:      New Pagodi
+// Created:     2017-10-31
+// Copyright:   (c) 2017 wxWidgets development team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef WX_MSW_PRIVATE_GRAPHICSD2D_H_
+#define WX_MSW_PRIVATE_GRAPHICSD2D_H_
+
+#if wxUSE_GRAPHICS_DIRECT2D
+
+// Ensure no previous defines interfere with the Direct2D API headers
+#undef GetHwnd
+
+#include <d2d1.h>
+#include <dwrite.h>
+#include <wincodec.h>
+
+WXDLLIMPEXP_CORE IWICImagingFactory* wxWICImagingFactory();
+WXDLLIMPEXP_CORE ID2D1Factory* wxD2D1Factory();
+WXDLLIMPEXP_CORE IDWriteFactory* wxDWriteFactory();
+
+#endif // wxUSE_GRAPHICS_DIRECT2D
+
+#endif // WX_MSW_PRIVATE_GRAPHICSD2D_H_
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 36c7c1d900..43b4e97b6f 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -3963,6 +3963,12 @@ public:
     // to overlap from one line to the next.
     void SetPhasesDraw(int phases);
 
+    // Choose the quality level for text.
+    void SetFontQuality(int fontQuality);
+
+    // Retrieve the quality level for text.
+    int GetFontQuality() const;
+
     // Scroll so that a display line is at the top of the display.
     void SetFirstVisibleLine(int displayLine);
 
diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index e65f64c40e..49ef8ff5ad 100644
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -5153,6 +5153,27 @@ public:
     */
     void SetPhasesDraw(int phases);
 
+    /**
+        Choose the quality level for text.
+
+        The input should be one of the
+        @link wxStyledTextCtrl::wxSTC_EFF_QUALITY_DEFAULT wxSTC_EFF_QUALITY_* @endlink constants.
+        @remarks
+        This method only has any effect with the wxMSW port and when
+        technology has been set to wxSTC_TECHNOLOGY_DIRECTWRITE.
+        @since 3.1.1
+    */
+    void SetFontQuality(int fontQuality);
+
+    /**
+        Retrieve the quality level for text.
+
+        The return value will be one of the
+        @link wxStyledTextCtrl::wxSTC_EFF_QUALITY_DEFAULT wxSTC_EFF_QUALITY_* @endlink constants.
+        @since 3.1.1
+    */
+    int GetFontQuality() const;
+
     /**
         Change internal focus flag.
     */
@@ -5166,8 +5187,10 @@ public:
     /**
         Set the technology used.
 
-        The input should be one of the
-        @link wxStyledTextCtrl::wxSTC_TECHNOLOGY_DEFAULT wxSTC_TECHNOLOGY_* @endlink constants.
+        @remarks
+        For the wxMSW port, the input can be either wxSTC_TECHNOLOGY_DEFAULT
+        or wxSTC_TECHNOLOGY_DIRECTWRITE.  With other ports, this method has
+        no effect.
     */
     void SetTechnology(int technology);
 
diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index 22306f9169..ad502cc43e 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -72,6 +72,7 @@
 #include "wx/private/graphics.h"
 #include "wx/stack.h"
 #include "wx/sharedptr.h"
+#include "wx/msw/private/graphicsd2d.h"
 
 // This must be the last header included to only affect the DEFINE_GUID()
 // occurrences below but not any GUIDs declared in the standard files included
@@ -219,6 +220,9 @@ wxDirect2D::DWriteCreateFactory_t wxDirect2D::DWriteCreateFactory = NULL;
 DEFINE_GUID(wxIID_IWICImagingFactory,
             0xec5ec8a9, 0xc395, 0x4314, 0x9c, 0x77, 0x54, 0xd7, 0xa9, 0x35, 0xff, 0x70);
 
+DEFINE_GUID(wxIID_ID2D1Factory,
+            0x06152247, 0x6f50, 0x465a, 0x92, 0x45, 0x11, 0x8b, 0xfd, 0x3b, 0x60, 0x07);
+
 DEFINE_GUID(wxIID_IDWriteFactory,
             0xb859ee5a, 0xd838, 0x4b5b, 0xa2, 0xe8, 0x1a, 0xdc, 0x7d, 0x93, 0xdb, 0x48);
 
@@ -299,6 +303,39 @@ IWICImagingFactory* wxWICImagingFactory()
     return gs_WICImagingFactory;
 }
 
+static ID2D1Factory* gs_ID2D1Factory = NULL;
+
+ID2D1Factory* wxD2D1Factory()
+{
+    if (!wxDirect2D::Initialize())
+        return NULL;
+
+    if (gs_ID2D1Factory == NULL)
+    {
+        D2D1_FACTORY_OPTIONS factoryOptions = {D2D1_DEBUG_LEVEL_NONE};
+
+        // According to
+        // https://msdn.microsoft.com/en-us/library/windows/desktop/ee794287(v=vs.85).aspx
+        // the Direct2D Debug Layer is only available starting with Windows 8
+        // and Visual Studio 2012.
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && wxCHECK_VISUALC_VERSION(11)
+        if ( wxGetWinVersion() >= wxWinVersion_8 )
+        {
+            factoryOptions.debugLevel = D2D1_DEBUG_LEVEL_INFORMATION;
+        }
+#endif  //__WXDEBUG__
+
+        HRESULT hr = wxDirect2D::D2D1CreateFactory(
+            D2D1_FACTORY_TYPE_SINGLE_THREADED,
+            wxIID_ID2D1Factory,
+            &factoryOptions,
+            reinterpret_cast<void**>(&gs_ID2D1Factory)
+            );
+        wxCHECK_HRESULT_RET_PTR(hr);
+    }
+    return gs_ID2D1Factory;
+}
+
 static IDWriteFactory* gs_IDWriteFactory = NULL;
 
 IDWriteFactory* wxDWriteFactory()
@@ -4457,13 +4494,9 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetDirect2DRenderer()
     return gs_D2DRenderer;
 }
 
-wxD2DRenderer::wxD2DRenderer()
+wxD2DRenderer::wxD2DRenderer():m_direct2dFactory(wxD2D1Factory())
 {
-
-    HRESULT result;
-    result = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &m_direct2dFactory);
-
-    if (FAILED(result))
+    if ( m_direct2dFactory.get() == NULL )
     {
         wxFAIL_MSG("Could not create Direct2D Factory.");
     }
@@ -4770,6 +4803,12 @@ public:
             gs_D2DRenderer = NULL;
         }
 
+        if ( gs_ID2D1Factory )
+        {
+            gs_ID2D1Factory->Release();
+            gs_ID2D1Factory = NULL;
+        }
+
         ::CoUninitialize();
     }
 
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 7d3ca2e426..0aa5a0f2a0 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -46,6 +46,9 @@
 #include "wx/stc/stc.h"
 #include "wx/stc/private.h"
 
+#if wxUSE_GRAPHICS_DIRECT2D
+#include "ScintillaWX.h"
+#endif
 
 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
@@ -86,10 +89,18 @@ class wxFontWithAscent : public wxFont
 public:
     explicit wxFontWithAscent(const wxFont &font)
         : wxFont(font),
-          m_ascent(0)
+          m_ascent(0),m_surfaceFontData(NULL)
     {
     }
 
+    ~wxFontWithAscent()
+    {
+        if ( m_surfaceFontData )
+        {
+            delete m_surfaceFontData;
+        }
+    }
+
     static wxFontWithAscent* FromFID(FontID fid)
     {
         return static_cast<wxFontWithAscent*>(fid);
@@ -98,8 +109,12 @@ public:
     void SetAscent(int ascent) { m_ascent = ascent; }
     int GetAscent() const { return m_ascent; }
 
+    SurfaceData* GetSurfaceFontData() const {return m_surfaceFontData;}
+    void SetSurfaceFontData(SurfaceData* data){m_surfaceFontData=data;}
+
 private:
     int m_ascent;
+    SurfaceData* m_surfaceFontData;
 };
 
 void SetAscent(Font& f, int ascent)
@@ -149,7 +164,14 @@ void Font::Create(const FontParameters &fp) {
         false,
         stc2wx(fp.faceName),
         encoding);
-    fid = new wxFontWithAscent(font);
+    wxFontWithAscent* newFont = new wxFontWithAscent(font);
+    fid = newFont;
+
+#if wxUSE_GRAPHICS_DIRECT2D
+    if ( fp.technology == wxSTC_TECHNOLOGY_DIRECTWRITE ) {
+        newFont->SetSurfaceFontData(new SurfaceFontDataD2D(fp));
+    }
+#endif // wxUSE_GRAPHICS_DIRECT2D
 }
 
 
@@ -674,8 +696,1176 @@ void SurfaceImpl::SetDBCSMode(int WXUNUSED(codePage)) {
     // dbcsMode = codePage == SC_CP_DBCS;
 }
 
+#if wxUSE_GRAPHICS_DIRECT2D
 
-Surface *Surface::Allocate(int WXUNUSED(technology)) {
+//----------------------------------------------------------------------
+// SurfaceFontDataD2D
+
+SurfaceFontDataD2D::SurfaceFontDataD2D(const FontParameters& fp)
+{
+    wxCOMPtr<IDWriteFactory> pDWriteFactory(::wxDWriteFactory());
+
+    if ( pDWriteFactory.get() )
+    {
+        wxCOMPtr<IDWriteTextLayout> pTextLayout;
+        wxString faceName = fp.faceName;
+        wxString extentTest(EXTENT_TEST);
+        int weight = fp.weight;
+        DWRITE_FONT_WEIGHT fontWeight;
+        DWRITE_FONT_STYLE fontStyle;
+        DWRITE_TEXT_METRICS textmetrics = {0,0,0,0,0,0,0,0,0};
+        const int maxLines = 2;
+        DWRITE_LINE_METRICS lineMetrics[maxLines];
+        UINT32 lineCount = 0;
+        FLOAT emHeight = 0;
+        HRESULT hr;
+
+        if ( weight <= 100 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_THIN;
+        }
+        else if ( weight <= 200 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_EXTRA_LIGHT;
+        }
+        else if ( weight <= 300 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_LIGHT;
+        }
+        else if ( weight <= 350 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_SEMI_LIGHT;
+        }
+        else if ( weight <= 400 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_NORMAL;
+        }
+        else if ( weight <= 500 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_MEDIUM;
+        }
+        else if ( weight <= 600 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_SEMI_BOLD;
+        }
+        else if ( weight <= 700 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_BOLD;
+        }
+        else if ( weight <= 800 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_EXTRA_BOLD;
+        }
+        else if ( weight <= 900 )
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_HEAVY;
+        }
+        else
+        {
+            fontWeight = DWRITE_FONT_WEIGHT_EXTRA_BLACK;
+        }
+
+        fontStyle = fp.italic?DWRITE_FONT_STYLE_ITALIC:DWRITE_FONT_STYLE_NORMAL;
+
+        hr = pDWriteFactory->CreateTextFormat(
+            faceName.wc_str(),
+            NULL,
+            fontWeight,
+            fontStyle,
+            DWRITE_FONT_STRETCH_NORMAL,
+            fp.size,
+            L"en-us", //locale
+            &m_pTextFormat
+            );
+
+        if ( SUCCEEDED(hr) )
+        {
+            m_pTextFormat->SetWordWrapping(DWRITE_WORD_WRAPPING_NO_WRAP);
+
+            hr = pDWriteFactory->CreateTextLayout(extentTest.wc_str(),
+                extentTest.Length(), m_pTextFormat, FLT_MAX, FLT_MAX,
+                &pTextLayout);
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            hr = pTextLayout->GetMetrics(&textmetrics);
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            hr = pTextLayout->GetLineMetrics(lineMetrics, maxLines, &lineCount);
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            hr = pTextLayout->GetFontSize(0, &emHeight);
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            m_ascent = lineMetrics[0].baseline;
+            m_descent = lineMetrics[0].height - lineMetrics[0].baseline;
+            m_internalLeading = lineMetrics[0].height - emHeight;
+            m_averageCharWidth = textmetrics.width/extentTest.Length();
+
+            switch ( fp.extraFontFlag & wxSTC_EFF_QUALITY_MASK )
+            {
+                case wxSTC_EFF_QUALITY_NON_ANTIALIASED:
+                    m_aaMode = D2D1_TEXT_ANTIALIAS_MODE_ALIASED;
+                    break;
+                case wxSTC_EFF_QUALITY_ANTIALIASED:
+                    m_aaMode = D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE;
+                    break;
+                case wxSTC_EFF_QUALITY_LCD_OPTIMIZED:
+                    m_aaMode = D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE;
+                    break;
+                default:
+                    m_aaMode = D2D1_TEXT_ANTIALIAS_MODE_DEFAULT;
+                    break;
+            }
+
+            m_pTextFormat->SetLineSpacing(DWRITE_LINE_SPACING_METHOD_UNIFORM,
+                lineMetrics[0].height, m_ascent);
+        }
+        else
+        {
+            m_pTextFormat.reset();
+        }
+    }
+}
+
+bool SurfaceFontDataD2D::Initialised() const
+{
+    return (m_pTextFormat.get() != NULL);
+}
+
+//----------------------------------------------------------------------
+// SurfaceDataD2D
+
+SurfaceDataD2D::SurfaceDataD2D(ScintillaWX* editor):m_editor(editor),
+    m_pD2DFactory(::wxD2D1Factory()), m_pDWriteFactory(::wxDWriteFactory())
+{
+    if( Initialised() )
+    {
+        HRESULT hr =
+            m_pDWriteFactory->CreateRenderingParams(&m_defaultRenderingParams);
+
+        if ( SUCCEEDED(hr) )
+        {
+            unsigned int clearTypeContrast;
+            if ( ::SystemParametersInfo(SPI_GETFONTSMOOTHINGCONTRAST, 0,
+                    &clearTypeContrast, 0) )
+            {
+                FLOAT gamma;
+                if (clearTypeContrast >= 1000 && clearTypeContrast <= 2200)
+                    gamma = static_cast<FLOAT>(clearTypeContrast) / 1000.0f;
+                else
+                    gamma = m_defaultRenderingParams->GetGamma();
+
+                m_pDWriteFactory->CreateCustomRenderingParams(
+                    gamma,
+                    m_defaultRenderingParams->GetEnhancedContrast(),
+                    m_defaultRenderingParams->GetClearTypeLevel(),
+                    m_defaultRenderingParams->GetPixelGeometry(),
+                    m_defaultRenderingParams->GetRenderingMode(),
+                    &m_customClearTypeRenderingParams);
+            }
+        }
+    }
+}
+
+bool SurfaceDataD2D::Initialised() const
+{
+    return (m_pD2DFactory.get() != NULL && m_pDWriteFactory.get() != NULL);
+}
+
+void SurfaceDataD2D::DiscardGraphicsResources()
+{
+    m_pRenderTarget.reset();
+    m_pSolidBrush.reset();
+    m_pPatternBrush.reset();
+}
+
+HRESULT SurfaceDataD2D::CreateGraphicsResources()
+{
+    HRESULT hr = S_OK;
+    if ( m_pRenderTarget.get() == NULL )
+    {
+        D2D1_RENDER_TARGET_PROPERTIES renderTargetProperties =
+            D2D1::RenderTargetProperties(
+                D2D1_RENDER_TARGET_TYPE_DEFAULT,
+                D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM,
+                    D2D1_ALPHA_MODE_PREMULTIPLIED));
+
+        hr = m_pD2DFactory->CreateDCRenderTarget(
+            &renderTargetProperties,
+            &m_pRenderTarget);
+
+        if ( SUCCEEDED(hr) )
+        {
+            const D2D1_COLOR_F color = D2D1::ColorF(0, 0, 0);
+            hr = m_pRenderTarget->CreateSolidColorBrush(color, &m_pSolidBrush);
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            D2D1_BITMAP_BRUSH_PROPERTIES brushProperties =
+                D2D1::BitmapBrushProperties(D2D1_EXTEND_MODE_WRAP,
+                    D2D1_EXTEND_MODE_WRAP,
+                    D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR);
+
+            wxCOMPtr<ID2D1Bitmap> bitmap;
+
+            D2D1_PIXEL_FORMAT pixel_format =
+                D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM,
+                                  D2D1_ALPHA_MODE_PREMULTIPLIED);
+
+
+            m_pRenderTarget->CreateBitmap(D2D1::SizeU(1,1),
+                                          D2D1::BitmapProperties(pixel_format),
+                                          &bitmap);
+
+            hr = m_pRenderTarget->CreateBitmapBrush(bitmap, brushProperties,
+                                                    &m_pPatternBrush);
+        }
+    }
+    return hr;
+}
+
+void SurfaceDataD2D::SetEditorPaintAbandoned()
+{
+    m_editor->SetPaintAbandoned();
+}
+
+//----------------------------------------------------------------------
+// SurfaceD2D - This is basically SurfaceD2D from the Scintilla source
+// code adapted to draw in the wxMSW environment.
+
+class SurfaceD2D : public Surface
+{
+public:
+    SurfaceD2D();
+    virtual ~SurfaceD2D();
+
+    // base class virtuals
+    virtual void Init(WindowID wid) wxOVERRIDE;
+    virtual void Init(SurfaceID sid, WindowID wid) wxOVERRIDE;
+    virtual void InitPixMap(int width, int height, Surface *surface_,
+                            WindowID wid) wxOVERRIDE;
+
+    virtual void Release() wxOVERRIDE;
+    virtual bool Initialised() wxOVERRIDE;
+    virtual void PenColour(ColourDesired fore) wxOVERRIDE;
+    virtual int LogPixelsY() wxOVERRIDE;
+    virtual int DeviceHeightFont(int points) wxOVERRIDE;
+    virtual void MoveTo(int x_, int y_) wxOVERRIDE;
+    virtual void LineTo(int x_, int y_) wxOVERRIDE;
+    virtual void Polygon(Point *pts, int npts, ColourDesired fore,
+                         ColourDesired back) wxOVERRIDE;
+    virtual void RectangleDraw(PRectangle rc, ColourDesired fore,
+                               ColourDesired back) wxOVERRIDE;
+    virtual void FillRectangle(PRectangle rc, ColourDesired back) wxOVERRIDE;
+    virtual void FillRectangle(PRectangle rc, Surface &surfacePattern) wxOVERRIDE;
+    virtual void RoundedRectangle(PRectangle rc, ColourDesired fore,
+                                  ColourDesired back) wxOVERRIDE;
+    virtual void AlphaRectangle(PRectangle rc, int cornerSize,
+                                ColourDesired fill, int alphaFill,
+                                ColourDesired outline, int alphaOutline,
+                                int flags) wxOVERRIDE;
+    virtual void DrawRGBAImage(PRectangle rc, int width, int height,
+                               const unsigned char *pixelsImage) wxOVERRIDE;
+    virtual void Ellipse(PRectangle rc, ColourDesired fore,
+                         ColourDesired back) wxOVERRIDE;
+    virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource) wxOVERRIDE;
+
+    virtual void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase,
+                                const char *s, int len, ColourDesired fore,
+                                ColourDesired back) wxOVERRIDE;
+    virtual void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase,
+                                 const char *s, int len, ColourDesired fore,
+                                 ColourDesired back) wxOVERRIDE;
+    virtual void DrawTextTransparent(PRectangle rc, Font &font_,
+                                     XYPOSITION ybase, const char *s, int len,
+                                     ColourDesired fore) wxOVERRIDE;
+    virtual void MeasureWidths(Font &font_, const char *s, int len,
+                               XYPOSITION *positions) wxOVERRIDE;
+    virtual XYPOSITION WidthText(Font &font_, const char *s, int len) wxOVERRIDE;
+    virtual XYPOSITION WidthChar(Font &font_, char ch) wxOVERRIDE;
+    virtual XYPOSITION Ascent(Font &font_) wxOVERRIDE;
+    virtual XYPOSITION Descent(Font &font_) wxOVERRIDE;
+    virtual XYPOSITION InternalLeading(Font &font_) wxOVERRIDE;
+    virtual XYPOSITION ExternalLeading(Font &font_) wxOVERRIDE;
+    virtual XYPOSITION Height(Font &font_) wxOVERRIDE;
+    virtual XYPOSITION AverageCharWidth(Font &font_) wxOVERRIDE;
+
+    virtual void SetClip(PRectangle rc) wxOVERRIDE;
+    virtual void FlushCachedState() wxOVERRIDE;
+
+    virtual void SetUnicodeMode(bool unicodeMode_) wxOVERRIDE;
+    virtual void SetDBCSMode(int codePage) wxOVERRIDE;
+
+    // helpers
+    void SetFont(Font &font_);
+    void SetScale(wxDC* dc);
+    HRESULT FlushDrawing();
+    void D2DPenColour(ColourDesired fore, int alpha=255);
+    void DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase,
+                        const char *s, int len, UINT fuOptions);
+
+private:
+    // Private so SurfaceD2D objects can not be copied
+    SurfaceD2D(const SurfaceD2D &);
+    SurfaceD2D &operator=(const SurfaceD2D &);
+
+    bool m_unicodeMode;
+    int m_x, m_y;
+    int m_logPixelsY;
+
+    bool m_ownRenderTarget;
+    int m_clipsActive;
+
+    XYPOSITION m_yAscent;
+    XYPOSITION m_yDescent;
+    XYPOSITION m_yInternalLeading;
+    XYPOSITION m_averageCharWidth;
+
+    wxCOMPtr<IDWriteFactory> m_pDWriteFactory;
+    wxCOMPtr<ID2D1RenderTarget> m_pRenderTarget;
+    wxCOMPtr<ID2D1SolidColorBrush> m_pSolidBrush;
+    wxCOMPtr<ID2D1BitmapBrush> m_pPatternBrush;
+    wxCOMPtr<IDWriteTextFormat> m_pTextFormat;
+
+    SurfaceDataD2D* m_surfaceData;
+    FontID m_curFontID;
+};
+
+SurfaceD2D::SurfaceD2D():m_pDWriteFactory(::wxDWriteFactory())
+{
+    m_unicodeMode = false;
+    m_x = 0;
+    m_y = 0;
+    m_logPixelsY = 72;
+
+    m_ownRenderTarget = false;
+    m_clipsActive = 0;
+
+    m_yAscent = 2;
+    m_yDescent = 1;
+    m_yInternalLeading = 0;
+    m_averageCharWidth = 1;
+
+    m_surfaceData = NULL;
+    m_curFontID = NULL;
+}
+
+SurfaceD2D::~SurfaceD2D()
+{
+    Release();
+}
+
+void SurfaceD2D::Init(WindowID WXUNUSED(wid) )
+{
+    Release();
+
+    wxScreenDC sdc;
+    SetScale(&sdc);
+}
+
+void SurfaceD2D::Init(SurfaceID sid, WindowID wid)
+{
+    Release();
+
+    wxDC* dc = static_cast<wxDC*>(sid);
+    wxStyledTextCtrl* stc(NULL);
+    ScintillaWX* sciwx(NULL);
+    wxWindow* win = wxDynamicCast(wid,wxWindow);
+    wxSize sz = dc->GetSize();
+    RECT rc;
+    HRESULT hr;
+
+    if ( win && win->GetName() == "wxSTCCallTip" )
+    {
+        stc = wxDynamicCast(win->GetParent(),wxStyledTextCtrl);
+    }
+    else
+    {
+        stc = wxDynamicCast(wid,wxStyledTextCtrl);
+    }
+
+    if ( stc )
+    {
+        SetScale(dc);
+        sciwx = reinterpret_cast<ScintillaWX*>(stc->GetDirectPointer());
+        m_surfaceData = static_cast<SurfaceDataD2D*>(sciwx->GetSurfaceData());
+        hr = m_surfaceData->CreateGraphicsResources();
+
+        if ( SUCCEEDED(hr) )
+        {
+            ::SetRect(&rc,0,0,sz.GetWidth(),sz.GetHeight());
+            hr = m_surfaceData->GetRenderTarget()
+                ->BindDC(reinterpret_cast<HDC>(dc->GetHandle()),&rc);
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            m_pRenderTarget.reset(m_surfaceData->GetRenderTarget());
+            m_pSolidBrush.reset(m_surfaceData->GetSolidBrush());
+            m_pPatternBrush.reset(m_surfaceData->GetPatternBrush());
+            m_pRenderTarget->BeginDraw();
+        }
+    }
+}
+
+void SurfaceD2D::InitPixMap(int width, int height, Surface *surface_, WindowID)
+{
+    Release();
+
+    SurfaceD2D *psurfOther = static_cast<SurfaceD2D *>(surface_);
+    wxCOMPtr<ID2D1BitmapRenderTarget> pCompatibleRenderTarget;
+    D2D1_SIZE_F desiredSize = D2D1::SizeF(static_cast<float>(width),
+        static_cast<float>(height));
+    D2D1_PIXEL_FORMAT desiredFormat;
+
+#ifdef __MINGW32__
+    desiredFormat.format = DXGI_FORMAT_UNKNOWN;
+#else
+    desiredFormat = psurfOther->m_pRenderTarget->GetPixelFormat();
+#endif
+
+    desiredFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE;
+    HRESULT hr = psurfOther->m_pRenderTarget->CreateCompatibleRenderTarget(
+        &desiredSize, NULL, &desiredFormat,
+        D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &pCompatibleRenderTarget);
+    if ( SUCCEEDED(hr) )
+    {
+        m_pRenderTarget = pCompatibleRenderTarget;
+        m_pRenderTarget->BeginDraw();
+        m_ownRenderTarget = true;
+    }
+    SetUnicodeMode(psurfOther->m_unicodeMode);
+    m_logPixelsY = psurfOther->LogPixelsY();
+    m_surfaceData = psurfOther->m_surfaceData;
+}
+
+void SurfaceD2D::Release()
+{
+    if ( m_pRenderTarget.get() )
+    {
+        HRESULT hr;
+        while ( m_clipsActive )
+        {
+            m_pRenderTarget->PopAxisAlignedClip();
+            m_clipsActive--;
+        }
+        hr = m_pRenderTarget->EndDraw();
+        if ( hr == D2DERR_RECREATE_TARGET && m_surfaceData && !m_ownRenderTarget )
+        {
+            m_surfaceData->DiscardGraphicsResources();
+            m_surfaceData->SetEditorPaintAbandoned();
+        }
+    }
+
+    m_pRenderTarget.reset();
+    m_pSolidBrush.reset();
+    m_pPatternBrush.reset();
+    m_pTextFormat.reset();
+    m_curFontID = NULL;
+}
+
+bool SurfaceD2D::Initialised()
+{
+    return m_pRenderTarget.get() != NULL;
+}
+
+void SurfaceD2D::PenColour(ColourDesired fore)
+{
+    D2DPenColour(fore);
+}
+
+int SurfaceD2D::LogPixelsY()
+{
+    return m_logPixelsY;
+}
+
+int SurfaceD2D::DeviceHeightFont(int points)
+{
+    return ::MulDiv(points, LogPixelsY(), 72);
+}
+
+void SurfaceD2D::MoveTo(int x_, int y_)
+{
+    m_x = x_;
+    m_y = y_;
+}
+
+static int Delta(int difference)
+{
+    if ( difference < 0 )
+        return -1;
+    else if ( difference > 0 )
+        return 1;
+    else
+        return 0;
+}
+
+static float RoundFloat(float f)
+{
+    return float(int(f+0.5f));
+}
+
+void SurfaceD2D::LineTo(int x_, int y_)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        int xDiff = x_ - m_x;
+        int xDelta = Delta(xDiff);
+        int yDiff = y_ - m_y;
+        int yDelta = Delta(yDiff);
+        if ( (xDiff == 0) || (yDiff == 0) )
+        {
+            // Horizontal or vertical lines can be more precisely drawn as a
+            // filled rectangle
+            int xEnd = x_ - xDelta;
+            int left = Platform::Minimum(m_x, xEnd);
+            int width = abs(m_x - xEnd) + 1;
+            int yEnd = y_ - yDelta;
+            int top = Platform::Minimum(m_y, yEnd);
+            int height = abs(m_y - yEnd) + 1;
+            D2D1_RECT_F rectangle1 = D2D1::RectF(static_cast<float>(left),
+                static_cast<float>(top), static_cast<float>(left+width),
+                static_cast<float>(top+height));
+            m_pRenderTarget->FillRectangle(&rectangle1, m_pSolidBrush);
+        }
+        else if ( (abs(xDiff) == abs(yDiff)) )
+        {
+            // 45 degree slope
+            m_pRenderTarget->DrawLine(D2D1::Point2F(m_x + 0.5f, m_y + 0.5f),
+                D2D1::Point2F(x_ + 0.5f - xDelta, y_ + 0.5f - yDelta),
+                m_pSolidBrush);
+        }
+        else
+        {
+            // Line has a different slope so difficult to avoid last pixel
+            m_pRenderTarget->DrawLine(D2D1::Point2F(m_x + 0.5f, m_y + 0.5f),
+                D2D1::Point2F(x_ + 0.5f, y_ + 0.5f), m_pSolidBrush);
+        }
+        m_x = x_;
+        m_y = y_;
+    }
+}
+
+void SurfaceD2D::Polygon(Point *pts, int npts, ColourDesired fore,
+                         ColourDesired back)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        wxCOMPtr<ID2D1Factory> pFactory;
+        wxCOMPtr<ID2D1PathGeometry> geometry;
+        wxCOMPtr<ID2D1GeometrySink> sink;
+
+        m_pRenderTarget->GetFactory(&pFactory);
+
+        HRESULT hr = pFactory->CreatePathGeometry(&geometry);
+        if ( SUCCEEDED(hr) )
+        {
+            hr = geometry->Open(&sink);
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            sink->BeginFigure(D2D1::Point2F(pts[0].x + 0.5f, pts[0].y + 0.5f),
+                D2D1_FIGURE_BEGIN_FILLED);
+            for ( size_t i=1; i<static_cast<size_t>(npts); i++ )
+            {
+                sink->AddLine(D2D1::Point2F(pts[i].x + 0.5f, pts[i].y + 0.5f));
+            }
+            sink->EndFigure(D2D1_FIGURE_END_CLOSED);
+            sink->Close();
+
+            D2DPenColour(back);
+            m_pRenderTarget->FillGeometry(geometry,m_pSolidBrush);
+            D2DPenColour(fore);
+            m_pRenderTarget->DrawGeometry(geometry,m_pSolidBrush);
+        }
+    }
+}
+
+void SurfaceD2D::RectangleDraw(PRectangle rc, ColourDesired fore,
+                               ColourDesired back)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        D2D1_RECT_F rectangle1 = D2D1::RectF(RoundFloat(rc.left) + 0.5f,
+            rc.top+0.5f, RoundFloat(rc.right) - 0.5f, rc.bottom-0.5f);
+        D2DPenColour(back);
+        m_pRenderTarget->FillRectangle(&rectangle1, m_pSolidBrush);
+        D2DPenColour(fore);
+        m_pRenderTarget->DrawRectangle(&rectangle1, m_pSolidBrush);
+    }
+}
+
+void SurfaceD2D::FillRectangle(PRectangle rc, ColourDesired back)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        D2DPenColour(back);
+        D2D1_RECT_F rectangle1 = D2D1::RectF(RoundFloat(rc.left), rc.top,
+            RoundFloat(rc.right), rc.bottom);
+        m_pRenderTarget->FillRectangle(&rectangle1, m_pSolidBrush);
+    }
+}
+
+void SurfaceD2D::FillRectangle(PRectangle rc, Surface &surfacePattern)
+{
+    SurfaceD2D &surfOther = static_cast<SurfaceD2D &>(surfacePattern);
+    surfOther.FlushDrawing();
+
+    wxCOMPtr<ID2D1Bitmap> pBitmap;
+    wxCOMPtr<ID2D1BitmapRenderTarget> pCompatibleRenderTarget(
+        reinterpret_cast<ID2D1BitmapRenderTarget*>(
+            surfOther.m_pRenderTarget.get()));
+
+    HRESULT hr = pCompatibleRenderTarget->GetBitmap(&pBitmap);
+
+    if ( SUCCEEDED(hr) )
+    {
+        if ( m_pPatternBrush.get() )
+        {
+            m_pPatternBrush->SetBitmap(pBitmap);
+        }
+        else
+        {
+            D2D1_BITMAP_BRUSH_PROPERTIES brushProperties =
+                D2D1::BitmapBrushProperties(D2D1_EXTEND_MODE_WRAP,
+                    D2D1_EXTEND_MODE_WRAP,
+                    D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR);
+
+            hr = m_pRenderTarget->CreateBitmapBrush(pBitmap, brushProperties,
+                &m_pPatternBrush);
+        }
+    }
+
+    if ( SUCCEEDED(hr) )
+    {
+        m_pRenderTarget->FillRectangle(
+            D2D1::RectF(rc.left, rc.top, rc.right, rc.bottom),
+            m_pPatternBrush);
+    }
+}
+
+void SurfaceD2D::RoundedRectangle(PRectangle rc, ColourDesired fore,
+                                  ColourDesired back)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        D2D1_ROUNDED_RECT roundedRectFill = {
+            D2D1::RectF(rc.left+1.0f, rc.top+1.0f, rc.right-1.0f, rc.bottom-1.0f),
+            4, 4};
+        D2DPenColour(back);
+        m_pRenderTarget->FillRoundedRectangle(roundedRectFill, m_pSolidBrush);
+
+        D2D1_ROUNDED_RECT roundedRect = {
+            D2D1::RectF(rc.left + 0.5f, rc.top+0.5f, rc.right - 0.5f, rc.bottom-0.5f),
+            4, 4};
+        D2DPenColour(fore);
+        m_pRenderTarget->DrawRoundedRectangle(roundedRect, m_pSolidBrush);
+    }
+}
+
+void SurfaceD2D::AlphaRectangle(PRectangle rc, int cornerSize,
+                                ColourDesired fill, int alphaFill,
+                                ColourDesired outline, int alphaOutline,
+                                int /* flags*/ )
+{
+    if ( m_pRenderTarget.get() )
+    {
+        if (cornerSize == 0)
+        {
+            // When corner size is zero, draw square rectangle to prevent
+            // blurry pixels at corners
+            D2D1_RECT_F rectFill = D2D1::RectF(RoundFloat(rc.left) + 1.0f,
+                rc.top + 1.0f, RoundFloat(rc.right) - 1.0f, rc.bottom - 1.0f);
+            D2DPenColour(fill, alphaFill);
+            m_pRenderTarget->FillRectangle(rectFill, m_pSolidBrush);
+
+            D2D1_RECT_F rectOutline = D2D1::RectF(RoundFloat(rc.left) + 0.5f,
+                rc.top + 0.5f, RoundFloat(rc.right) - 0.5f, rc.bottom - 0.5f);
+            D2DPenColour(outline, alphaOutline);
+            m_pRenderTarget->DrawRectangle(rectOutline, m_pSolidBrush);
+        }
+        else
+        {
+            const float cornerSizeF = static_cast<float>(cornerSize);
+            D2D1_ROUNDED_RECT roundedRectFill = {
+                D2D1::RectF(RoundFloat(rc.left) + 1.0f, rc.top + 1.0f,
+                    RoundFloat(rc.right) - 1.0f, rc.bottom - 1.0f),
+                cornerSizeF, cornerSizeF};
+            D2DPenColour(fill, alphaFill);
+            m_pRenderTarget->FillRoundedRectangle(roundedRectFill, m_pSolidBrush);
+
+            D2D1_ROUNDED_RECT roundedRect = {
+                D2D1::RectF(RoundFloat(rc.left) + 0.5f, rc.top + 0.5f,
+                    RoundFloat(rc.right) - 0.5f, rc.bottom - 0.5f),
+                cornerSizeF, cornerSizeF};
+            D2DPenColour(outline, alphaOutline);
+            m_pRenderTarget->DrawRoundedRectangle(roundedRect, m_pSolidBrush);
+        }
+    }
+}
+
+void SurfaceD2D::DrawRGBAImage(PRectangle rc, int width, int height,
+                               const unsigned char *pixelsImage)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        if (rc.Width() > width)
+            rc.left += static_cast<int>((rc.Width() - width) / 2);
+        rc.right = rc.left + width;
+        if (rc.Height() > height)
+            rc.top += static_cast<int>((rc.Height() - height) / 2);
+        rc.bottom = rc.top + height;
+
+        wxVector<unsigned char> image(height * width * 4);
+        for ( int yPixel=0; yPixel<height; yPixel++ )
+        {
+            for ( int xPixel = 0; xPixel<width; xPixel++ )
+            {
+                unsigned char *pixel = &image[0] + (yPixel*width + xPixel) * 4;
+                unsigned char alpha = pixelsImage[3];
+                // Input is RGBA, output is BGRA with premultiplied alpha
+                pixel[2] = (*pixelsImage++) * alpha / 255;
+                pixel[1] = (*pixelsImage++) * alpha / 255;
+                pixel[0] = (*pixelsImage++) * alpha / 255;
+                pixel[3] = *pixelsImage++;
+            }
+        }
+
+        wxCOMPtr<ID2D1Bitmap> bitmap;
+        D2D1_SIZE_U size = D2D1::SizeU(width, height);
+        D2D1_BITMAP_PROPERTIES props = {{DXGI_FORMAT_B8G8R8A8_UNORM,
+            D2D1_ALPHA_MODE_PREMULTIPLIED}, 72.0, 72.0};
+        HRESULT hr = m_pRenderTarget->CreateBitmap(size, &image[0],
+                  width * 4, &props, &bitmap);
+
+        if ( SUCCEEDED(hr) )
+        {
+            D2D1_RECT_F rcDestination = {rc.left, rc.top, rc.right, rc.bottom};
+            m_pRenderTarget->DrawBitmap(bitmap, rcDestination);
+        }
+    }
+}
+
+void SurfaceD2D::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        FLOAT radius = rc.Width() / 2.0f;
+        D2D1_ELLIPSE ellipse = {
+            D2D1::Point2F((rc.left + rc.right) / 2.0f,
+                (rc.top + rc.bottom) / 2.0f),
+            radius, radius};
+
+        PenColour(back);
+        m_pRenderTarget->FillEllipse(ellipse, m_pSolidBrush);
+        PenColour(fore);
+        m_pRenderTarget->DrawEllipse(ellipse, m_pSolidBrush);
+    }
+}
+
+void SurfaceD2D::Copy(PRectangle rc, Point from, Surface &surfaceSource) {
+    SurfaceD2D &surfOther = static_cast<SurfaceD2D &>(surfaceSource);
+    surfOther.FlushDrawing();
+
+    wxCOMPtr<ID2D1Bitmap> pBitmap;
+    wxCOMPtr<ID2D1BitmapRenderTarget> pCompatibleRenderTarget(
+        reinterpret_cast<ID2D1BitmapRenderTarget*>(surfOther.m_pRenderTarget.get()));
+
+    HRESULT hr = pCompatibleRenderTarget->GetBitmap(&pBitmap);
+
+    if ( SUCCEEDED(hr) )
+    {
+        D2D1_RECT_F rcDestination = {rc.left, rc.top, rc.right, rc.bottom};
+        D2D1_RECT_F rcSource =
+            {from.x, from.y, from.x + rc.Width(), from.y + rc.Height()};
+        m_pRenderTarget->DrawBitmap(pBitmap, rcDestination, 1.0f,
+            D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, rcSource);
+
+        hr = m_pRenderTarget->Flush();
+        if ( FAILED(hr) )
+        {
+            Platform::DebugPrintf("Failed Flush 0x%x\n", hr);
+        }
+    }
+}
+
+void SurfaceD2D::DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase,
+                                const char *s, int len, ColourDesired fore,
+                                ColourDesired back)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        FillRectangle(rc, back);
+        D2DPenColour(fore);
+        DrawTextCommon(rc, font_, ybase, s, len, ETO_OPAQUE);
+    }
+}
+
+void SurfaceD2D::DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase,
+                                 const char *s, int len, ColourDesired fore,
+                                 ColourDesired back)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        FillRectangle(rc, back);
+        D2DPenColour(fore);
+        DrawTextCommon(rc, font_, ybase, s, len, ETO_OPAQUE | ETO_CLIPPED);
+    }
+}
+
+void SurfaceD2D::DrawTextTransparent(PRectangle rc, Font &font_,
+                                     XYPOSITION ybase, const char *s, int len,
+                                     ColourDesired fore)
+{
+    // Avoid drawing spaces in transparent mode
+    for ( int i=0; i<len; i++ )
+    {
+        if ( s[i] != ' ' )
+        {
+            if ( m_pRenderTarget.get() )
+            {
+                D2DPenColour(fore);
+                DrawTextCommon(rc, font_, ybase, s, len, 0);
+            }
+            return;
+        }
+    }
+}
+
+XYPOSITION SurfaceD2D::WidthText(Font &font_, const char *s, int len)
+{
+    XYPOSITION width = 1.0;
+    wxString tbuf = stc2wx(s,len);
+    SetFont(font_);
+
+    if ( m_pDWriteFactory.get() && m_pTextFormat.get() )
+    {
+        wxCOMPtr<IDWriteTextLayout> pTextLayout;
+        DWRITE_TEXT_METRICS textMetrics = {0,0,0,0,0,0,0,0,0};
+
+        HRESULT hr = m_pDWriteFactory->CreateTextLayout(tbuf.wc_str(),
+            tbuf.Length(), m_pTextFormat, FLT_MAX, FLT_MAX, &pTextLayout);
+
+        if ( SUCCEEDED(hr) )
+        {
+            hr = pTextLayout->GetMetrics(&textMetrics);
+        }
+
+        if ( SUCCEEDED(hr) )
+        {
+            width = textMetrics.widthIncludingTrailingWhitespace;
+        }
+    }
+    return width;
+}
+
+void SurfaceD2D::MeasureWidths(Font &font_, const char *s, int len,
+                               XYPOSITION *positions)
+{
+    int fit = 0;
+    wxString tbuf = stc2wx(s,len);
+    wxVector<FLOAT> poses;
+    poses.reserve(tbuf.Length());
+    poses.resize(tbuf.Length());
+
+    fit = tbuf.Length();
+    const int clusters = 1000;
+    DWRITE_CLUSTER_METRICS clusterMetrics[clusters];
+    UINT32 count = 0;
+    SetFont(font_);
+
+    if ( m_pDWriteFactory.get() && m_pTextFormat.get() )
+    {
+        wxCOMPtr<IDWriteTextLayout> pTextLayout;
+
+        HRESULT hr = m_pDWriteFactory->CreateTextLayout(tbuf.wc_str(),
+            tbuf.Length(), m_pTextFormat, FLT_MAX, FLT_MAX, &pTextLayout);
+        if ( !SUCCEEDED(hr) )
+            return;
+
+        hr = pTextLayout->GetClusterMetrics(clusterMetrics, clusters, &count);
+        if ( !SUCCEEDED(hr) )
+            return;
+
+        // A cluster may be more than one WCHAR, such as for "ffi" which is a
+        // ligature in the Candara font
+        FLOAT position = 0.0f;
+        size_t ti=0;
+        for ( size_t ci=0; ci<count; ci++ )
+        {
+            for ( size_t inCluster=0; inCluster<clusterMetrics[ci].length;
+                inCluster++)
+            {
+                poses[ti++] =
+                    position + clusterMetrics[ci].width * (inCluster + 1) /
+                        clusterMetrics[ci].length;
+            }
+            position += clusterMetrics[ci].width;
+        }
+        PLATFORM_ASSERT(ti == tbuf.Length());
+    }
+    if (m_unicodeMode)
+    {
+        // Map the widths given for UTF-16 characters back onto the UTF-8 input
+        // string
+        int ui=0;
+        const unsigned char *us = reinterpret_cast<const unsigned char *>(s);
+        int i=0;
+        while ( ui<fit )
+        {
+            unsigned char uch = us[i];
+            unsigned int lenChar = 1;
+            if (uch >= (0x80 + 0x40 + 0x20 + 0x10))
+            {
+                lenChar = 4;
+                ui++;
+            }
+            else if (uch >= (0x80 + 0x40 + 0x20))
+            {
+                lenChar = 3;
+            }
+            else if (uch >= (0x80))
+            {
+                lenChar = 2;
+            }
+
+            for ( unsigned int bytePos=0; (bytePos<lenChar) && (i<len); bytePos++ )
+            {
+                positions[i++] = poses[ui];
+            }
+            ui++;
+        }
+        XYPOSITION lastPos = 0.0f;
+        if ( i > 0 )
+            lastPos = positions[i-1];
+        while ( i<len )
+        {
+            positions[i++] = lastPos;
+        }
+    }
+    else
+    {
+        // One character per position
+        PLATFORM_ASSERT(len == tbuf.Length());
+        for ( size_t kk=0; kk<static_cast<size_t>(len); kk++ )
+        {
+            positions[kk] = poses[kk];
+        }
+    }
+}
+
+XYPOSITION SurfaceD2D::WidthChar(Font &font_, char ch)
+{
+    FLOAT width = 1.0;
+    SetFont(font_);
+    if ( m_pDWriteFactory.get() && m_pTextFormat.get() )
+    {
+        wxCOMPtr<IDWriteTextLayout> pTextLayout;
+        const WCHAR wch = ch;
+        HRESULT hr = m_pDWriteFactory->CreateTextLayout(&wch, 1, m_pTextFormat,
+            1000.0, 1000.0, &pTextLayout);
+
+        if ( SUCCEEDED(hr) )
+        {
+            DWRITE_TEXT_METRICS textMetrics;
+            if (SUCCEEDED(pTextLayout->GetMetrics(&textMetrics)))
+                width = textMetrics.widthIncludingTrailingWhitespace;
+        }
+    }
+    return width;
+}
+
+XYPOSITION SurfaceD2D::Ascent(Font &font_)
+{
+    SetFont(font_);
+    return ceil(m_yAscent);
+}
+
+XYPOSITION SurfaceD2D::Descent(Font &font_)
+{
+    SetFont(font_);
+    return ceil(m_yDescent);
+}
+
+XYPOSITION SurfaceD2D::InternalLeading(Font &font_)
+{
+    SetFont(font_);
+    return floor(m_yInternalLeading);
+}
+
+XYPOSITION SurfaceD2D::ExternalLeading(Font &)
+{
+    // Not implemented, always return one
+    return 1;
+}
+
+XYPOSITION SurfaceD2D::Height(Font &font_)
+{
+    return Ascent(font_) + Descent(font_);
+}
+
+XYPOSITION SurfaceD2D::AverageCharWidth(Font &font_)
+{
+    SetFont(font_);
+    return m_averageCharWidth;
+}
+
+void SurfaceD2D::SetClip(PRectangle rc)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        D2D1_RECT_F rcClip = {rc.left, rc.top, rc.right, rc.bottom};
+        m_pRenderTarget->PushAxisAlignedClip(rcClip, D2D1_ANTIALIAS_MODE_ALIASED);
+        m_clipsActive++;
+    }
+}
+
+void SurfaceD2D::FlushCachedState()
+{
+}
+
+void SurfaceD2D::SetUnicodeMode(bool unicodeMode_)
+{
+    m_unicodeMode=unicodeMode_;
+}
+
+void SurfaceD2D::SetDBCSMode(int WXUNUSED(codePage_))
+{
+}
+
+void SurfaceD2D::SetFont(Font &font_)
+{
+    FontID id = font_.GetID();
+
+    if (m_curFontID != id)
+    {
+        wxFontWithAscent *pfm = static_cast<wxFontWithAscent *>(id);
+        SurfaceFontDataD2D* sfd =
+            static_cast<SurfaceFontDataD2D*>(pfm->GetSurfaceFontData());
+
+        if ( sfd->Initialised() )
+        {
+            m_pTextFormat.reset(sfd->GetFormat());
+            m_yAscent = sfd->GetAscent();
+            m_yDescent = sfd->GetDescent();
+            m_yInternalLeading = sfd->GetInternalLeading();
+            m_averageCharWidth = sfd->GetAverageCharWidth();
+
+            if ( m_pRenderTarget.get() )
+            {
+                D2D1_TEXT_ANTIALIAS_MODE aaMode = sfd->GetFontQuality();
+
+                if ( m_surfaceData && m_surfaceData->Initialised() )
+                {
+                    if ( aaMode == D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE )
+                    {
+                        m_pRenderTarget->SetTextRenderingParams(
+                            m_surfaceData->GetCustomClearTypeRenderingParams());
+                    }
+                    else
+                    {
+                        m_pRenderTarget->SetTextRenderingParams(
+                            m_surfaceData->GetDefaultRenderingParams());
+                    }
+                }
+
+                m_pRenderTarget->SetTextAntialiasMode(aaMode);
+            }
+
+            m_curFontID = id;
+        }
+    }
+}
+
+void SurfaceD2D::SetScale(wxDC* dc)
+{
+    wxSize sz = dc->GetPPI();
+    m_logPixelsY = sz.GetY();
+}
+
+HRESULT SurfaceD2D::FlushDrawing()
+{
+    return m_pRenderTarget->Flush();
+}
+
+void SurfaceD2D::D2DPenColour(ColourDesired fore, int alpha)
+{
+    if ( m_pRenderTarget.get() )
+    {
+        D2D_COLOR_F col;
+        col.r = (fore.AsLong() & 0xff) / 255.0f;
+        col.g = ((fore.AsLong() & 0xff00) >> 8) / 255.0f;
+        col.b = (fore.AsLong() >> 16) / 255.0f;
+        col.a = alpha / 255.0f;
+        if ( m_pSolidBrush.get() )
+        {
+            m_pSolidBrush->SetColor(col);
+        }
+        else
+        {
+            HRESULT hr = m_pRenderTarget->CreateSolidColorBrush(col, &m_pSolidBrush);
+            if ( !SUCCEEDED(hr) )
+            {
+                m_pSolidBrush.reset();
+            }
+        }
+    }
+}
+
+void SurfaceD2D::DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase,
+                                const char *s, int len, UINT fuOptions)
+{
+    SetFont(font_);
+
+    if ( m_pRenderTarget.get() && m_pSolidBrush.get() && m_pTextFormat.get() )
+    {
+        // Explicitly creating a text layout appears a little faster
+        wxCOMPtr<IDWriteTextLayout> pTextLayout;
+        wxString tbuf = stc2wx(s, len);
+        HRESULT hr;
+
+        if ( fuOptions & ETO_CLIPPED )
+        {
+            D2D1_RECT_F rcClip = {rc.left, rc.top, rc.right, rc.bottom};
+            m_pRenderTarget->PushAxisAlignedClip(rcClip,
+                D2D1_ANTIALIAS_MODE_ALIASED);
+        }
+
+        hr = m_pDWriteFactory->CreateTextLayout(tbuf.wc_str(), tbuf.Length(),
+            m_pTextFormat, rc.Width(), rc.Height(), &pTextLayout);
+
+        if ( SUCCEEDED(hr) )
+        {
+            D2D1_POINT_2F origin = {rc.left, ybase-m_yAscent};
+            m_pRenderTarget->DrawTextLayout(origin, pTextLayout, m_pSolidBrush,
+                D2D1_DRAW_TEXT_OPTIONS_NONE);
+        }
+
+        if ( fuOptions & ETO_CLIPPED )
+        {
+            m_pRenderTarget->PopAxisAlignedClip();
+        }
+    }
+}
+
+#endif // wxUSE_GRAPHICS_DIRECT2D
+
+Surface *Surface::Allocate(int technology) {
+#if wxUSE_GRAPHICS_DIRECT2D
+    if ( technology == wxSTC_TECHNOLOGY_DIRECTWRITE ) {
+        return new SurfaceD2D;
+    }
+#endif // wxUSE_GRAPHICS_DIRECT2D
     return new SurfaceImpl;
 }
 
diff --git a/src/stc/PlatWX.h b/src/stc/PlatWX.h
index ac762ddf8e..a2a86da45b 100644
--- a/src/stc/PlatWX.h
+++ b/src/stc/PlatWX.h
@@ -6,3 +6,69 @@ wxRect wxRectFromPRectangle(PRectangle prc);
 PRectangle PRectangleFromwxRect(wxRect rc);
 wxColour wxColourFromCD(const ColourDesired& ca);
 
+class SurfaceData
+{
+    public:
+        virtual ~SurfaceData(){}
+};
+
+#if wxUSE_GRAPHICS_DIRECT2D
+
+#include <wx/msw/private/graphicsd2d.h>
+#include <wx/msw/private/comptr.h>
+
+class ScintillaWX;
+
+class SurfaceDataD2D: public SurfaceData
+{
+    public:
+        SurfaceDataD2D(ScintillaWX*);
+        bool Initialised() const;
+        void DiscardGraphicsResources();
+        HRESULT CreateGraphicsResources();
+        void SetEditorPaintAbandoned();
+
+        ID2D1DCRenderTarget* GetRenderTarget() const {return m_pRenderTarget.get();}
+        ID2D1SolidColorBrush* GetSolidBrush() const {return m_pSolidBrush.get();}
+        ID2D1BitmapBrush* GetPatternBrush() const {return m_pPatternBrush.get();}
+        IDWriteRenderingParams* GetDefaultRenderingParams() const
+            {return m_defaultRenderingParams;}
+        IDWriteRenderingParams* GetCustomClearTypeRenderingParams() const
+            {return m_customClearTypeRenderingParams;}
+
+    private:
+        wxCOMPtr<ID2D1Factory> m_pD2DFactory;
+        wxCOMPtr<IDWriteFactory> m_pDWriteFactory;
+        wxCOMPtr<ID2D1DCRenderTarget> m_pRenderTarget;
+        wxCOMPtr<ID2D1SolidColorBrush> m_pSolidBrush;
+        wxCOMPtr<ID2D1BitmapBrush> m_pPatternBrush;
+        wxCOMPtr<IDWriteRenderingParams> m_defaultRenderingParams;
+        wxCOMPtr<IDWriteRenderingParams> m_customClearTypeRenderingParams;
+
+        ScintillaWX* m_editor;
+};
+
+class SurfaceFontDataD2D: public SurfaceData
+{
+    public:
+        SurfaceFontDataD2D(const FontParameters& fp);
+        bool Initialised() const;
+
+        XYPOSITION GetAscent() const {return m_ascent;}
+        XYPOSITION GetDescent() const {return m_descent;}
+        XYPOSITION GetInternalLeading() const {return m_internalLeading;}
+        XYPOSITION GetAverageCharWidth() const {return m_averageCharWidth;}
+
+        D2D1_TEXT_ANTIALIAS_MODE GetFontQuality() const {return m_aaMode;}
+        IDWriteTextFormat* GetFormat() const {return m_pTextFormat.get();}
+
+    private:
+        XYPOSITION m_ascent;
+        XYPOSITION m_descent;
+        XYPOSITION m_internalLeading;
+        XYPOSITION m_averageCharWidth;
+        D2D1_TEXT_ANTIALIAS_MODE m_aaMode;
+        wxCOMPtr<IDWriteTextFormat> m_pTextFormat;
+};
+
+#endif // wxUSE_GRAPHICS_DIRECT2D
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index deaacadbfe..ba6b2641e5 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -118,6 +118,7 @@ public:
           m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
         {
             SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+            SetName("wxSTCCallTip");
         }
 
     ~wxSTCCallTip() {
@@ -134,7 +135,7 @@ public:
     void OnPaint(wxPaintEvent& WXUNUSED(evt))
     {
         wxAutoBufferedPaintDC dc(this);
-        Surface* surfaceWindow = Surface::Allocate(0);
+        Surface* surfaceWindow = Surface::Allocate(m_swx->technology);
         surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
         m_ct->PaintCT(surfaceWindow);
         surfaceWindow->Release();
@@ -270,6 +271,8 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     timers[tickScroll] = new wxSTCTimer(this,tickScroll);
     timers[tickWiden] = new wxSTCTimer(this,tickWiden);
     timers[tickDwell] = new wxSTCTimer(this,tickDwell);
+
+    m_surfaceData = NULL;
 }
 
 
@@ -278,6 +281,11 @@ ScintillaWX::~ScintillaWX() {
         delete i->second;
     }
     timers.clear();
+
+    if ( m_surfaceData != NULL ) {
+        delete m_surfaceData;
+    }
+
     Finalise();
 }
 
@@ -817,6 +825,36 @@ sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam)
       }
 #endif
 
+#if wxUSE_GRAPHICS_DIRECT2D
+        case SCI_SETTECHNOLOGY:
+            if ((wParam == SC_TECHNOLOGY_DEFAULT) || (wParam == SC_TECHNOLOGY_DIRECTWRITE)) {
+                if (technology != static_cast<int>(wParam)) {
+                    SurfaceDataD2D* newSurfaceData(NULL);
+
+                    if (static_cast<int>(wParam) > SC_TECHNOLOGY_DEFAULT) {
+                        newSurfaceData =  new SurfaceDataD2D(this);
+
+                        if (!newSurfaceData->Initialised()) {
+                            // Failed to load Direct2D or DirectWrite so no effect
+                            delete newSurfaceData;
+                            return 0;
+                        }
+                    }
+
+                    technology = static_cast<int>(wParam);
+                    if ( m_surfaceData ) {
+                        delete m_surfaceData;
+                    }
+                    m_surfaceData = newSurfaceData;
+
+                    // Invalidate all cached information including layout.
+                    DropGraphics(true);
+                    InvalidateStyleRedraw();
+                }
+            }
+            break;
+#endif
+
 #ifdef SCI_LEXER
       case SCI_LOADLEXERLIBRARY:
             LexerManager::GetInstance()->Load((const char*)lParam);
diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index 6ab764c5f3..d4d03f9c0e 100644
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -87,6 +87,7 @@ class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;           // forward
 class ScintillaWX;
 class wxSTCTimer;
+class SurfaceData;
 
 //----------------------------------------------------------------------
 // Helper classes
@@ -196,6 +197,8 @@ public:
     void ClipChildren(wxDC& dc, PRectangle rect);
     void SetUseAntiAliasing(bool useAA);
     bool GetUseAntiAliasing();
+    SurfaceData* GetSurfaceData() const {return m_surfaceData;}
+    void SetPaintAbandoned(){paintState = paintAbandoned;}
 
 private:
     bool                capturedMouse;
@@ -212,6 +215,7 @@ private:
 
     int                 wheelVRotation;
     int                 wheelHRotation;
+    SurfaceData*        m_surfaceData;
 
     // For use in creating a system caret
     bool HasCaretSizeChanged();
diff --git a/src/stc/gen_docs.py b/src/stc/gen_docs.py
index 949040e8e3..c66ff27f77 100644
--- a/src/stc/gen_docs.py
+++ b/src/stc/gen_docs.py
@@ -517,6 +517,7 @@ docsMap = {
     'SetMouseDwellTime':'Notifications',
     'GetBufferedDraw':'OtherSettings',
     'GetCodePage':'OtherSettings',
+    'GetFontQuality':'OtherSettings',
     'GetFocus':'OtherSettings',
     'GetIMEInteraction':'OtherSettings',
     'GetPhasesDraw':'OtherSettings',
@@ -525,6 +526,7 @@ docsMap = {
     'SetBufferedDraw':'OtherSettings',
     'SetCodePage':'OtherSettings',
     'SetFocus':'OtherSettings',
+    'SetFontQuality':'OtherSettings',
     'SetIMEInteraction':'OtherSettings',
     'SetLayoutCache':'OtherSettings',
     'SetPhasesDraw':'OtherSettings',
@@ -840,7 +842,9 @@ docSubstitutions = {
 
     'SetSelectionMode':{'SC_SEL_STREAM':'wxSTC_SEL_STREAM',
         'SC_SEL_RECTANGLE':'wxSTC_SEL_RECTANGLE','SC_SEL_THIN':'wxSTC_SEL_THIN',
-        'SC_SEL_LINES':'wxSTC_SEL_LINES'}
+        'SC_SEL_LINES':'wxSTC_SEL_LINES'},
+
+    'SetFontQuality':{' from the FontQuality enumeration':''}
 }
 
 
@@ -1033,10 +1037,24 @@ extendedDocs = {
         '@endlink constants.',),
 
     'SetTechnology':
-        ('The input should be one of the',
-        '@link wxStyledTextCtrl::wxSTC_TECHNOLOGY_DEFAULT wxSTC_TECHNOLOGY_* '
+        ('@remarks',
+        'For the wxMSW port, the input can be either wxSTC_TECHNOLOGY_DEFAULT',
+        'or wxSTC_TECHNOLOGY_DIRECTWRITE.  With other ports, this method has',
+        'no effect.',),
+
+    'GetFontQuality':
+        ('The return value will be one of the',
+        '@link wxStyledTextCtrl::wxSTC_EFF_QUALITY_DEFAULT wxSTC_EFF_QUALITY_* '
         '@endlink constants.',),
 
+    'SetFontQuality':
+        ('The input should be one of the',
+        '@link wxStyledTextCtrl::wxSTC_EFF_QUALITY_DEFAULT wxSTC_EFF_QUALITY_* '
+        '@endlink constants.',
+        '@remarks',
+        'This method only has any effect with the wxMSW port and when',
+        'technology has been set to wxSTC_TECHNOLOGY_DIRECTWRITE.',),
+
     'GetIMEInteraction':
         ('The return value will be one of the',
         '@link wxStyledTextCtrl::wxSTC_IME_WINDOWED wxSTC_IME_* @endlink constants.',),
@@ -1362,6 +1380,7 @@ sinceAnnotations= {
     'FoldDisplayTextSetStyle':'3.1.1',
     'GetDirectFunction':'3.1.1',
     'GetDirectPointer':'3.1.1',
+    'GetFontQuality':'3.1.1',
     'GetIdleStyling':'3.1.1',
     'GetLexerLanguage':'3.1.1',
     'GetMarginBackN':'3.1.1',
@@ -1374,6 +1393,7 @@ sinceAnnotations= {
     'MultiEdgeClearAll':'3.1.1',
     'MultipleSelectAddEach':'3.1.1',
     'MultipleSelectAddNext':'3.1.1',
+    'SetFontQuality':'3.1.1',
     'SetIdleStyling':'3.1.1',
     'SetMarginBackN':'3.1.1',
     'SetMargins':'3.1.1',
diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index cbba253924..deabf2962b 100755
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -895,8 +895,6 @@ methodOverrideMap = {
          return stc2wx(buf);'''
     ),
 
-    'SetFontQuality' : (None, 0, 0),
-    'GetFontQuality' : (None, 0, 0),
     'SetSelection' : (None, 0, 0),
 
     'GetCharacterPointer' : (0,
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 79b83ca1f5..b4602db8da 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -231,6 +231,10 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
     SetBufferedDraw(true);
 #endif
 
+#if wxUSE_GRAPHICS_DIRECT2D
+    SetFontQuality(wxSTC_EFF_QUALITY_DEFAULT);
+#endif
+
     return true;
 }
 
@@ -2533,6 +2537,18 @@ void wxStyledTextCtrl::SetPhasesDraw(int phases)
     SendMsg(SCI_SETPHASESDRAW, phases, 0);
 }
 
+// Choose the quality level for text.
+void wxStyledTextCtrl::SetFontQuality(int fontQuality)
+{
+    SendMsg(SCI_SETFONTQUALITY, fontQuality, 0);
+}
+
+// Retrieve the quality level for text.
+int wxStyledTextCtrl::GetFontQuality() const
+{
+    return SendMsg(SCI_GETFONTQUALITY, 0, 0);
+}
+
 // Scroll so that a display line is at the top of the display.
 void wxStyledTextCtrl::SetFirstVisibleLine(int displayLine)
 {
diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index fc3c80485f..d4af95790c 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -231,6 +231,10 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
     SetBufferedDraw(true);
 #endif
 
+#if wxUSE_GRAPHICS_DIRECT2D
+    SetFontQuality(wxSTC_EFF_QUALITY_DEFAULT);
+#endif
+
     return true;
 }
 

From df1456e4e2c2ac029ebcad17db5f5eb3478d1bc6 Mon Sep 17 00:00:00 2001
From: New Pagodi <NewPagodi@users.noreply.github.com>
Date: Thu, 25 Jan 2018 16:08:33 -0600
Subject: [PATCH 212/916] Apply erans patch to allow building with MinGW

---
 src/msw/graphicsd2d.cpp | 6 ++++++
 src/stc/PlatWX.cpp      | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index ad502cc43e..b953deee2f 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -40,6 +40,12 @@
 #include <dwrite.h>
 #include <wincodec.h>
 
+#ifdef __MINGW64_TOOLCHAIN__
+#ifndef DRWITE_E_NOFONT
+#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)
+#endif
+#endif
+
 #if wxD2D_DEVICE_CONTEXT_SUPPORTED
 #include <D3D11.h>
 #include <D2d1_1.h>
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 0aa5a0f2a0..cf25b6dd96 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -48,6 +48,8 @@
 
 #if wxUSE_GRAPHICS_DIRECT2D
 #include "ScintillaWX.h"
+#include <float.h>
+#include "wx/dcscreen.h"
 #endif
 
 Point Point::FromLong(long lpoint) {
@@ -732,10 +734,12 @@ SurfaceFontDataD2D::SurfaceFontDataD2D(const FontParameters& fp)
         {
             fontWeight = DWRITE_FONT_WEIGHT_LIGHT;
         }
+#ifndef __MINGW64_TOOLCHAIN__
         else if ( weight <= 350 )
         {
             fontWeight = DWRITE_FONT_WEIGHT_SEMI_LIGHT;
         }
+#endif
         else if ( weight <= 400 )
         {
             fontWeight = DWRITE_FONT_WEIGHT_NORMAL;

From 8d75368a301fe03d9c132c82b4596bbe637fdbca Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 18:36:14 +0100
Subject: [PATCH 213/916] Minor formatting and style fixes to the previous
 commit

Fix indentation and spacing.

Also declare some variables when initializing them and make them const
if they don't change later.
---
 src/msw/graphicsd2d.cpp |  3 +-
 src/stc/PlatWX.cpp      | 51 +++++++++++--------------
 src/stc/PlatWX.h        | 84 ++++++++++++++++++++---------------------
 3 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index b953deee2f..243a4ad6ba 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -4500,7 +4500,8 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetDirect2DRenderer()
     return gs_D2DRenderer;
 }
 
-wxD2DRenderer::wxD2DRenderer():m_direct2dFactory(wxD2D1Factory())
+wxD2DRenderer::wxD2DRenderer()
+    : m_direct2dFactory(wxD2D1Factory())
 {
     if ( m_direct2dFactory.get() == NULL )
     {
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index cf25b6dd96..4dbe0e42f0 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -91,16 +91,14 @@ class wxFontWithAscent : public wxFont
 public:
     explicit wxFontWithAscent(const wxFont &font)
         : wxFont(font),
-          m_ascent(0),m_surfaceFontData(NULL)
+          m_ascent(0),
+          m_surfaceFontData(NULL)
     {
     }
 
-    ~wxFontWithAscent()
+    virtual ~wxFontWithAscent()
     {
-        if ( m_surfaceFontData )
-        {
-            delete m_surfaceFontData;
-        }
+        delete m_surfaceFontData;
     }
 
     static wxFontWithAscent* FromFID(FontID fid)
@@ -111,8 +109,8 @@ public:
     void SetAscent(int ascent) { m_ascent = ascent; }
     int GetAscent() const { return m_ascent; }
 
-    SurfaceData* GetSurfaceFontData() const {return m_surfaceFontData;}
-    void SetSurfaceFontData(SurfaceData* data){m_surfaceFontData=data;}
+    SurfaceData* GetSurfaceFontData() const { return m_surfaceFontData; }
+    void SetSurfaceFontData(SurfaceData* data) { m_surfaceFontData=data; }
 
 private:
     int m_ascent;
@@ -847,10 +845,12 @@ bool SurfaceFontDataD2D::Initialised() const
 //----------------------------------------------------------------------
 // SurfaceDataD2D
 
-SurfaceDataD2D::SurfaceDataD2D(ScintillaWX* editor):m_editor(editor),
-    m_pD2DFactory(::wxD2D1Factory()), m_pDWriteFactory(::wxDWriteFactory())
+SurfaceDataD2D::SurfaceDataD2D(ScintillaWX* editor)
+    : m_editor(editor),
+      m_pD2DFactory(::wxD2D1Factory()),
+      m_pDWriteFactory(::wxDWriteFactory())
 {
-    if( Initialised() )
+    if ( Initialised() )
     {
         HRESULT hr =
             m_pDWriteFactory->CreateRenderingParams(&m_defaultRenderingParams);
@@ -1044,7 +1044,8 @@ private:
     FontID m_curFontID;
 };
 
-SurfaceD2D::SurfaceD2D():m_pDWriteFactory(::wxDWriteFactory())
+SurfaceD2D::SurfaceD2D()
+    : m_pDWriteFactory(::wxDWriteFactory())
 {
     m_unicodeMode = false;
     m_x = 0;
@@ -1068,7 +1069,7 @@ SurfaceD2D::~SurfaceD2D()
     Release();
 }
 
-void SurfaceD2D::Init(WindowID WXUNUSED(wid) )
+void SurfaceD2D::Init(WindowID WXUNUSED(wid))
 {
     Release();
 
@@ -1080,32 +1081,24 @@ void SurfaceD2D::Init(SurfaceID sid, WindowID wid)
 {
     Release();
 
-    wxDC* dc = static_cast<wxDC*>(sid);
-    wxStyledTextCtrl* stc(NULL);
-    ScintillaWX* sciwx(NULL);
     wxWindow* win = wxDynamicCast(wid,wxWindow);
-    wxSize sz = dc->GetSize();
-    RECT rc;
-    HRESULT hr;
-
     if ( win && win->GetName() == "wxSTCCallTip" )
-    {
-        stc = wxDynamicCast(win->GetParent(),wxStyledTextCtrl);
-    }
-    else
-    {
-        stc = wxDynamicCast(wid,wxStyledTextCtrl);
-    }
+        win = win->GetParent();
 
+    wxStyledTextCtrl* const stc = wxDynamicCast(wid, wxStyledTextCtrl);
     if ( stc )
     {
+        wxDC* const dc = static_cast<wxDC*>(sid);
+        const wxSize sz = dc->GetSize();
         SetScale(dc);
-        sciwx = reinterpret_cast<ScintillaWX*>(stc->GetDirectPointer());
+        ScintillaWX* const
+            sciwx = reinterpret_cast<ScintillaWX*>(stc->GetDirectPointer());
         m_surfaceData = static_cast<SurfaceDataD2D*>(sciwx->GetSurfaceData());
-        hr = m_surfaceData->CreateGraphicsResources();
+        HRESULT hr = m_surfaceData->CreateGraphicsResources();
 
         if ( SUCCEEDED(hr) )
         {
+            RECT rc;
             ::SetRect(&rc,0,0,sz.GetWidth(),sz.GetHeight());
             hr = m_surfaceData->GetRenderTarget()
                 ->BindDC(reinterpret_cast<HDC>(dc->GetHandle()),&rc);
diff --git a/src/stc/PlatWX.h b/src/stc/PlatWX.h
index a2a86da45b..3b051198c6 100644
--- a/src/stc/PlatWX.h
+++ b/src/stc/PlatWX.h
@@ -8,67 +8,67 @@ wxColour wxColourFromCD(const ColourDesired& ca);
 
 class SurfaceData
 {
-    public:
-        virtual ~SurfaceData(){}
+public:
+    virtual ~SurfaceData(){}
 };
 
 #if wxUSE_GRAPHICS_DIRECT2D
 
-#include <wx/msw/private/graphicsd2d.h>
-#include <wx/msw/private/comptr.h>
+#include "wx/msw/private/graphicsd2d.h"
+#include "wx/msw/private/comptr.h"
 
 class ScintillaWX;
 
 class SurfaceDataD2D: public SurfaceData
 {
-    public:
-        SurfaceDataD2D(ScintillaWX*);
-        bool Initialised() const;
-        void DiscardGraphicsResources();
-        HRESULT CreateGraphicsResources();
-        void SetEditorPaintAbandoned();
+public:
+    SurfaceDataD2D(ScintillaWX*);
+    bool Initialised() const;
+    void DiscardGraphicsResources();
+    HRESULT CreateGraphicsResources();
+    void SetEditorPaintAbandoned();
 
-        ID2D1DCRenderTarget* GetRenderTarget() const {return m_pRenderTarget.get();}
-        ID2D1SolidColorBrush* GetSolidBrush() const {return m_pSolidBrush.get();}
-        ID2D1BitmapBrush* GetPatternBrush() const {return m_pPatternBrush.get();}
-        IDWriteRenderingParams* GetDefaultRenderingParams() const
-            {return m_defaultRenderingParams;}
-        IDWriteRenderingParams* GetCustomClearTypeRenderingParams() const
-            {return m_customClearTypeRenderingParams;}
+    ID2D1DCRenderTarget* GetRenderTarget() const { return m_pRenderTarget.get(); }
+    ID2D1SolidColorBrush* GetSolidBrush() const { return m_pSolidBrush.get(); }
+    ID2D1BitmapBrush* GetPatternBrush() const { return m_pPatternBrush.get(); }
+    IDWriteRenderingParams* GetDefaultRenderingParams() const
+        { return m_defaultRenderingParams; }
+    IDWriteRenderingParams* GetCustomClearTypeRenderingParams() const
+        { return m_customClearTypeRenderingParams; }
 
-    private:
-        wxCOMPtr<ID2D1Factory> m_pD2DFactory;
-        wxCOMPtr<IDWriteFactory> m_pDWriteFactory;
-        wxCOMPtr<ID2D1DCRenderTarget> m_pRenderTarget;
-        wxCOMPtr<ID2D1SolidColorBrush> m_pSolidBrush;
-        wxCOMPtr<ID2D1BitmapBrush> m_pPatternBrush;
-        wxCOMPtr<IDWriteRenderingParams> m_defaultRenderingParams;
-        wxCOMPtr<IDWriteRenderingParams> m_customClearTypeRenderingParams;
+private:
+    wxCOMPtr<ID2D1Factory> m_pD2DFactory;
+    wxCOMPtr<IDWriteFactory> m_pDWriteFactory;
+    wxCOMPtr<ID2D1DCRenderTarget> m_pRenderTarget;
+    wxCOMPtr<ID2D1SolidColorBrush> m_pSolidBrush;
+    wxCOMPtr<ID2D1BitmapBrush> m_pPatternBrush;
+    wxCOMPtr<IDWriteRenderingParams> m_defaultRenderingParams;
+    wxCOMPtr<IDWriteRenderingParams> m_customClearTypeRenderingParams;
 
-        ScintillaWX* m_editor;
+    ScintillaWX* m_editor;
 };
 
 class SurfaceFontDataD2D: public SurfaceData
 {
-    public:
-        SurfaceFontDataD2D(const FontParameters& fp);
-        bool Initialised() const;
+public:
+    SurfaceFontDataD2D(const FontParameters& fp);
+    bool Initialised() const;
 
-        XYPOSITION GetAscent() const {return m_ascent;}
-        XYPOSITION GetDescent() const {return m_descent;}
-        XYPOSITION GetInternalLeading() const {return m_internalLeading;}
-        XYPOSITION GetAverageCharWidth() const {return m_averageCharWidth;}
+    XYPOSITION GetAscent() const { return m_ascent; }
+    XYPOSITION GetDescent() const { return m_descent; }
+    XYPOSITION GetInternalLeading() const { return m_internalLeading; }
+    XYPOSITION GetAverageCharWidth() const { return m_averageCharWidth; }
 
-        D2D1_TEXT_ANTIALIAS_MODE GetFontQuality() const {return m_aaMode;}
-        IDWriteTextFormat* GetFormat() const {return m_pTextFormat.get();}
+    D2D1_TEXT_ANTIALIAS_MODE GetFontQuality() const { return m_aaMode; }
+    IDWriteTextFormat* GetFormat() const { return m_pTextFormat.get(); }
 
-    private:
-        XYPOSITION m_ascent;
-        XYPOSITION m_descent;
-        XYPOSITION m_internalLeading;
-        XYPOSITION m_averageCharWidth;
-        D2D1_TEXT_ANTIALIAS_MODE m_aaMode;
-        wxCOMPtr<IDWriteTextFormat> m_pTextFormat;
+private:
+    XYPOSITION m_ascent;
+    XYPOSITION m_descent;
+    XYPOSITION m_internalLeading;
+    XYPOSITION m_averageCharWidth;
+    D2D1_TEXT_ANTIALIAS_MODE m_aaMode;
+    wxCOMPtr<IDWriteTextFormat> m_pTextFormat;
 };
 
 #endif // wxUSE_GRAPHICS_DIRECT2D

From 4e6763ccc2fdfbd81d6e9d069e904bb250c95a97 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 18:38:01 +0100
Subject: [PATCH 214/916] Fix harmless unused parameter warning in wxSTC code

The recently added "technology" parameter is unused when Direct2D is not
used, avoid compiler complains about this.
---
 src/stc/PlatWX.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 4dbe0e42f0..05002340fc 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -1858,6 +1858,8 @@ void SurfaceD2D::DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase,
 #endif // wxUSE_GRAPHICS_DIRECT2D
 
 Surface *Surface::Allocate(int technology) {
+    wxUnusedVar(technology);
+
 #if wxUSE_GRAPHICS_DIRECT2D
     if ( technology == wxSTC_TECHNOLOGY_DIRECTWRITE ) {
         return new SurfaceD2D;

From b1e59a6d60cc7ccd0f15445cfc00dcde3b0cb884 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 19:30:39 +0100
Subject: [PATCH 215/916] Add wxFloatingPointValidator::SetFactor()

This allows displaying values in percents (or also currency units and
subunits, for example) without changing the actually stored value.
---
 docs/changes.txt              |  1 +
 include/wx/valnum.h           | 12 +++++++++-
 interface/wx/valnum.h         | 13 ++++++++++
 samples/validate/validate.cpp | 45 +++++++++++++++++++++++++++++------
 samples/validate/validate.h   |  2 ++
 src/common/valnum.cpp         | 13 +++++++---
 6 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index c8e851886d..27f23deb7e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -175,6 +175,7 @@ All (GUI):
 - Add Scintilla FineTicker methods to wxSTC (NewPagodi).
 - Add wxFontPickerCtrl::SetMinPointSize() (Andreas Falkenhahn).
 - Add Set/GetFooter/Text/Icon() to wxRichMessageDialog (Tobias Taschner)
+- Add wxFloatingPointValidator::SetFactor().
 
 wxGTK:
 
diff --git a/include/wx/valnum.h b/include/wx/valnum.h
index 42f7675a76..3f9be1d99c 100644
--- a/include/wx/valnum.h
+++ b/include/wx/valnum.h
@@ -352,6 +352,11 @@ public:
     // supported by the type handled by the validator.
     void SetPrecision(unsigned precision) { m_precision = precision; }
 
+    // Set multiplier applied for displaying the value, e.g. 100 if the value
+    // should be displayed in percents, so that the variable containing 0.5
+    // would be displayed as 50.
+    void SetFactor(double factor) { m_factor = factor; }
+
 protected:
     // Notice that we can't use "long double" here because it's not supported
     // by wxNumberFormatter yet, so restrict ourselves to just double (and
@@ -361,12 +366,14 @@ protected:
     wxFloatingPointValidatorBase(int style)
         : wxNumValidatorBase(style)
     {
+        m_factor = 1.0;
     }
 
     wxFloatingPointValidatorBase(const wxFloatingPointValidatorBase& other)
         : wxNumValidatorBase(other)
     {
         m_precision = other.m_precision;
+        m_factor = other.m_factor;
 
         m_min = other.m_min;
         m_max = other.m_max;
@@ -374,7 +381,7 @@ protected:
 
     // Provide methods for wxNumValidator use.
     wxString ToString(LongestValueType value) const;
-    static bool FromString(const wxString& s, LongestValueType *value);
+    bool FromString(const wxString& s, LongestValueType *value) const;
 
     void DoSetMin(LongestValueType min) { m_min = min; }
     void DoSetMax(LongestValueType max) { m_max = max; }
@@ -391,6 +398,9 @@ private:
     // Maximum number of decimals digits after the decimal separator.
     unsigned m_precision;
 
+    // Factor applied for the displayed the value.
+    double m_factor;
+
     // Minimal and maximal values accepted (inclusive).
     LongestValueType m_min, m_max;
 
diff --git a/interface/wx/valnum.h b/interface/wx/valnum.h
index 7f65786821..8bb6d6346d 100644
--- a/interface/wx/valnum.h
+++ b/interface/wx/valnum.h
@@ -346,6 +346,19 @@ public:
         constructor.
      */
     void SetPrecision(unsigned precision);
+
+    /**
+        Set factor used for displaying the value.
+
+        The value associated with the validator is multiplied by the factor
+        before displaying it and divided by it when retrieving its value from
+        the control. By default, the @a factor is 1, so the actual value is not
+        affected by it, but it can be set to, for example, 100, to display the
+        value in percents while still storing it as absolute value.
+
+        @since 3.1.1
+     */
+    void SetFactor(double factor);
 };
 
 /**
diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 5ffc7f1af2..b5594fcf34 100644
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -64,7 +64,9 @@ MyData::MyData()
     m_string2 = "Valid text";
     m_listbox_choices.Add(0);
     m_intValue = 0;
+    m_smallIntValue = 3;
     m_doubleValue = 12354.31;
+    m_percentValue = 0.25;
 }
 
 // ----------------------------------------------------------------------------
@@ -219,7 +221,9 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event))
         m_listbox->Append(wxString(wxT("radiobox: ")) + g_radiobox_choices[g_data.m_radiobox_choice]);
 
         m_listbox->Append(wxString::Format("integer value: %d", g_data.m_intValue));
+        m_listbox->Append(wxString::Format("small int value: %u", g_data.m_smallIntValue));
         m_listbox->Append(wxString::Format("double value: %.3f", g_data.m_doubleValue));
+        m_listbox->Append(wxString::Format("percent value: %.4f", g_data.m_percentValue));
     }
 }
 
@@ -304,6 +308,11 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
     // setup a sizer with the controls for numeric validators
     // ------------------------------------------------------
 
+    wxFlexGridSizer* const
+        numSizer = new wxFlexGridSizer(5, FromDIP(wxSize(5, 5)));
+
+    const wxSizerFlags center = wxSizerFlags().CenterVertical();
+
     wxIntegerValidator<int> valInt(&g_data.m_intValue,
                                    wxNUM_VAL_THOUSANDS_SEPARATOR |
                                    wxNUM_VAL_ZERO_AS_BLANK);
@@ -319,8 +328,11 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
                                 wxTE_RIGHT,
                                 valInt
                             );
-    m_numericTextInt->SetToolTip("uses wxIntegerValidator to accept positive "
-                                 "integers only");
+    numSizer->Add(new wxStaticText(this, wxID_ANY, "Positive integer:"),
+                  center);
+    numSizer->Add(m_numericTextInt, wxSizerFlags(center).Expand());
+
+    numSizer->AddSpacer(FromDIP(10));
 
     m_numericTextDouble = new wxTextCtrl
                               (
@@ -338,12 +350,31 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
                                     wxNUM_VAL_NO_TRAILING_ZEROES
                                 )
                               );
-    m_numericTextDouble->SetToolTip("uses wxFloatingPointValidator with 3 decimals");
-    wxBoxSizer *numSizer = new wxBoxSizer( wxHORIZONTAL );
-    numSizer->Add( m_numericTextInt, 1, wxALL, 10 );
-    numSizer->Add( m_numericTextDouble, 1, wxALL, 10 );
+    numSizer->Add(new wxStaticText(this, wxID_ANY, "Up to 3 decimals:"),
+                  center);
+    numSizer->Add(m_numericTextDouble, wxSizerFlags(center).Expand());
 
+    wxIntegerValidator<unsigned short> smallIntVal(&g_data.m_smallIntValue);
+    smallIntVal.SetRange(1, 5);
+    numSizer->Add(new wxStaticText(this, wxID_ANY, "Int between 1 and 5:"),
+                  center);
+    numSizer->Add(new wxTextCtrl(this, wxID_ANY, "",
+                                 wxDefaultPosition, wxDefaultSize, wxTE_RIGHT,
+                                 smallIntVal),
+                  wxSizerFlags(center).Expand());
 
+    numSizer->AddSpacer(FromDIP(10));
+
+    wxFloatingPointValidator<float> percentVal(&g_data.m_percentValue);
+    percentVal.SetPrecision(2);
+    percentVal.SetFactor(100.0);
+
+    numSizer->Add(new wxStaticText(this, wxID_ANY, "Value displayed in %:"),
+                  center);
+    numSizer->Add(new wxTextCtrl(this, wxID_ANY, "",
+                                 wxDefaultPosition, wxDefaultSize, wxTE_RIGHT,
+                                 percentVal),
+                  wxSizerFlags(center).Expand());
 
     // setup the main sizer
     // --------------------
@@ -358,7 +389,7 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
                                     wxGenericValidator(&g_data.m_radiobox_choice)),
                    0, wxGROW | wxLEFT|wxBOTTOM|wxRIGHT, 10);
 
-    mainsizer->Add( numSizer, 0, wxGROW | wxALL );
+    mainsizer->Add( numSizer, wxSizerFlags().Expand().DoubleBorder() );
 
     mainsizer->Add(btn, 0, wxGROW | wxALL, 10);
 
diff --git a/samples/validate/validate.h b/samples/validate/validate.h
index 48a4ca5cf6..226f703ba3 100644
--- a/samples/validate/validate.h
+++ b/samples/validate/validate.h
@@ -76,7 +76,9 @@ public:
 
     // variables handled by wxNumericTextValidator
     int m_intValue;
+    unsigned short m_smallIntValue;
     double m_doubleValue;
+    float m_percentValue;
 
     bool m_checkbox_state;
     int m_radiobox_choice;
diff --git a/src/common/valnum.cpp b/src/common/valnum.cpp
index 4f11072b1c..c2522d1075 100644
--- a/src/common/valnum.cpp
+++ b/src/common/valnum.cpp
@@ -251,14 +251,21 @@ wxIntegerValidatorBase::IsCharOk(const wxString& val, int pos, wxChar ch) const
 
 wxString wxFloatingPointValidatorBase::ToString(LongestValueType value) const
 {
-    return wxNumberFormatter::ToString(value, m_precision, GetFormatFlags());
+    return wxNumberFormatter::ToString(value*m_factor,
+                                       m_precision,
+                                       GetFormatFlags());
 }
 
 bool
 wxFloatingPointValidatorBase::FromString(const wxString& s,
-                                         LongestValueType *value)
+                                         LongestValueType *value) const
 {
-    return wxNumberFormatter::FromString(s, value);
+    if ( !wxNumberFormatter::FromString(s, value) )
+        return false;
+
+    *value /= m_factor;
+
+    return true;
 }
 
 bool

From aaabe1cb1710f265e497019d52acaa7569bc76cc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Jan 2018 19:36:28 +0100
Subject: [PATCH 216/916] Improve validate sample UI a bit

Provide an accelerator for the menu command which contains all of the
test functionality to make it simpler to test it.

Also use CreateButtonSizer() instead of creating wxStdDialogButtonSizer
manually to make the code shorter and to also ensure that the "OK"
button is correctly set up as the default one, allowing to press "Enter"
in this dialog to accept the entry on any control, which didn't work
before.
---
 samples/validate/validate.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index b5594fcf34..36c8900440 100644
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -166,7 +166,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int
 
     wxMenu *file_menu = new wxMenu;
 
-    file_menu->Append(VALIDATE_TEST_DIALOG, wxT("&Test dialog..."), wxT("Demonstrate validators"));
+    file_menu->Append(VALIDATE_TEST_DIALOG, wxT("&Test dialog...\tCtrl-T"), wxT("Demonstrate validators"));
     file_menu->AppendCheckItem(VALIDATE_TOGGLE_BELL, wxT("&Bell on error"), wxT("Toggle bell on error"));
     file_menu->AppendSeparator();
     file_menu->Append(wxID_EXIT, wxT("E&xit"));
@@ -297,14 +297,6 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
     flexgridsizer->AddGrowableRow(1);
 
 
-    // setup the button sizer
-    // ----------------------
-
-    wxStdDialogButtonSizer *btn = new wxStdDialogButtonSizer();
-    btn->AddButton(new wxButton(this, wxID_OK));
-    btn->AddButton(new wxButton(this, wxID_CANCEL));
-    btn->Realize();
-
     // setup a sizer with the controls for numeric validators
     // ------------------------------------------------------
 
@@ -391,7 +383,8 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
 
     mainsizer->Add( numSizer, wxSizerFlags().Expand().DoubleBorder() );
 
-    mainsizer->Add(btn, 0, wxGROW | wxALL, 10);
+    mainsizer->Add(CreateButtonSizer(wxOK | wxCANCEL),
+                   wxSizerFlags().Expand().DoubleBorder());
 
     SetSizer(mainsizer);
     mainsizer->SetSizeHints(this);

From 7d6b44687f1511ef119c5a6e73d00ceb38faae41 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 26 Jan 2018 23:38:01 +0100
Subject: [PATCH 217/916] Fix monolithic build with USE_STC=0

Don't add STC-related sources to MONOLIB_GUI_SRC unconditionally, as
this broke linking when specifying USE_STC=0 on make command line.

Closes #17895.
---
 Makefile.in                    | 12 ++++++------
 build/bakefiles/monolithic.bkl |  8 +++++++-
 build/msw/makefile.bcc         | 20 ++++++++++++++------
 build/msw/makefile.gcc         | 20 ++++++++++++++------
 build/msw/makefile.vc          | 20 ++++++++++++++------
 5 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cbca768f71..6d29b0e0eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4456,9 +4456,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_richtextsymboldlg.o \
 	monodll_richtextxml.o \
 	monodll_xh_richtext.o \
-	monodll_stc.o \
-	monodll_PlatWX.o \
-	monodll_ScintillaWX.o
+	$(__MONOLIB_STC_SRC_OBJECTS)
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	$(__LOWLEVEL_SRC_OBJECTS) \
@@ -6296,6 +6294,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monodll_tabartgtk.o
 @COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS = \
 @COND_TOOLKIT_MSW@	monodll_tabartmsw.o monodll_barartmsw.o
+@COND_USE_STC_1@__MONOLIB_STC_SRC_OBJECTS = monodll_stc.o \
+@COND_USE_STC_1@	monodll_PlatWX.o monodll_ScintillaWX.o
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monodll_sound_sdl.o
 @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
@@ -6539,9 +6539,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_richtextsymboldlg.o \
 	monolib_richtextxml.o \
 	monolib_xh_richtext.o \
-	monolib_stc.o \
-	monolib_PlatWX.o \
-	monolib_ScintillaWX.o
+	$(__MONOLIB_STC_SRC_OBJECTS_1)
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	$(__LOWLEVEL_SRC_OBJECTS_2) \
@@ -8379,6 +8377,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monolib_tabartgtk.o
 @COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_MSW@	monolib_tabartmsw.o monolib_barartmsw.o
+@COND_USE_STC_1@__MONOLIB_STC_SRC_OBJECTS_1 = monolib_stc.o \
+@COND_USE_STC_1@	monolib_PlatWX.o monolib_ScintillaWX.o
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
 @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monolib_sound_sdl.o
 COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 22c14f6ce1..720e4f3f8f 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -1,11 +1,17 @@
 <?xml version="1.0" ?>
 <makefile>
 
+    <set var="MONOLIB_STC_SRC">
+        <if cond="USE_STC=='1'">
+            $(STC_SRC)
+        </if>
+    </set>
+
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
             $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
             $(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC)
-            $(RICHTEXT_SRC) $(STC_SRC)
+            $(RICHTEXT_SRC) $(MONOLIB_STC_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 6cccbb80d7..786e7b5711 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1786,9 +1786,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtextsymboldlg.obj \
 	$(OBJS)\monodll_richtextxml.obj \
 	$(OBJS)\monodll_xh_richtext.obj \
-	$(OBJS)\monodll_stc.obj \
-	$(OBJS)\monodll_PlatWX.obj \
-	$(OBJS)\monodll_ScintillaWX.obj
+	$(____MONOLIB_STC_SRC_FILENAMES_OBJECTS)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -2464,6 +2462,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_animateg.obj
 !endif
 !if "$(USE_STC)" == "1"
+____MONOLIB_STC_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_stc.obj \
+	$(OBJS)\monodll_PlatWX.obj \
+	$(OBJS)\monodll_ScintillaWX.obj
+!endif
+!if "$(USE_STC)" == "1"
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
@@ -2619,9 +2623,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtextsymboldlg.obj \
 	$(OBJS)\monolib_richtextxml.obj \
 	$(OBJS)\monolib_xh_richtext.obj \
-	$(OBJS)\monolib_stc.obj \
-	$(OBJS)\monolib_PlatWX.obj \
-	$(OBJS)\monolib_ScintillaWX.obj
+	$(____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -3296,6 +3298,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_joystick.obj \
 	$(OBJS)\monolib_animateg.obj
 !endif
+!if "$(USE_STC)" == "1"
+____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_stc.obj \
+	$(OBJS)\monolib_PlatWX.obj \
+	$(OBJS)\monolib_ScintillaWX.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
 	$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 2f6f1f2f0e..c7b3f16d74 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1811,9 +1811,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtextsymboldlg.o \
 	$(OBJS)\monodll_richtextxml.o \
 	$(OBJS)\monodll_xh_richtext.o \
-	$(OBJS)\monodll_stc.o \
-	$(OBJS)\monodll_PlatWX.o \
-	$(OBJS)\monodll_ScintillaWX.o
+	$(____MONOLIB_STC_SRC_FILENAMES_OBJECTS)
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
@@ -2493,6 +2491,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_animateg.o
 endif
 ifeq ($(USE_STC),1)
+____MONOLIB_STC_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_stc.o \
+	$(OBJS)\monodll_PlatWX.o \
+	$(OBJS)\monodll_ScintillaWX.o
+endif
+ifeq ($(USE_STC),1)
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 endif
 ifeq ($(MONOLITHIC),1)
@@ -2650,9 +2654,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtextsymboldlg.o \
 	$(OBJS)\monolib_richtextxml.o \
 	$(OBJS)\monolib_xh_richtext.o \
-	$(OBJS)\monolib_stc.o \
-	$(OBJS)\monolib_PlatWX.o \
-	$(OBJS)\monolib_ScintillaWX.o
+	$(____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS)
 endif
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
@@ -3331,6 +3333,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_joystick.o \
 	$(OBJS)\monolib_animateg.o
 endif
+ifeq ($(USE_STC),1)
+____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_stc.o \
+	$(OBJS)\monolib_PlatWX.o \
+	$(OBJS)\monolib_ScintillaWX.o
+endif
 ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 __basedll___depname = \
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 1e1acc8089..0f266fd231 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2091,9 +2091,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_richtextsymboldlg.obj \
 	$(OBJS)\monodll_richtextxml.obj \
 	$(OBJS)\monodll_xh_richtext.obj \
-	$(OBJS)\monodll_stc.obj \
-	$(OBJS)\monodll_PlatWX.obj \
-	$(OBJS)\monodll_ScintillaWX.obj
+	$(____MONOLIB_STC_SRC_FILENAMES_OBJECTS)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
@@ -2769,6 +2767,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_animateg.obj
 !endif
 !if "$(USE_STC)" == "1"
+____MONOLIB_STC_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_stc.obj \
+	$(OBJS)\monodll_PlatWX.obj \
+	$(OBJS)\monodll_ScintillaWX.obj
+!endif
+!if "$(USE_STC)" == "1"
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
@@ -2930,9 +2934,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_richtextsymboldlg.obj \
 	$(OBJS)\monolib_richtextxml.obj \
 	$(OBJS)\monolib_xh_richtext.obj \
-	$(OBJS)\monolib_stc.obj \
-	$(OBJS)\monolib_PlatWX.obj \
-	$(OBJS)\monolib_ScintillaWX.obj
+	$(____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
@@ -3607,6 +3609,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_joystick.obj \
 	$(OBJS)\monolib_animateg.obj
 !endif
+!if "$(USE_STC)" == "1"
+____MONOLIB_STC_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_stc.obj \
+	$(OBJS)\monolib_PlatWX.obj \
+	$(OBJS)\monolib_ScintillaWX.obj
+!endif
 !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
 	$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll

From 18983cf538275077b3e918b1a9a67a8ff0e7731b Mon Sep 17 00:00:00 2001
From: AliKet <aliket1435@gmail.com>
Date: Fri, 26 Jan 2018 23:43:33 +0100
Subject: [PATCH 218/916] Implement dynamic auto-completion for wxGTK

Make completion using custom wxTextCompleter work in wxGTK too.

Closes #18061.
---
 include/wx/gtk/textentry.h  |  15 +-
 samples/widgets/widgets.cpp |  38 ++++-
 src/gtk/textentry.cpp       | 326 +++++++++++++++++++++++++++++++++---
 3 files changed, 356 insertions(+), 23 deletions(-)

diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index 9f573d0bb4..674eab2ebd 100644
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -14,6 +14,8 @@ typedef struct _GdkEventKey GdkEventKey;
 typedef struct _GtkEditable GtkEditable;
 typedef struct _GtkEntry GtkEntry;
 
+class wxTextAutoCompleteData; // private class used only by wxTextEntry itself
+
 // ----------------------------------------------------------------------------
 // wxTextEntry: roughly corresponds to GtkEditable
 // ----------------------------------------------------------------------------
@@ -21,7 +23,8 @@ typedef struct _GtkEntry GtkEntry;
 class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
 {
 public:
-    wxTextEntry() { m_isUpperCase = false; }
+    wxTextEntry();
+    virtual ~wxTextEntry();
 
     // implement wxTextEntryBase pure virtual methods
     virtual void WriteText(const wxString& text) wxOVERRIDE;
@@ -76,6 +79,7 @@ protected:
     virtual wxPoint DoGetMargins() const wxOVERRIDE;
 
     virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE;
+    virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE;
 
     // Override the base class method to use GtkEntry IM context.
     virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
@@ -90,6 +94,15 @@ private:
     // implement this to return the associated GtkEntry
     virtual GtkEntry *GetEntry() const = 0;
 
+    wxTextAutoCompleteData *GetOrCreateCompleter();
+
+    // Various auto-completion-related stuff, only used if any of AutoComplete()
+    // methods are called. Use the function above to access it.
+    wxTextAutoCompleteData *m_autoCompleteData;
+
+    // It needs to call our GetEditable() method.
+    friend class wxTextAutoCompleteData;
+
     bool m_isUpperCase;
 };
 
diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 9cc7de5cec..ef66b725a6 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -46,6 +46,7 @@
 #include "wx/sizer.h"
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
+#include "wx/numdlg.h"
 #include "wx/textdlg.h"
 #include "wx/imaglist.h"
 #include "wx/wupdlock.h"
@@ -108,6 +109,7 @@ enum
     TextEntry_AutoCompleteFilenames,
     TextEntry_AutoCompleteDirectories,
     TextEntry_AutoCompleteCustom,
+    TextEntry_AutoCompleteKeyLength,
 
     TextEntry_SetHint,
     TextEntry_End
@@ -188,6 +190,7 @@ protected:
     void OnAutoCompleteFilenames(wxCommandEvent& event);
     void OnAutoCompleteDirectories(wxCommandEvent& event);
     void OnAutoCompleteCustom(wxCommandEvent& event);
+    void OnAutoCompleteKeyLength(wxCommandEvent& event);
 
     void OnSetHint(wxCommandEvent& event);
 
@@ -218,6 +221,9 @@ private:
     // the book containing the test pages
     WidgetsBookCtrl *m_book;
 
+    //
+    int m_prefixMinLength;
+
     // any class wishing to process wxWidgets events must use this macro
     wxDECLARE_EVENT_TABLE();
 };
@@ -317,6 +323,7 @@ wxBEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
     EVT_MENU(TextEntry_AutoCompleteFilenames, WidgetsFrame::OnAutoCompleteFilenames)
     EVT_MENU(TextEntry_AutoCompleteDirectories, WidgetsFrame::OnAutoCompleteDirectories)
     EVT_MENU(TextEntry_AutoCompleteCustom,    WidgetsFrame::OnAutoCompleteCustom)
+    EVT_MENU(TextEntry_AutoCompleteKeyLength, WidgetsFrame::OnAutoCompleteKeyLength)
 
     EVT_MENU(TextEntry_SetHint, WidgetsFrame::OnSetHint)
 
@@ -386,6 +393,8 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 #endif // USE_LOG
     m_book = NULL;
 
+    m_prefixMinLength = 1;
+
 #if wxUSE_MENUS
     // create the menubar
     wxMenuBar *mbar = new wxMenuBar;
@@ -444,6 +453,8 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
     menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteCustom,
                                    wxT("&Custom auto-completion"));
     menuTextEntry->AppendSeparator();
+    menuTextEntry->Append(TextEntry_AutoCompleteKeyLength,
+                          wxT("&Minimum key length for auto-completion"));
     menuTextEntry->Append(TextEntry_SetHint, "Set help &hint");
 
     mbar->Append(menuTextEntry, wxT("&Text"));
@@ -1038,6 +1049,8 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
     class CustomTextCompleter : public wxTextCompleterSimple
     {
     public:
+        CustomTextCompleter( int length ) : m_minLength( length ) {}
+
         virtual void GetCompletions(const wxString& prefix, wxArrayString& res) wxOVERRIDE
         {
             // This is used for illustrative purposes only and shows how many
@@ -1066,7 +1079,10 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
 
             // Normally it doesn't make sense to complete empty control, there
             // are too many choices and listing them all wouldn't be helpful.
-            if ( prefix.empty() )
+            // Or if we know in advance that a prefix with one or two characters
+            // would still results in too many choices too.
+            if ( prefix.empty() ||
+                 prefix.length() < static_cast<size_t>(m_minLength) )
                 return;
 
             // The only valid strings start with 3 digits so check for their
@@ -1117,9 +1133,11 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
                     res.push_back(prefix + c);
             }
         }
+
+        int m_minLength;
     };
 
-    if ( entry->AutoComplete(new CustomTextCompleter) )
+    if ( entry->AutoComplete( new CustomTextCompleter( m_prefixMinLength ) ) )
     {
         wxLogMessage("Enabled custom auto completer for \"NNN XX\" items "
                      "(where N is a digit and X is a letter).");
@@ -1130,6 +1148,22 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+void WidgetsFrame::OnAutoCompleteKeyLength(wxCommandEvent& WXUNUSED(event))
+{
+    const wxString message = "The auto-completion is triggered if and only if\n"
+                             "the length of the search key (prefix) is at least [LENGTH].\n"
+                             "Hint: negative values disable auto-completion.";
+    const wxString prompt = "Enter the minimum key length:";
+    const wxString caption = "Minimum key length";
+
+    m_prefixMinLength = wxGetNumberFromUser(message, prompt, caption, 1, -1, 100, this);
+
+    wxCommandEvent theEvent(wxEVT_MENU, TextEntry_AutoCompleteCustom);
+    ProcessEventLocally(theEvent);
+
+    wxLogMessage("The minimum key length for autocomplete is : %d.", m_prefixMinLength);
+}
+
 void WidgetsFrame::OnSetHint(wxCommandEvent& WXUNUSED(event))
 {
     wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 966d9b9153..a25c312529 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -25,9 +25,11 @@
 #if wxUSE_TEXTCTRL || wxUSE_COMBOBOX
 
 #ifndef WX_PRECOMP
+    #include "wx/event.h"
     #include "wx/textentry.h"
-    #include "wx/window.h"
     #include "wx/textctrl.h"
+    #include "wx/textcompleter.h"
+    #include "wx/window.h"
 #endif //WX_PRECOMP
 
 #include <gtk/gtk.h>
@@ -193,10 +195,268 @@ wx_gtk_paste_clipboard_callback( GtkWidget *widget, wxWindow *win )
 
 } // extern "C"
 
+// This class gathers the all auto-complete-related stuff we use. It is
+// allocated on demand by wxTextEntry when AutoComplete() is called.
+//
+// GTK already has completion functionality support for a GtkEntry via
+// GtkEntryCompletion. This class simply forwards to GtkListStore
+// in case we used ChangeStrings() overload. or to wxTextCompleter
+// associated with it otherwise.
+class wxTextAutoCompleteData
+{
+public:
+    // The constructor associates us with the given text entry.
+    wxEXPLICIT wxTextAutoCompleteData(wxTextEntry *entry)
+        : m_entry(entry)
+    {
+        m_completer = NULL;
+
+        m_isDynamicCompleter = false;
+
+        m_newCompletionsNeeded = m_entry->IsEmpty();
+
+        // this asserts if entry is multiline.
+        // because multiline is actually a GtkTextView not a GtkEntry.
+        // even GetEditable() will return NULL if entry is multiline.
+
+        wxCHECK_RET( GTK_IS_ENTRY(GetGtkEntry()),
+            "auto completion doesn't work with this control" );
+    }
+
+    ~wxTextAutoCompleteData()
+    {
+        delete m_completer;
+    }
+
+    // Must be called after creating this object to verify if initializing it
+    // succeeded.
+    bool IsOk() const
+    {
+        return GTK_IS_ENTRY( GetGtkEntry() );
+    }
+
+    void ChangeStrings(const wxArrayString& strings)
+    {
+        wxDELETE( m_completer );
+
+        DoUpdateCompleterType();
+
+        DoEnableCompletion();
+
+        GtkListStore * const store = gtk_list_store_new (1, G_TYPE_STRING);
+        GtkTreeIter iter;
+
+        for ( wxArrayString::const_iterator i = strings.begin();
+              i != strings.end();
+              ++i )
+        {
+            gtk_list_store_append (store, &iter);
+            gtk_list_store_set (store, &iter, 0, (const gchar *)i->utf8_str(), -1);
+        }
+
+        gtk_entry_completion_set_model (GetEntryCompletion(), GTK_TREE_MODEL(store));
+        g_object_unref (store);
+
+        DoRefresh();
+    }
+
+    // Takes ownership of the pointer if it is non-NULL.
+    bool ChangeCustomCompleter(wxTextCompleter *completer)
+    {
+        delete m_completer;
+        m_completer = completer;
+
+        if ( m_completer )
+        {
+            wxTextCompleterFixed* fixedCompl =
+                dynamic_cast<wxTextCompleterFixed*>(m_completer);
+
+            if ( fixedCompl )
+            {
+                wxArrayString completions;
+                fixedCompl->GetCompletions(wxEmptyString, completions);
+
+                ChangeStrings(completions);
+
+                wxDELETE(m_completer);
+                return true;
+            }
+
+            DoEnableCompletion();
+
+            DoUpdateCompletionModel();
+        }
+        else
+        {
+            DisableCompletion();
+        }
+
+        DoUpdateCompleterType();
+
+        return true;
+    }
+
+    void DisableCompletion()
+    {
+        gtk_entry_set_completion (GetGtkEntry(), NULL);
+
+        wxDELETE(m_completer);
+        DoUpdateCompleterType();
+    }
+
+private:
+
+    void DoEnableCompletion()
+    {
+        if ( !GetEntryCompletion() )
+        {
+            GtkEntryCompletion * const completion = gtk_entry_completion_new();
+
+            gtk_entry_completion_set_text_column (completion, 0);
+            gtk_entry_set_completion (GetGtkEntry(), completion);
+        }
+    }
+
+    // for a given prefix, if DoUpdateCompletionModel() succeeds,
+    // we won't do any further update of the model as long as we
+    // do not clear the textentry. but then we have to start over again.
+
+    void OnEntryChanged( wxCommandEvent& event )
+    {
+        if ( event.GetString().empty() )
+        {
+            m_newCompletionsNeeded = true;
+        }
+        else
+        {
+            if ( m_newCompletionsNeeded )
+                DoUpdateCompletionModel();
+        }
+
+        event.Skip();
+    }
+
+    void DoUpdateCompleterType()
+    {
+        const bool isDynamic = (m_completer != NULL);
+
+        if ( m_isDynamicCompleter == isDynamic )
+            // we already connected/disconnected to/from
+            // the event handler.
+            return;
+
+        m_isDynamicCompleter = isDynamic;
+
+        wxWindow * const win = m_entry->GetEditableWindow();
+
+        // Disconnect from the event handler if we request
+        // a non-dynamic behaviour of our completion methode
+        // (e.g. completions are supplied via
+        //       ChangeStrings() or wxTextCompleterFixed )
+        // Connect otherwise.
+        //
+        // The event handler role is to request from the m_completer
+        // to generate dynamically new completions (e.g from database)
+        // if a certain condition is met (e.g. textentry is cleared
+        // and/or typed in text length >= *MIN_PREFIX_LENGTH* )
+        //
+
+        if ( !m_completer )
+        {
+            win->Unbind(wxEVT_TEXT, &wxTextAutoCompleteData::OnEntryChanged, this);
+        }
+        else
+        {
+            win->Bind(wxEVT_TEXT, &wxTextAutoCompleteData::OnEntryChanged, this);
+        }
+    }
+
+    void DoRefresh()
+    {
+        gtk_entry_completion_complete (GetEntryCompletion());
+    }
+
+    void DoUpdateCompletionModel()
+    {
+        wxASSERT_MSG( m_completer, "m_completer should not be null." );
+
+        const wxString prefix = m_entry->GetValue();
+
+        if ( m_completer->Start(prefix) )
+        {
+            GtkListStore * const store = gtk_list_store_new (1, G_TYPE_STRING);
+            GtkTreeIter iter;
+
+            for (;;)
+            {
+                const wxString s = m_completer->GetNext();
+                if ( s.empty() )
+                    break;
+
+                gtk_list_store_append (store, &iter);
+                gtk_list_store_set (store, &iter, 0, (const gchar *)s.utf8_str(), -1);
+            }
+
+            gtk_entry_completion_set_model (GetEntryCompletion(), GTK_TREE_MODEL(store));
+            g_object_unref (store);
+
+            m_newCompletionsNeeded = false;
+        }
+        else
+        {
+            gtk_entry_completion_set_model (GetEntryCompletion(), NULL);
+        }
+
+        DoRefresh();
+    }
+
+
+    GtkEntry* GetGtkEntry() const { return m_entry->GetEntry(); }
+
+    GtkEntryCompletion* GetEntryCompletion() const
+    {
+        return gtk_entry_get_completion (GetGtkEntry());
+    }
+
+    // The text entry we're associated with.
+    wxTextEntry * const m_entry;
+
+    // Custom completer or NULL if none.
+    wxTextCompleter *m_completer;
+
+    // helps to decide if we should connect/disconnect
+    // to/from the event handler.
+    bool m_isDynamicCompleter;
+
+    // Each time we entered a new prefix, GtkEntryCompletion needs to be fed
+    // with new completions. And this flag lets as try to DoUpdateCompletionModel()
+    // and if it succeeds, it'll set the flag to false and OnEntryChanged()
+    // will not try to call it again unless we entered a new prefix.
+    bool m_newCompletionsNeeded;
+
+    wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteData);
+};
+
+
 // ============================================================================
 // wxTextEntry implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// initialization and destruction
+// ----------------------------------------------------------------------------
+
+wxTextEntry::wxTextEntry()
+{
+    m_autoCompleteData = NULL;
+    m_isUpperCase = false;
+}
+
+wxTextEntry::~wxTextEntry()
+{
+    delete m_autoCompleteData;
+}
+
 // ----------------------------------------------------------------------------
 // text operations
 // ----------------------------------------------------------------------------
@@ -409,32 +669,58 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // auto completion
 // ----------------------------------------------------------------------------
 
-bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
+wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter()
 {
-    GtkEntry* const entry = (GtkEntry*)GetEditable();
-    wxCHECK_MSG(GTK_IS_ENTRY(entry), false, "auto completion doesn't work with this control");
-
-    GtkListStore * const store = gtk_list_store_new(1, G_TYPE_STRING);
-    GtkTreeIter iter;
-
-    for ( wxArrayString::const_iterator i = choices.begin();
-          i != choices.end();
-          ++i )
+    if ( !m_autoCompleteData )
     {
-        gtk_list_store_append(store, &iter);
-        gtk_list_store_set(store, &iter,
-                           0, (const gchar *)i->utf8_str(),
-                           -1);
+        wxTextAutoCompleteData * const ac = new wxTextAutoCompleteData(this);
+        if ( ac->IsOk() )
+            m_autoCompleteData = ac;
+        else
+            delete ac;
     }
 
-    GtkEntryCompletion * const completion = gtk_entry_completion_new();
-    gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(store));
-    gtk_entry_completion_set_text_column(completion, 0);
-    gtk_entry_set_completion(entry, completion);
-    g_object_unref(completion);
+    return m_autoCompleteData;
+}
+
+bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
+{
+    wxTextAutoCompleteData * const ac = GetOrCreateCompleter();
+    if ( !ac )
+        return false;
+
+    ac->ChangeStrings(choices);
+
     return true;
 }
 
+bool wxTextEntry::DoAutoCompleteCustom(wxTextCompleter *completer)
+{
+    // First deal with the case when we just want to disable auto-completion.
+    if ( !completer )
+    {
+        if ( m_autoCompleteData )
+            m_autoCompleteData->DisableCompletion();
+        //else: Nothing to do, we hadn't used auto-completion even before.
+    }
+    else // Have a valid completer.
+    {
+        wxTextAutoCompleteData * const ac = GetOrCreateCompleter();
+        if ( !ac )
+        {
+            // Delete the custom completer for consistency with the case when
+            // we succeed to avoid memory leaks in user code.
+            delete completer;
+            return false;
+        }
+
+        // This gives ownership of the custom completer to m_autoCompleteData.
+        if ( !ac->ChangeCustomCompleter(completer) )
+            return false;
+    }
+
+    return true;
+}
 // ----------------------------------------------------------------------------
 // editable status
 // ----------------------------------------------------------------------------

From a8c19c7bd24db7939fbe6ea3409b62be67f84a99 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 00:15:24 +0100
Subject: [PATCH 219/916] Just improve some comments

Fix typos/wording in GTK autocompletion code comments.

No real changes.
---
 src/gtk/textentry.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index a25c312529..91b47840b6 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -200,8 +200,8 @@ wx_gtk_paste_clipboard_callback( GtkWidget *widget, wxWindow *win )
 //
 // GTK already has completion functionality support for a GtkEntry via
 // GtkEntryCompletion. This class simply forwards to GtkListStore
-// in case we used ChangeStrings() overload. or to wxTextCompleter
-// associated with it otherwise.
+// in case we used ChangeStrings() overload, or to wxTextCompleter
+// associated with it if ChangeCustomCompleter() was called.
 class wxTextAutoCompleteData
 {
 public:
@@ -350,7 +350,7 @@ private:
         wxWindow * const win = m_entry->GetEditableWindow();
 
         // Disconnect from the event handler if we request
-        // a non-dynamic behaviour of our completion methode
+        // a non-dynamic behaviour of our completion methods
         // (e.g. completions are supplied via
         //       ChangeStrings() or wxTextCompleterFixed )
         // Connect otherwise.
@@ -376,6 +376,9 @@ private:
         gtk_entry_completion_complete (GetEntryCompletion());
     }
 
+    // Recreate the model to contain all completions for the current prefix.
+    //
+    // This should only be called when using a custom completer.
     void DoUpdateCompletionModel()
     {
         wxASSERT_MSG( m_completer, "m_completer should not be null." );
@@ -428,8 +431,8 @@ private:
     // to/from the event handler.
     bool m_isDynamicCompleter;
 
-    // Each time we entered a new prefix, GtkEntryCompletion needs to be fed
-    // with new completions. And this flag lets as try to DoUpdateCompletionModel()
+    // Each time we enter a new prefix, GtkEntryCompletion needs to be fed with
+    // new completions. And this flag lets us try to DoUpdateCompletionModel()
     // and if it succeeds, it'll set the flag to false and OnEntryChanged()
     // will not try to call it again unless we entered a new prefix.
     bool m_newCompletionsNeeded;

From 8030bd727a79d0493e7a2870c661522a217ecb2d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 00:16:53 +0100
Subject: [PATCH 220/916] Refactor wxTextAutoCompleteData creation

Use factory function instead of ctor and IsOk() check, as this
simplifies the code using this class: if factory function fails, it can
just return NULL, which is what the caller used to do explicitly after
freeing the new object before.

Also don't assert if there is no associated GtkEntry, AutoComplete() is
supposed to just return false if using it with the given control is not
implemented under the current platform.
---
 src/gtk/textentry.cpp | 46 +++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 91b47840b6..c6e80cccc6 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -205,22 +205,17 @@ wx_gtk_paste_clipboard_callback( GtkWidget *widget, wxWindow *win )
 class wxTextAutoCompleteData
 {
 public:
-    // The constructor associates us with the given text entry.
-    wxEXPLICIT wxTextAutoCompleteData(wxTextEntry *entry)
-        : m_entry(entry)
+    // Factory function, may return NULL if entry is invalid.
+    static wxTextAutoCompleteData* New(wxTextEntry *entry)
     {
-        m_completer = NULL;
+        if ( !GTK_IS_ENTRY(entry->GetEntry()) )
+        {
+            // This is probably a multiline wxTextCtrl which doesn't have any
+            // associated GtkEntry.
+            return NULL;
+        }
 
-        m_isDynamicCompleter = false;
-
-        m_newCompletionsNeeded = m_entry->IsEmpty();
-
-        // this asserts if entry is multiline.
-        // because multiline is actually a GtkTextView not a GtkEntry.
-        // even GetEditable() will return NULL if entry is multiline.
-
-        wxCHECK_RET( GTK_IS_ENTRY(GetGtkEntry()),
-            "auto completion doesn't work with this control" );
+        return new wxTextAutoCompleteData(entry);
     }
 
     ~wxTextAutoCompleteData()
@@ -228,13 +223,6 @@ public:
         delete m_completer;
     }
 
-    // Must be called after creating this object to verify if initializing it
-    // succeeded.
-    bool IsOk() const
-    {
-        return GTK_IS_ENTRY( GetGtkEntry() );
-    }
-
     void ChangeStrings(const wxArrayString& strings)
     {
         wxDELETE( m_completer );
@@ -305,6 +293,16 @@ public:
     }
 
 private:
+    // Ctor is private, use New() to create objects of this type.
+    explicit wxTextAutoCompleteData(wxTextEntry *entry)
+        : m_entry(entry)
+    {
+        m_completer = NULL;
+
+        m_isDynamicCompleter = false;
+
+        m_newCompletionsNeeded = m_entry->IsEmpty();
+    }
 
     void DoEnableCompletion()
     {
@@ -676,11 +674,7 @@ wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter()
 {
     if ( !m_autoCompleteData )
     {
-        wxTextAutoCompleteData * const ac = new wxTextAutoCompleteData(this);
-        if ( ac->IsOk() )
-            m_autoCompleteData = ac;
-        else
-            delete ac;
+        m_autoCompleteData = wxTextAutoCompleteData::New(this);
     }
 
     return m_autoCompleteData;

From 9b9d13807707cf87dca76b2fddecb446d83d7e99 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 00:20:33 +0100
Subject: [PATCH 221/916] Factor out helper AppendToStore() function

Simple refactoring to avoid repeating the same not quite obvious code
for appending an item to GtkListStore twice.
---
 src/gtk/textentry.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index c6e80cccc6..8757540204 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -232,14 +232,12 @@ public:
         DoEnableCompletion();
 
         GtkListStore * const store = gtk_list_store_new (1, G_TYPE_STRING);
-        GtkTreeIter iter;
 
         for ( wxArrayString::const_iterator i = strings.begin();
               i != strings.end();
               ++i )
         {
-            gtk_list_store_append (store, &iter);
-            gtk_list_store_set (store, &iter, 0, (const gchar *)i->utf8_str(), -1);
+            AppendToStore(store, *i);
         }
 
         gtk_entry_completion_set_model (GetEntryCompletion(), GTK_TREE_MODEL(store));
@@ -304,6 +302,14 @@ private:
         m_newCompletionsNeeded = m_entry->IsEmpty();
     }
 
+    // Helper function for appending a string to GtkListStore.
+    void AppendToStore(GtkListStore* store, const wxString& s)
+    {
+        GtkTreeIter iter;
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter, 0, (const gchar *)s.utf8_str(), -1);
+    }
+
     void DoEnableCompletion()
     {
         if ( !GetEntryCompletion() )
@@ -386,7 +392,6 @@ private:
         if ( m_completer->Start(prefix) )
         {
             GtkListStore * const store = gtk_list_store_new (1, G_TYPE_STRING);
-            GtkTreeIter iter;
 
             for (;;)
             {
@@ -394,8 +399,7 @@ private:
                 if ( s.empty() )
                     break;
 
-                gtk_list_store_append (store, &iter);
-                gtk_list_store_set (store, &iter, 0, (const gchar *)s.utf8_str(), -1);
+                AppendToStore(store, s);
             }
 
             gtk_entry_completion_set_model (GetEntryCompletion(), GTK_TREE_MODEL(store));

From 6f229cdcdeed53d48128fded12d61461a4e00702 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 00:22:25 +0100
Subject: [PATCH 222/916] Replace DoRefresh() with UseModel() helper function

The new function both sets the new model and calls
gtk_entry_completion_complete() instead of always doing first the one
and then the other: if both calls needs to always be done together, it
makes sense to have a function doing both of them.
---
 src/gtk/textentry.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 8757540204..137fbde9fc 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -240,10 +240,8 @@ public:
             AppendToStore(store, *i);
         }
 
-        gtk_entry_completion_set_model (GetEntryCompletion(), GTK_TREE_MODEL(store));
+        UseModel(store);
         g_object_unref (store);
-
-        DoRefresh();
     }
 
     // Takes ownership of the pointer if it is non-NULL.
@@ -375,9 +373,12 @@ private:
         }
     }
 
-    void DoRefresh()
+    // Really change the completion model (which may be NULL).
+    void UseModel(GtkListStore* store)
     {
-        gtk_entry_completion_complete (GetEntryCompletion());
+        GtkEntryCompletion* const c = gtk_entry_get_completion (GetGtkEntry());
+        gtk_entry_completion_set_model (c, GTK_TREE_MODEL(store));
+        gtk_entry_completion_complete (c);
     }
 
     // Recreate the model to contain all completions for the current prefix.
@@ -402,17 +403,15 @@ private:
                 AppendToStore(store, s);
             }
 
-            gtk_entry_completion_set_model (GetEntryCompletion(), GTK_TREE_MODEL(store));
+            UseModel(store);
             g_object_unref (store);
 
             m_newCompletionsNeeded = false;
         }
         else
         {
-            gtk_entry_completion_set_model (GetEntryCompletion(), NULL);
+            UseModel(NULL);
         }
-
-        DoRefresh();
     }
 
 

From f354b0a1b5db7d6ab76990b54ce9baf19c701a49 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 00:23:59 +0100
Subject: [PATCH 223/916] Remove almost unused GetEntryCompletion() function

This function was now used only once and it's not really useful to have
a trivial wrapper around the corresponding GTK+ function, just use it
directly.
---
 src/gtk/textentry.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 137fbde9fc..1b7b003deb 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -310,7 +310,7 @@ private:
 
     void DoEnableCompletion()
     {
-        if ( !GetEntryCompletion() )
+        if ( !gtk_entry_get_completion (GetGtkEntry()) )
         {
             GtkEntryCompletion * const completion = gtk_entry_completion_new();
 
@@ -417,10 +417,6 @@ private:
 
     GtkEntry* GetGtkEntry() const { return m_entry->GetEntry(); }
 
-    GtkEntryCompletion* GetEntryCompletion() const
-    {
-        return gtk_entry_get_completion (GetGtkEntry());
-    }
 
     // The text entry we're associated with.
     wxTextEntry * const m_entry;

From 96308f0534294faeaad8fe915f743ca188f7714f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 00:24:58 +0100
Subject: [PATCH 224/916] Use wxGtkObject RAII wrapper for GtkListStore

Prefer RAII wrapper class to manual g_object_unref() calls.
---
 src/gtk/textentry.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 1b7b003deb..66c9c99516 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -35,6 +35,7 @@
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/object.h"
 #include "wx/gtk/private/string.h"
 
 //-----------------------------------------------------------------------------
@@ -231,7 +232,7 @@ public:
 
         DoEnableCompletion();
 
-        GtkListStore * const store = gtk_list_store_new (1, G_TYPE_STRING);
+        wxGtkObject<GtkListStore> store(gtk_list_store_new (1, G_TYPE_STRING));
 
         for ( wxArrayString::const_iterator i = strings.begin();
               i != strings.end();
@@ -241,7 +242,6 @@ public:
         }
 
         UseModel(store);
-        g_object_unref (store);
     }
 
     // Takes ownership of the pointer if it is non-NULL.
@@ -392,7 +392,7 @@ private:
 
         if ( m_completer->Start(prefix) )
         {
-            GtkListStore * const store = gtk_list_store_new (1, G_TYPE_STRING);
+            wxGtkObject<GtkListStore> store(gtk_list_store_new (1, G_TYPE_STRING));
 
             for (;;)
             {
@@ -404,7 +404,6 @@ private:
             }
 
             UseModel(store);
-            g_object_unref (store);
 
             m_newCompletionsNeeded = false;
         }

From d4c84ce7453217268f9dd325523fc9c90d649f2b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 00:27:21 +0100
Subject: [PATCH 225/916] Remove special check for wxTextCompleterFixed

There should be no need to handle this class specially and it's supposed
to be just an implementation detail, so don't add any dependencies on it
(if it's really important to optimize for this case, the check should be
done for wxTextCompleterSimple and use wxRTTI as wxWidgets still
supports being built without standard C++ RTTI).
---
 src/gtk/textentry.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 66c9c99516..efffa656d1 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -252,20 +252,6 @@ public:
 
         if ( m_completer )
         {
-            wxTextCompleterFixed* fixedCompl =
-                dynamic_cast<wxTextCompleterFixed*>(m_completer);
-
-            if ( fixedCompl )
-            {
-                wxArrayString completions;
-                fixedCompl->GetCompletions(wxEmptyString, completions);
-
-                ChangeStrings(completions);
-
-                wxDELETE(m_completer);
-                return true;
-            }
-
             DoEnableCompletion();
 
             DoUpdateCompletionModel();

From 02f2159aeade4eccd9d7dfecb0854e030d19ea83 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 01:07:18 +0100
Subject: [PATCH 226/916] Split wxTextAutoCompleteData in two subclasses

Doing two different things in the same class, using m_isDynamicCompleter
to determine which kind of completion is used, was not very clear, so
create two simple classes each of which does one and one thing only and
create the one we need in wxTextEntry methods.

Note that wxTextAutoCompleteDynamic can assume to always have a valid
wxTextCompleter as otherwise no wxTextAutoCompleteData is needed at all,
which results in more simplifications.

There should be no changes in behaviour.
---
 include/wx/gtk/textentry.h |   6 +-
 src/gtk/textentry.cpp      | 331 ++++++++++++++++++++-----------------
 2 files changed, 177 insertions(+), 160 deletions(-)

diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index 674eab2ebd..e55fad8d4c 100644
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -94,13 +94,11 @@ private:
     // implement this to return the associated GtkEntry
     virtual GtkEntry *GetEntry() const = 0;
 
-    wxTextAutoCompleteData *GetOrCreateCompleter();
-
     // Various auto-completion-related stuff, only used if any of AutoComplete()
-    // methods are called. Use the function above to access it.
+    // methods are called.
     wxTextAutoCompleteData *m_autoCompleteData;
 
-    // It needs to call our GetEditable() method.
+    // It needs to call our GetEntry() method.
     friend class wxTextAutoCompleteData;
 
     bool m_isUpperCase;
diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index efffa656d1..9f17072503 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -196,42 +196,97 @@ wx_gtk_paste_clipboard_callback( GtkWidget *widget, wxWindow *win )
 
 } // extern "C"
 
-// This class gathers the all auto-complete-related stuff we use. It is
-// allocated on demand by wxTextEntry when AutoComplete() is called.
-//
-// GTK already has completion functionality support for a GtkEntry via
-// GtkEntryCompletion. This class simply forwards to GtkListStore
-// in case we used ChangeStrings() overload, or to wxTextCompleter
-// associated with it if ChangeCustomCompleter() was called.
+// Base class for wxTextAutoCompleteFixed and wxTextAutoCompleteDynamic below.
 class wxTextAutoCompleteData
 {
+public:
+    // This method is only implemented by wxTextAutoCompleteFixed and will just
+    // return false for wxTextAutoCompleteDynamic.
+    virtual bool ChangeStrings(const wxArrayString& strings) = 0;
+
+    // Conversely, this one is only implemented for wxTextAutoCompleteDynamic
+    // and will just return false (without taking ownership of the argument!)
+    // for wxTextAutoCompleteFixed.
+    virtual bool ChangeCompleter(wxTextCompleter* completer) = 0;
+
+    void DisableCompletion()
+    {
+        gtk_entry_set_completion (GetGtkEntry(), NULL);
+    }
+
+    virtual ~wxTextAutoCompleteData()
+    {
+        // Do not call DisableCompletion() here, it would result in problems
+        // when this object is destroyed from wxTextEntry dtor as the real
+        // control (e.g. wxTextCtrl) is already destroyed by then.
+    }
+
+protected:
+    // Check if completion can be used with this entry.
+    static bool CanComplete(wxTextEntry* entry)
+    {
+        // If this check fails, this is probably a multiline wxTextCtrl which
+        // doesn't have any associated GtkEntry.
+        return GTK_IS_ENTRY(entry->GetEntry());
+    }
+
+    explicit wxTextAutoCompleteData(wxTextEntry* entry)
+        : m_entry(entry)
+    {
+        GtkEntryCompletion* const completion = gtk_entry_completion_new();
+
+        gtk_entry_completion_set_text_column (completion, 0);
+        gtk_entry_set_completion (GetGtkEntry(), completion);
+    }
+
+    // Provide access to wxTextEntry::GetEditableWindow() to the derived
+    // classes: we can call it because this class is a friend of wxTextEntry,
+    // but the derived classes can't do it directly.
+    static wxWindow* GetEditableWindow(wxTextEntry* entry)
+    {
+        return entry->GetEditableWindow();
+    }
+
+    GtkEntry* GetGtkEntry() const { return m_entry->GetEntry(); }
+
+    // Helper function for appending a string to GtkListStore.
+    void AppendToStore(GtkListStore* store, const wxString& s)
+    {
+        GtkTreeIter iter;
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter, 0, (const gchar *)s.utf8_str(), -1);
+    }
+
+    // Really change the completion model (which may be NULL).
+    void UseModel(GtkListStore* store)
+    {
+        GtkEntryCompletion* const c = gtk_entry_get_completion (GetGtkEntry());
+        gtk_entry_completion_set_model (c, GTK_TREE_MODEL(store));
+        gtk_entry_completion_complete (c);
+    }
+
+
+    // The text entry we're associated with.
+    wxTextEntry * const m_entry;
+
+    wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteData);
+};
+
+// This class simply forwards to GtkListStore.
+class wxTextAutoCompleteFixed : public wxTextAutoCompleteData
+{
 public:
     // Factory function, may return NULL if entry is invalid.
-    static wxTextAutoCompleteData* New(wxTextEntry *entry)
+    static wxTextAutoCompleteFixed* New(wxTextEntry *entry)
     {
-        if ( !GTK_IS_ENTRY(entry->GetEntry()) )
-        {
-            // This is probably a multiline wxTextCtrl which doesn't have any
-            // associated GtkEntry.
+        if ( !CanComplete(entry) )
             return NULL;
-        }
 
-        return new wxTextAutoCompleteData(entry);
+        return new wxTextAutoCompleteFixed(entry);
     }
 
-    ~wxTextAutoCompleteData()
+    virtual bool ChangeStrings(const wxArrayString& strings) wxOVERRIDE
     {
-        delete m_completer;
-    }
-
-    void ChangeStrings(const wxArrayString& strings)
-    {
-        wxDELETE( m_completer );
-
-        DoUpdateCompleterType();
-
-        DoEnableCompletion();
-
         wxGtkObject<GtkListStore> store(gtk_list_store_new (1, G_TYPE_STRING));
 
         for ( wxArrayString::const_iterator i = strings.begin();
@@ -242,67 +297,75 @@ public:
         }
 
         UseModel(store);
-    }
-
-    // Takes ownership of the pointer if it is non-NULL.
-    bool ChangeCustomCompleter(wxTextCompleter *completer)
-    {
-        delete m_completer;
-        m_completer = completer;
-
-        if ( m_completer )
-        {
-            DoEnableCompletion();
-
-            DoUpdateCompletionModel();
-        }
-        else
-        {
-            DisableCompletion();
-        }
-
-        DoUpdateCompleterType();
 
         return true;
     }
 
-    void DisableCompletion()
+    virtual bool ChangeCompleter(wxTextCompleter*) wxOVERRIDE
     {
-        gtk_entry_set_completion (GetGtkEntry(), NULL);
-
-        wxDELETE(m_completer);
-        DoUpdateCompleterType();
+        return false;
     }
 
 private:
     // Ctor is private, use New() to create objects of this type.
-    explicit wxTextAutoCompleteData(wxTextEntry *entry)
-        : m_entry(entry)
+    explicit wxTextAutoCompleteFixed(wxTextEntry *entry)
+        : wxTextAutoCompleteData(entry)
+    {
+    }
+
+    wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteFixed);
+};
+
+// Dynamic completion using the provided custom wxTextCompleter.
+class wxTextAutoCompleteDynamic : public wxTextAutoCompleteData
+{
+public:
+    static wxTextAutoCompleteDynamic* New(wxTextEntry *entry)
+    {
+        if ( !CanComplete(entry) )
+            return NULL;
+
+        wxWindow * const win = GetEditableWindow(entry);
+        if ( !win )
+            return NULL;
+
+        return new wxTextAutoCompleteDynamic(entry, win);
+    }
+
+    virtual ~wxTextAutoCompleteDynamic()
+    {
+        delete m_completer;
+
+        m_win->Unbind(wxEVT_TEXT, &wxTextAutoCompleteDynamic::OnEntryChanged, this);
+    }
+
+    virtual bool ChangeStrings(const wxArrayString&) wxOVERRIDE
+    {
+        return false;
+    }
+
+    // Takes ownership of the pointer which must be non-NULL.
+    virtual bool ChangeCompleter(wxTextCompleter *completer) wxOVERRIDE
+    {
+        delete m_completer;
+        m_completer = completer;
+
+        DoUpdateCompletionModel();
+
+        return true;
+    }
+
+private:
+    // Ctor is private, use New() to create objects of this type.
+    explicit wxTextAutoCompleteDynamic(wxTextEntry *entry, wxWindow *win)
+        : wxTextAutoCompleteData(entry),
+          m_win(win)
     {
         m_completer = NULL;
 
-        m_isDynamicCompleter = false;
-
         m_newCompletionsNeeded = m_entry->IsEmpty();
-    }
 
-    // Helper function for appending a string to GtkListStore.
-    void AppendToStore(GtkListStore* store, const wxString& s)
-    {
-        GtkTreeIter iter;
-        gtk_list_store_append (store, &iter);
-        gtk_list_store_set (store, &iter, 0, (const gchar *)s.utf8_str(), -1);
-    }
-
-    void DoEnableCompletion()
-    {
-        if ( !gtk_entry_get_completion (GetGtkEntry()) )
-        {
-            GtkEntryCompletion * const completion = gtk_entry_completion_new();
-
-            gtk_entry_completion_set_text_column (completion, 0);
-            gtk_entry_set_completion (GetGtkEntry(), completion);
-        }
+        win->Bind(wxEVT_TEXT, &wxTextAutoCompleteDynamic::OnEntryChanged, this);
     }
 
     // for a given prefix, if DoUpdateCompletionModel() succeeds,
@@ -324,57 +387,10 @@ private:
         event.Skip();
     }
 
-    void DoUpdateCompleterType()
-    {
-        const bool isDynamic = (m_completer != NULL);
-
-        if ( m_isDynamicCompleter == isDynamic )
-            // we already connected/disconnected to/from
-            // the event handler.
-            return;
-
-        m_isDynamicCompleter = isDynamic;
-
-        wxWindow * const win = m_entry->GetEditableWindow();
-
-        // Disconnect from the event handler if we request
-        // a non-dynamic behaviour of our completion methods
-        // (e.g. completions are supplied via
-        //       ChangeStrings() or wxTextCompleterFixed )
-        // Connect otherwise.
-        //
-        // The event handler role is to request from the m_completer
-        // to generate dynamically new completions (e.g from database)
-        // if a certain condition is met (e.g. textentry is cleared
-        // and/or typed in text length >= *MIN_PREFIX_LENGTH* )
-        //
-
-        if ( !m_completer )
-        {
-            win->Unbind(wxEVT_TEXT, &wxTextAutoCompleteData::OnEntryChanged, this);
-        }
-        else
-        {
-            win->Bind(wxEVT_TEXT, &wxTextAutoCompleteData::OnEntryChanged, this);
-        }
-    }
-
-    // Really change the completion model (which may be NULL).
-    void UseModel(GtkListStore* store)
-    {
-        GtkEntryCompletion* const c = gtk_entry_get_completion (GetGtkEntry());
-        gtk_entry_completion_set_model (c, GTK_TREE_MODEL(store));
-        gtk_entry_completion_complete (c);
-    }
-
     // Recreate the model to contain all completions for the current prefix.
-    //
-    // This should only be called when using a custom completer.
     void DoUpdateCompletionModel()
     {
-        wxASSERT_MSG( m_completer, "m_completer should not be null." );
-
-        const wxString prefix = m_entry->GetValue();
+        const wxString& prefix = m_entry->GetValue();
 
         if ( m_completer->Start(prefix) )
         {
@@ -400,18 +416,11 @@ private:
     }
 
 
-    GtkEntry* GetGtkEntry() const { return m_entry->GetEntry(); }
-
-
-    // The text entry we're associated with.
-    wxTextEntry * const m_entry;
-
-    // Custom completer or NULL if none.
+    // Custom completer.
     wxTextCompleter *m_completer;
 
-    // helps to decide if we should connect/disconnect
-    // to/from the event handler.
-    bool m_isDynamicCompleter;
+    // The associated window, we need to store it to unbind our event handler.
+    wxWindow* const m_win;
 
     // Each time we enter a new prefix, GtkEntryCompletion needs to be fed with
     // new completions. And this flag lets us try to DoUpdateCompletionModel()
@@ -419,7 +428,7 @@ private:
     // will not try to call it again unless we entered a new prefix.
     bool m_newCompletionsNeeded;
 
-    wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteData);
+    wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteDynamic);
 };
 
 
@@ -654,23 +663,21 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // auto completion
 // ----------------------------------------------------------------------------
 
-wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter()
-{
-    if ( !m_autoCompleteData )
-    {
-        m_autoCompleteData = wxTextAutoCompleteData::New(this);
-    }
-
-    return m_autoCompleteData;
-}
-
 bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
 {
-    wxTextAutoCompleteData * const ac = GetOrCreateCompleter();
-    if ( !ac )
-        return false;
+    // Try to update the existing data first.
+    if ( !m_autoCompleteData || !m_autoCompleteData->ChangeStrings(choices) )
+    {
+        // If it failed, try creating a new object for fixed completion.
+        wxTextAutoCompleteFixed* const ac = wxTextAutoCompleteFixed::New(this);
+        if ( !ac )
+            return false;
 
-    ac->ChangeStrings(choices);
+        ac->ChangeStrings(choices);
+
+        delete m_autoCompleteData;
+        m_autoCompleteData = ac;
+    }
 
     return true;
 }
@@ -681,23 +688,35 @@ bool wxTextEntry::DoAutoCompleteCustom(wxTextCompleter *completer)
     if ( !completer )
     {
         if ( m_autoCompleteData )
+        {
+            // This is not done in dtor because it's unnecessary when replacing
+            // one completer with another one, and even dangerous, when the
+            // control is being destroyed anyhow, so we need to call it
+            // explicitly here to really disable completion.
             m_autoCompleteData->DisableCompletion();
+
+            delete m_autoCompleteData;
+            m_autoCompleteData = NULL;
+        }
         //else: Nothing to do, we hadn't used auto-completion even before.
     }
     else // Have a valid completer.
     {
-        wxTextAutoCompleteData * const ac = GetOrCreateCompleter();
-        if ( !ac )
+        // As above, try to update the completer of the existing object first
+        // and fall back on creating a new one.
+        if ( !m_autoCompleteData ||
+                !m_autoCompleteData->ChangeCompleter(completer) )
         {
-            // Delete the custom completer for consistency with the case when
-            // we succeed to avoid memory leaks in user code.
-            delete completer;
-            return false;
-        }
+            wxTextAutoCompleteDynamic* const
+                ac = wxTextAutoCompleteDynamic::New(this);
+            if ( !ac )
+                return false;
 
-        // This gives ownership of the custom completer to m_autoCompleteData.
-        if ( !ac->ChangeCustomCompleter(completer) )
-            return false;
+            ac->ChangeCompleter(completer);
+
+            delete m_autoCompleteData;
+            m_autoCompleteData = ac;
+        }
     }
 
     return true;

From 456fdd8f932dfa4e3bb61ab24678ae229d457eec Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 01:18:21 +0100
Subject: [PATCH 227/916] Always update dynamic completions when the text
 changes

Don't do it only when the text entry is (or becomes again) empty, this
breaks dynamic completers such as the one used in the widgets sample,
which determines its completions depending on the already entered text
(of course, the sample example is not particularly useful, as the
completions are always the same, but it's supposed to show that they
could dynamically depend on the already entered part of the string).
---
 src/gtk/textentry.cpp | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 9f17072503..a65822ffea 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -363,26 +363,12 @@ private:
     {
         m_completer = NULL;
 
-        m_newCompletionsNeeded = m_entry->IsEmpty();
-
         win->Bind(wxEVT_TEXT, &wxTextAutoCompleteDynamic::OnEntryChanged, this);
     }
 
-    // for a given prefix, if DoUpdateCompletionModel() succeeds,
-    // we won't do any further update of the model as long as we
-    // do not clear the textentry. but then we have to start over again.
-
-    void OnEntryChanged( wxCommandEvent& event )
+    void OnEntryChanged(wxCommandEvent& event)
     {
-        if ( event.GetString().empty() )
-        {
-            m_newCompletionsNeeded = true;
-        }
-        else
-        {
-            if ( m_newCompletionsNeeded )
-                DoUpdateCompletionModel();
-        }
+        DoUpdateCompletionModel();
 
         event.Skip();
     }
@@ -406,8 +392,6 @@ private:
             }
 
             UseModel(store);
-
-            m_newCompletionsNeeded = false;
         }
         else
         {
@@ -422,12 +406,6 @@ private:
     // The associated window, we need to store it to unbind our event handler.
     wxWindow* const m_win;
 
-    // Each time we enter a new prefix, GtkEntryCompletion needs to be fed with
-    // new completions. And this flag lets us try to DoUpdateCompletionModel()
-    // and if it succeeds, it'll set the flag to false and OnEntryChanged()
-    // will not try to call it again unless we entered a new prefix.
-    bool m_newCompletionsNeeded;
-
     wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteDynamic);
 };
 

From ec2bb385ef2dbaf311c309abe8fdc41f04ce5bc3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 01:20:30 +0100
Subject: [PATCH 228/916] Remove platform limitations from AutoComplete()
 documentation

This method is now implemented for all major platforms.
---
 interface/wx/textentry.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/interface/wx/textentry.h b/interface/wx/textentry.h
index 618fde61d9..f580f86f1e 100644
--- a/interface/wx/textentry.h
+++ b/interface/wx/textentry.h
@@ -52,10 +52,6 @@ public:
         Call this function to enable auto-completion of the text typed in a
         single-line text control using the given @a choices.
 
-        Notice that currently this function is only implemented in wxGTK2,
-        wxMSW and wxOSX/Cocoa (for wxTextCtrl only, but not for wxComboBox)
-        ports and does nothing under the other platforms.
-
         @since 2.9.0
 
         @return
@@ -82,9 +78,6 @@ public:
         Notice that you need to include @c wx/textcompleter.h in order to
         define your class inheriting from wxTextCompleter.
 
-        Currently this method is only implemented in wxMSW and wxOSX/Cocoa (for
-        wxTextCtrl only, but not for wxComboBox).
-
         @since 2.9.2
 
         @param completer

From a14a3de5cebb07a52cc8ab3cd341826af630df47 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 01:35:47 +0100
Subject: [PATCH 229/916] Refactor min autocomplete length handling in widgets
 sample

Call DoUseCustomAutoComplete() function instead of using an artificial
event.

Also move the menu item in the radio group with the other
autocomplete-related commands as it's exclusive with them.
---
 samples/widgets/widgets.cpp | 46 ++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index ef66b725a6..8fa5ebb5fb 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -192,6 +192,8 @@ protected:
     void OnAutoCompleteCustom(wxCommandEvent& event);
     void OnAutoCompleteKeyLength(wxCommandEvent& event);
 
+    void DoUseCustomAutoComplete(size_t minLength = 1);
+
     void OnSetHint(wxCommandEvent& event);
 
     void OnUpdateTextUI(wxUpdateUIEvent& event)
@@ -221,9 +223,6 @@ private:
     // the book containing the test pages
     WidgetsBookCtrl *m_book;
 
-    //
-    int m_prefixMinLength;
-
     // any class wishing to process wxWidgets events must use this macro
     wxDECLARE_EVENT_TABLE();
 };
@@ -393,8 +392,6 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 #endif // USE_LOG
     m_book = NULL;
 
-    m_prefixMinLength = 1;
-
 #if wxUSE_MENUS
     // create the menubar
     wxMenuBar *mbar = new wxMenuBar;
@@ -452,9 +449,9 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
                                    wxT("&Directories names auto-completion"));
     menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteCustom,
                                    wxT("&Custom auto-completion"));
+    menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteKeyLength,
+                                   wxT("Custom with &min length"));
     menuTextEntry->AppendSeparator();
-    menuTextEntry->Append(TextEntry_AutoCompleteKeyLength,
-                          wxT("&Minimum key length for auto-completion"));
     menuTextEntry->Append(TextEntry_SetHint, "Set help &hint");
 
     mbar->Append(menuTextEntry, wxT("&Text"));
@@ -1036,6 +1033,11 @@ void WidgetsFrame::OnAutoCompleteDirectories(wxCommandEvent& WXUNUSED(event))
 }
 
 void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
+{
+    DoUseCustomAutoComplete();
+}
+
+void WidgetsFrame::DoUseCustomAutoComplete(size_t minLength)
 {
     wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
     wxCHECK_RET( entry, "menu item should be disabled" );
@@ -1049,7 +1051,10 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
     class CustomTextCompleter : public wxTextCompleterSimple
     {
     public:
-        CustomTextCompleter( int length ) : m_minLength( length ) {}
+        explicit CustomTextCompleter(size_t minLength)
+            : m_minLength(minLength)
+        {
+        }
 
         virtual void GetCompletions(const wxString& prefix, wxArrayString& res) wxOVERRIDE
         {
@@ -1077,12 +1082,10 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
             } logCompletions(prefix, res);
 
 
-            // Normally it doesn't make sense to complete empty control, there
-            // are too many choices and listing them all wouldn't be helpful.
-            // Or if we know in advance that a prefix with one or two characters
-            // would still results in too many choices too.
-            if ( prefix.empty() ||
-                 prefix.length() < static_cast<size_t>(m_minLength) )
+            // Wait for enough text to be entered before proposing completions:
+            // this is done to avoid proposing too many of them when the
+            // control is empty, for example.
+            if ( prefix.length() < m_minLength )
                 return;
 
             // The only valid strings start with 3 digits so check for their
@@ -1134,10 +1137,10 @@ void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
             }
         }
 
-        int m_minLength;
+        size_t m_minLength;
     };
 
-    if ( entry->AutoComplete( new CustomTextCompleter( m_prefixMinLength ) ) )
+    if ( entry->AutoComplete(new CustomTextCompleter(minLength)))
     {
         wxLogMessage("Enabled custom auto completer for \"NNN XX\" items "
                      "(where N is a digit and X is a letter).");
@@ -1152,16 +1155,17 @@ void WidgetsFrame::OnAutoCompleteKeyLength(wxCommandEvent& WXUNUSED(event))
 {
     const wxString message = "The auto-completion is triggered if and only if\n"
                              "the length of the search key (prefix) is at least [LENGTH].\n"
-                             "Hint: negative values disable auto-completion.";
+                             "Hint: 0 disables the length check completely.";
     const wxString prompt = "Enter the minimum key length:";
     const wxString caption = "Minimum key length";
 
-    m_prefixMinLength = wxGetNumberFromUser(message, prompt, caption, 1, -1, 100, this);
+    int res = wxGetNumberFromUser(message, prompt, caption, 1, 0, 100, this);
+    if ( res == -1 )
+        return;
 
-    wxCommandEvent theEvent(wxEVT_MENU, TextEntry_AutoCompleteCustom);
-    ProcessEventLocally(theEvent);
+    wxLogMessage("The minimum key length for autocomplete is %d.", res);
 
-    wxLogMessage("The minimum key length for autocomplete is : %d.", m_prefixMinLength);
+    DoUseCustomAutoComplete(static_cast<size_t>(res));
 }
 
 void WidgetsFrame::OnSetHint(wxCommandEvent& WXUNUSED(event))

From a6eb4c8e646697fa6ff5c5445d2d45bb335f8983 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 11:55:37 +0100
Subject: [PATCH 230/916] Fix Unix build when using precompiled headers

In a twist on the usual theme, the previous commits broke the Unix build
when _using_ PCH because wx/textcompleter.h was only included from
inside "#ifndef WX_PRECOMP" check, but it needs to be always included as
wx/wx.h doesn't include it.
---
 src/gtk/textentry.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index a65822ffea..84144d2289 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -28,10 +28,11 @@
     #include "wx/event.h"
     #include "wx/textentry.h"
     #include "wx/textctrl.h"
-    #include "wx/textcompleter.h"
     #include "wx/window.h"
 #endif //WX_PRECOMP
 
+#include "wx/textcompleter.h"
+
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/gtk2-compat.h"

From 264f93aad99664d5b022189e7b0a7aa2c68f16e1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 13:37:53 +0100
Subject: [PATCH 231/916] Fix harmless signed/unsigned comparison warning in
 wxSTC code

Cast int to size_t before comparing it with the wxString length.
---
 src/stc/PlatWX.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 05002340fc..22339fb672 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -1652,9 +1652,10 @@ void SurfaceD2D::MeasureWidths(Font &font_, const char *s, int len,
     }
     else
     {
+        const size_t buflen = static_cast<size_t>(len);
         // One character per position
-        PLATFORM_ASSERT(len == tbuf.Length());
-        for ( size_t kk=0; kk<static_cast<size_t>(len); kk++ )
+        PLATFORM_ASSERT(buflen == tbuf.Length());
+        for ( size_t kk=0; kk<buflen; kk++ )
         {
             positions[kk] = poses[kk];
         }

From 8ee3394e5e1d29d4beff8da430b8580b3ca548c6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 13:38:47 +0100
Subject: [PATCH 232/916] Declare wxSearchCtrl::{Set,Get}DescriptiveText() in
 the base class

Fix a trivial "TODO" remaining from 2.8 days and declare the functions
that are part of the public control API as pure virtuals in the base
class.

No real changes.
---
 include/wx/generic/srchctlg.h | 5 ++---
 include/wx/osx/srchctrl.h     | 5 ++---
 include/wx/srchctrl.h         | 3 +++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index a3d0ce86fe..ebcae90e78 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -61,9 +61,8 @@ public:
     virtual void ShowCancelButton( bool show ) wxOVERRIDE;
     virtual bool IsCancelButtonVisible() const wxOVERRIDE;
 
-    // TODO: In 2.9 these should probably be virtual, and declared in the base class...
-    void SetDescriptiveText(const wxString& text);
-    wxString GetDescriptiveText() const;
+    virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE;
+    virtual wxString GetDescriptiveText() const wxOVERRIDE;
 
     // accessors
     // ---------
diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h
index 4a4d88af47..2bef62b75e 100644
--- a/include/wx/osx/srchctrl.h
+++ b/include/wx/osx/srchctrl.h
@@ -54,9 +54,8 @@ public:
     virtual void ShowCancelButton( bool show ) wxOVERRIDE;
     virtual bool IsCancelButtonVisible() const wxOVERRIDE;
 
-    // TODO: In 2.9 these should probably be virtual, and declared in the base class...
-    void        SetDescriptiveText(const wxString& text);
-    wxString    GetDescriptiveText() const;
+    virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE;
+    virtual wxString GetDescriptiveText() const wxOVERRIDE;
 
     virtual bool    HandleSearchFieldSearchHit() ;
     virtual bool    HandleSearchFieldCancelHit() ;
diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index b28d3912d1..791fcb8092 100644
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -68,6 +68,9 @@ public:
     virtual void ShowCancelButton( bool show ) = 0;
     virtual bool IsCancelButtonVisible() const = 0;
 
+    virtual void SetDescriptiveText(const wxString& text) = 0;
+    virtual wxString GetDescriptiveText() const = 0;
+
 private:
     // implement wxTextEntry pure virtual method
     virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }

From 652b4eb8ed940f1a57e38d4b9d949b34e886d53d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 13:46:54 +0100
Subject: [PATCH 233/916] Add "hint" property to wxSearchCtrl XRC handler

This is similar to wxTextCtrl property of the same name and maps
naturally to wxSearchCtrl descriptive text attribute.
---
 docs/changes.txt                    | 1 +
 docs/doxygen/overviews/xrc_format.h | 3 +++
 src/xrc/xh_srchctrl.cpp             | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index 27f23deb7e..421f13d163 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -176,6 +176,7 @@ All (GUI):
 - Add wxFontPickerCtrl::SetMinPointSize() (Andreas Falkenhahn).
 - Add Set/GetFooter/Text/Icon() to wxRichMessageDialog (Tobias Taschner)
 - Add wxFloatingPointValidator::SetFactor().
+- Add "hint" property to wxSearchCtrl XRC handler.
 
 wxGTK:
 
diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 75a9f54815..92cea1ff7c 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -1950,6 +1950,9 @@ child and the second one for right/bottom child window.
 @hdr3col{property, type, description}
 @row3col{value, @ref overview_xrcformat_type_text,
     Initial value of the control (default: empty).}
+@row3col{hint, @ref overview_xrcformat_type_text,
+    Descriptive text shown in the empty control (default: "Search"). This
+    property is new since wxWidgets 3.1.1.}
 @endTable
 
 
diff --git a/src/xrc/xh_srchctrl.cpp b/src/xrc/xh_srchctrl.cpp
index dbaafdedde..122d38cfbc 100644
--- a/src/xrc/xh_srchctrl.cpp
+++ b/src/xrc/xh_srchctrl.cpp
@@ -49,6 +49,10 @@ wxObject *wxSearchCtrlXmlHandler::DoCreateResource()
 
     SetupWindow(ctrl);
 
+    const wxString& hint = GetText(wxS("hint"));
+    if ( !hint.empty() )
+        ctrl->SetDescriptiveText(hint);
+
     return ctrl;
 }
 

From 981697079739c4a920dc2d2cb261ca57dc2169f6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 14:01:58 +0100
Subject: [PATCH 234/916] Fix getting wxEVT_TEXT_ENTER from wxSearchCtrl

wxSearchCtrl never generated this event, at least under MSW, even though
the code to forward it from wxSearchTextCtrl was present in it, because
it was never generated in the first place without wxTE_PROCESS_ENTER.

Fix this by simply always using this style in wxSearchTextCtrl.
---
 src/generic/srchctlg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 9264d8def9..5ad5654fe4 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -49,7 +49,7 @@ class wxSearchTextCtrl : public wxTextCtrl
 public:
     wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style)
         : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
-                     (style & ~wxBORDER_MASK) | wxNO_BORDER)
+                     (style & ~wxBORDER_MASK) | wxNO_BORDER | wxTE_PROCESS_ENTER)
     {
         m_search = search;
 

From 44a089b295c557c1ffbbae6fd3c36504140e92b0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 15:49:46 +0100
Subject: [PATCH 235/916] Fix handling TAB in wxSearchCtrl in wxMSW

Check whether wxTextCtrl has focus using Win32 ::GetFocus() instead of
by comparing FindFocus() with "this" pointer, as the latter fails when
wxTextCtrl is part of a composite control, such as wxSearchCtrl.

This is enough to make pressing TAB in wxSearchCtrl correctly go to the
next control instead of just beeping.

Note that we could also use DoFindFocus() here, but this would be
needlessly less efficient as we don't really need to find wxWindow
corresponding to the focused HWND, as that function does. But we can't
use HasFocus() here as it wouldn't work correctly here when the focus is
on another sub-window of a composite control also containing this
wxTextCtrl.
---
 src/msw/textctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 2f7bc4d21a..686435b620 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2078,7 +2078,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             // forces at the moment unfortunately
             if ( !(m_windowStyle & wxTE_PROCESS_TAB))
             {
-                if ( FindFocus() == this )
+                if ( ::GetFocus() == GetHwnd() )
                 {
                     int flags = 0;
                     if (!event.ShiftDown())

From 160647aaf24f0d0e4d3605aaacbe4db476baf835 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 27 Jan 2018 18:58:13 +0100
Subject: [PATCH 236/916] Fix processing of pending events in mixed MFC/wx
 applications

ProcessPendingEvents() was never called when using MFC event loop,
meaning that queued events were never processed, so that using
CallAfter() didn't work.

Fix this and also ensure that these events are processed soon enough by
also implementing WakeUpIdle() for such applications, as wxWakeUpIdle()
didn't do anything neither for them.
---
 include/wx/msw/mfc.h | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/include/wx/msw/mfc.h b/include/wx/msw/mfc.h
index 830db351ac..f670b1b843 100644
--- a/include/wx/msw/mfc.h
+++ b/include/wx/msw/mfc.h
@@ -113,8 +113,13 @@ public:
     {
         BOOL moreIdle = BaseApp::OnIdle(lCount);
 
-        if ( wxTheApp && wxTheApp->ProcessIdle() )
-            moreIdle = TRUE;
+        if ( wxTheApp )
+        {
+            wxTheApp->ProcessPendingEvents();
+
+            if ( wxTheApp->ProcessIdle() )
+                moreIdle = TRUE;
+        }
 
         return moreIdle;
     }
@@ -172,6 +177,17 @@ public:
         // instead.
         ::PostQuitMessage(0);
     }
+
+    void WakeUpIdle() wxOVERRIDE
+    {
+        // As above, we can't wake up any wx event loop, so try to wake up the
+        // MFC one instead.
+        CWinApp* const mfcApp = AfxGetApp();
+        if ( mfcApp && mfcApp->m_pMainWnd )
+        {
+            ::PostMessage(mfcApp->m_pMainWnd->m_hWnd, WM_NULL, 0, 0);
+        }
+    }
 };
 
 #endif // _WX_MSW_MFC_H_

From 5017c6c8c236544b0ffa4aded6768a8b7d2e0959 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 27 Jan 2018 13:33:31 +0100
Subject: [PATCH 237/916] CMake: expat code in separate file

Consistent with other external libraries.
---
 build/cmake/lib/CMakeLists.txt     |  2 +-
 build/cmake/lib/expat.cmake        | 22 ++++++++++++++++++++++
 build/cmake/lib/xml/CMakeLists.txt | 12 ------------
 build/cmake/options.cmake          |  2 --
 4 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 build/cmake/lib/expat.cmake

diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index a676510ad7..45a7696d01 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -20,7 +20,7 @@ if(wxBUILD_MONOLITHIC)
 endif()
 
 # Define third party libraries
-set(LIBS_THIRDPARTY regex zlib)
+set(LIBS_THIRDPARTY regex zlib expat)
 if(wxUSE_GUI)
     list(APPEND LIBS_THIRDPARTY jpeg png tiff)
 endif()
diff --git a/build/cmake/lib/expat.cmake b/build/cmake/lib/expat.cmake
new file mode 100644
index 0000000000..630ce175d3
--- /dev/null
+++ b/build/cmake/lib/expat.cmake
@@ -0,0 +1,22 @@
+#############################################################################
+# Name:        build/cmake/lib/expat.cmake
+# Purpose:     Use external or internal expat lib
+# Author:      Tobias Taschner
+# Created:     2016-09-21
+# Copyright:   (c) 2016 wxWidgets development team
+# Licence:     wxWindows licence
+#############################################################################
+
+wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_APPLE sys)
+
+if(wxUSE_EXPAT STREQUAL "builtin")
+    wx_add_builtin_library(wxexpat
+        src/expat/expat/lib/xmlparse.c
+        src/expat/expat/lib/xmlrole.c
+        src/expat/expat/lib/xmltok.c
+    )
+    set(EXPAT_LIBRARIES wxexpat)
+    set(EXPAT_INCLUDE_DIRS ${wxSOURCE_DIR}/src/expat/expat/lib)
+elseif(wxUSE_EXPAT)
+    find_package(EXPAT REQUIRED)
+endif()
diff --git a/build/cmake/lib/xml/CMakeLists.txt b/build/cmake/lib/xml/CMakeLists.txt
index 4dfc9e4cc2..21173c5ad1 100644
--- a/build/cmake/lib/xml/CMakeLists.txt
+++ b/build/cmake/lib/xml/CMakeLists.txt
@@ -9,18 +9,6 @@
 
 include(../../source_groups.cmake)
 
-if(wxUSE_EXPAT STREQUAL "builtin")
-    wx_add_builtin_library(wxexpat
-        src/expat/expat/lib/xmlparse.c
-        src/expat/expat/lib/xmlrole.c
-        src/expat/expat/lib/xmltok.c
-    )
-    set(EXPAT_LIBRARIES wxexpat)
-    set(EXPAT_INCLUDE_DIRS ${wxSOURCE_DIR}/src/expat/expat/lib)
-elseif(wxUSE_EXPAT)
-    find_package(EXPAT)
-endif()
-
 wx_append_sources(XML_FILES XML)
 wx_add_library(xml IS_BASE ${XML_FILES})
 wx_lib_link_libraries(xml
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index fd0dab3cbe..10797d80cc 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -56,8 +56,6 @@ wx_option(wxUSE_VISIBILITY "use of ELF symbols visibility")
 # ---------------------------------------------------------------------------
 # external libraries
 # ---------------------------------------------------------------------------
-wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing"
-    DEFAULT_APPLE sys)
 
 wx_option(wxUSE_OPENGL "use OpenGL (or Mesa)")
 

From 90369e9632435e63c7f029e9022d3ca6b8dc929f Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 27 Jan 2018 13:39:45 +0100
Subject: [PATCH 238/916] CMake: fix building library with wxUSE_GUI 0

Actual toolkit should still be defined (e.g. WXMSW), before settings WXBASE.
Move Windows libraries outide toolkit so they are always linked to.
---
 build/cmake/functions.cmake | 27 +++++++++++++++++++++++++++
 build/cmake/toolkit.cmake   | 35 ++++++++---------------------------
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 87cd46ef36..a3809a6259 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -193,6 +193,33 @@ function(wx_set_target_properties target_name is_base)
         target_include_directories(${target_name}
             PUBLIC ${wxTOOLKIT_INCLUDE_DIRS})
     endif()
+
+    if (WXMSW)
+        set(WXMSW_LIBRARIES
+            kernel32
+            user32
+            gdi32
+            comdlg32
+            winspool
+            winmm
+            shell32
+            shlwapi
+            comctl32
+            ole32
+            oleaut32
+            uuid
+            rpcrt4
+            advapi32
+            version
+            wsock32
+            wininet
+            oleacc
+            uxtheme
+        )
+        target_link_libraries(${target_name}
+            PUBLIC ${WXMSW_LIBRARIES})
+    endif()
+
     if(wxTOOLKIT_LIBRARIES)
         target_link_libraries(${target_name}
             PUBLIC ${wxTOOLKIT_LIBRARIES})
diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake
index 49b798451d..edcf0ebe69 100644
--- a/build/cmake/toolkit.cmake
+++ b/build/cmake/toolkit.cmake
@@ -39,10 +39,6 @@ wx_option(wxBUILD_TOOLKIT "Toolkit used by wxWidgets" ${wxDEFAULT_TOOLKIT}
 # TODO: set to univ for universal build
 set(wxBUILD_WIDGETSET "")
 
-if(NOT wxUSE_GUI)
-    set(wxBUILD_TOOLKIT "base")
-endif()
-
 # Create shortcut variable for easy toolkit tests
 string(TOUPPER ${wxBUILD_TOOLKIT} toolkit_upper)
 set(WX${toolkit_upper} ON)
@@ -54,6 +50,13 @@ endif()
 
 set(wxTOOLKIT_DEFINITIONS __WX${toolkit_upper}__)
 
+if(NOT wxUSE_GUI)
+    set(wxBUILD_TOOLKIT "base")
+    string(TOUPPER ${wxBUILD_TOOLKIT} toolkit_upper)
+    set(WX${toolkit_upper} ON)
+    set(wxTOOLKIT_DEFINITIONS __WX${toolkit_upper}__)
+endif()
+
 # Initialize toolkit variables
 if(wxUSE_GUI)
 set(wxTOOLKIT_INCLUDE_DIRS)
@@ -66,29 +69,7 @@ if(UNIX AND NOT APPLE AND NOT WIN32)
     list(APPEND wxTOOLKIT_LIBRARIES ${X11_LIBRARIES})
 endif()
 
-if(WXMSW)
-    set(wxTOOLKIT_LIBRARIES
-        kernel32
-        user32
-        gdi32
-        comdlg32
-        winspool
-        winmm
-        shell32
-        shlwapi
-        comctl32
-        ole32
-        oleaut32
-        uuid
-        rpcrt4
-        advapi32
-        version
-        wsock32
-        wininet
-        oleacc
-        uxtheme
-        )
-elseif(WXGTK)
+if(WXGTK)
     if(WXGTK3)
         set(gtk_lib GTK3)
     elseif(WXGTK2)

From 4171f9b8080e28bde15036e21b28aebd13685a77 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 25 Jan 2018 19:21:42 +0100
Subject: [PATCH 239/916] Use parallel builds in Travis CI

Don't use it when building samples. It randomly results in build errors with 'file not recognized: File truncated'.
---
 build/tools/travis-ci.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh
index 3dfcc673a6..228e6d653b 100755
--- a/build/tools/travis-ci.sh
+++ b/build/tools/travis-ci.sh
@@ -4,6 +4,14 @@
 
 set -e
 
+wxPROC_COUNT=`getconf _NPROCESSORS_ONLN`
+((wxPROC_COUNT++))
+if [ "$wxTOOLSET" == "cmake" ] && [ "$wxCMAKE_GENERATOR" == "Xcode" ]; then
+    wxJOBS="-jobs $wxPROC_COUNT"
+else
+    wxJOBS="-j$wxPROC_COUNT"
+fi
+
 case $wxTOOLSET in
     cmake)
         if [ `uname -s` = "Linux" ] && [ `lsb_release -cs` = "precise" ]; then
@@ -22,7 +30,7 @@ case $wxTOOLSET in
         echo 'travis_fold:end:configure'
         echo 'travis_fold:start:building'
         echo 'Building...'
-        cmake --build .
+        cmake --build . -- $wxJOBS
         echo 'travis_fold:end:building'
         if [ "$wxCMAKE_TESTS" != "OFF" ]; then
             echo 'travis_fold:start:testing'
@@ -36,10 +44,10 @@ case $wxTOOLSET in
         ./configure --disable-optimise $wxCONFIGURE_FLAGS
         echo -en 'travis_fold:end:script.configure\\r'
         echo 'Building...' && echo -en 'travis_fold:start:script.build\\r'
-        make
+        make $wxJOBS
         echo -en 'travis_fold:end:script.build\\r'
         echo 'Building tests...' && echo -en 'travis_fold:start:script.tests\\r'
-        make -C tests
+        make -C tests $wxJOBS
         echo -en 'travis_fold:end:script.tests\\r'
         echo 'Testing...' && echo -en 'travis_fold:start:script.testing\\r'
         pushd tests && ./test && popd

From c341d72a92ffb512de56a8867bc72ba9fe10b0e0 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 25 Jan 2018 19:23:53 +0100
Subject: [PATCH 240/916] Remove downloading CppUnit and CMake in Travis CI

CppUnit has been replaced by Catch.
The Precise build environment is not used, so no need to download CMake for it.
---
 build/tools/before_install.sh | 2 --
 build/tools/travis-ci.sh      | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/build/tools/before_install.sh b/build/tools/before_install.sh
index 444683b503..83a8fed7b3 100755
--- a/build/tools/before_install.sh
+++ b/build/tools/before_install.sh
@@ -19,7 +19,5 @@ case $(uname -s) in
         ;;
 
     Darwin)
-        brew update
-        brew install cppunit --universal
         ;;
 esac
diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh
index 228e6d653b..be740109bc 100755
--- a/build/tools/travis-ci.sh
+++ b/build/tools/travis-ci.sh
@@ -14,12 +14,6 @@ fi
 
 case $wxTOOLSET in
     cmake)
-        if [ `uname -s` = "Linux" ] && [ `lsb_release -cs` = "precise" ]; then
-            echo Updating CMake...
-            wget -O - https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz | tar xzf -
-            export PATH=`pwd`/cmake-3.6.2-Linux-x86_64/bin:$PATH
-        fi
-
         if [ -z $wxCMAKE_TESTS ]; then wxCMAKE_TESTS=CONSOLE_ONLY; fi
         cmake --version
         echo 'travis_fold:start:configure'

From 4fcc6e15b07b78f54d9783b6d940d12ec4640627 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 28 Jan 2018 16:35:10 +0100
Subject: [PATCH 241/916] Use all available size for the video in mediaplayer
 sample

wxMediaCtrl doesn't compute its best size correctly until a video is
available and this resulted in using the best size of (0, 0) for it and
nothing being shown at all on the screen, even after starting to play a
video.

This is almost certainly a problem on its own, as there is some existing
code for updating the best size and redoing the layout of the parent
sizer when a new video is loaded, but for now just make the control
visible in the sample again by always expanding it to fill up all the
available size, as this is the smallest possible fix and this is how it
used to behave before, until 9aaa38c7c8f2c1cdd672e5b7fa757e591495c4cc,
which allowed to meaningfully use wxALIGN_CENTER_HORIZONTAL and wxEXPAND
together: until then, this didn't work at all, but the sample still used
wxALIGN_CENTER_HORIZONTAL by mistake, so just remove it now to restore
the original behaviour.

Closes #17917.
---
 samples/mediaplayer/mediaplayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index bdcb095f81..6293bde936 100644
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -1588,7 +1588,7 @@ wxMediaPlayerNotebookPage::wxMediaPlayerNotebookPage(wxMediaPlayerFrame* parentF
     wxASSERT_MSG(bOK, wxT("Could not create media control!"));
     wxUnusedVar(bOK);
 
-    sizer->Add(m_mediactrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5);
+    sizer->Add(m_mediactrl, wxSizerFlags().Expand().Border());
 
     //
     //  Create the playlist/listctrl

From 26997607b64d9eb138c401870ab41632d99f784b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 28 Jan 2018 19:04:42 +0100
Subject: [PATCH 242/916] Improve SetSizerAndFit() and Fit() documentation

Mention the difference between these two functions in Fit() description,
it could be expected to behave as SetSizerAndFit() but doesn't.

See #18003.
---
 interface/wx/window.h | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 672a6f94e9..1ddd6c345e 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -948,20 +948,13 @@ public:
     virtual wxSize WindowToClientSize(const wxSize& size) const;
 
     /**
-        Sizes the window so that it fits around its subwindows.
+        Sizes the window to fit its best size.
 
-        This function won't do anything if there are no subwindows and will only really
-        work correctly if sizers are used for the subwindows layout.
+        Using this function is equivalent to setting window size to the return
+        value of GetBestSize().
 
-        Also, if the window has exactly one subwindow it is better (faster and the result
-        is more precise as Fit() adds some margin to account for fuzziness of its calculations)
-        to call:
-
-        @code
-        window->SetClientSize(child->GetSize());
-        @endcode
-
-        instead of calling Fit().
+        Note that, unlike SetSizerAndFit(), this function only changes the
+        current window size and doesn't change its minimal size.
 
         @see @ref overview_windowsizing
     */
@@ -3336,10 +3329,15 @@ public:
     void SetSizer(wxSizer* sizer, bool deleteOld = true);
 
     /**
-        This method calls SetSizer() and then wxSizer::SetSizeHints which sets the initial
-        window size to the size needed to accommodate all sizer elements and sets the
-        size hints which, if this window is a top level one, prevent the user from
-        resizing it to be less than this minimal size.
+        Associate the sizer with the window and set the window size and minimal
+        size accordingly.
+
+        This method calls SetSizer() and then wxSizer::SetSizeHints() which
+        sets the initial window size to the size needed to accommodate all
+        sizer elements and sets the minimal size to the same size, this
+        preventing the user from resizing this window to be less than this
+        minimal size (if it's a top-level window which can be directly resized
+        by the user).
     */
     void SetSizerAndFit(wxSizer* sizer, bool deleteOld = true);
 

From e6b9b571ab59cb1d273d551f3ab6db8f82b47757 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 27 Jan 2018 14:28:23 +0100
Subject: [PATCH 243/916] CMake: fix and add more options

Don't overwrite options in setup.cmake.
Align text in summary message.

Always set wxUSE_XRC to values of wxUSE_XRC, same as in setup.h.
Disable wxUSE_XRC when expat is disabled.
---
 build/cmake/init.cmake    | 27 ++++++++-----------
 build/cmake/main.cmake    |  4 +--
 build/cmake/options.cmake | 55 ++++++++++++++++++++++++++++++---------
 build/cmake/setup.cmake   | 18 -------------
 4 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 689cc2c291..bb17e3fd85 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -119,18 +119,24 @@ set(wxUSE_STD_DEFAULT ON)
 if(wxUSE_UNICODE)
     set(wxUSE_WCHAR_T ON)
 endif()
-if(wxUSE_EXPAT)
-    set(wxUSE_XML ON)
-else()
-    set(wxUSE_XML OFF)
+if(NOT wxUSE_EXPAT)
+    set(wxUSE_XRC OFF)
 endif()
+set(wxUSE_XML ${wxUSE_XRC})
 if(wxUSE_CONFIG)
     set(wxUSE_CONFIG_NATIVE ON)
 endif()
 
 if(DEFINED wxUSE_OLE AND wxUSE_OLE)
     set(wxUSE_OLE_AUTOMATION ON)
-    set(wxUSE_ACTIVEX ON)
+endif()
+
+if(DEFINED wxUSE_GRAPHICS_DIRECT2D AND NOT wxUSE_GRAPHICS_CONTEXT)
+    set(wxUSE_GRAPHICS_DIRECT2D OFF)
+endif()
+
+if(wxUSE_OPENGL)
+    set(wxUSE_GLCANVAS ON)
 endif()
 
 if(wxUSE_THREADS)
@@ -138,22 +144,11 @@ if(wxUSE_THREADS)
 endif()
 
 if(wxUSE_GUI)
-    # Constants for GUI
-    set(wxUSE_COMMON_DIALOGS ON)
-
-    if(wxUSE_TASKBARICON)
-        set(wxUSE_TASKBARICON_BALLOONS ON)
-    endif()
-
     if(WIN32 AND wxUSE_METAFILE)
         # this one should probably be made separately configurable
         set(wxUSE_ENH_METAFILE ON)
     endif()
 
-    if(wxUSE_IMAGE)
-        set(wxUSE_WXDIB ON)
-    endif()
-
     if(wxUSE_OPENGL)
         find_package(OpenGL)
         if(NOT OPENGL_FOUND)
diff --git a/build/cmake/main.cmake b/build/cmake/main.cmake
index c9620bb051..79b633185f 100644
--- a/build/cmake/main.cmake
+++ b/build/cmake/main.cmake
@@ -67,9 +67,9 @@ wx_print_thirdparty_library_summary()
 
 message(STATUS "Configured wxWidgets ${wxVERSION} for ${CMAKE_SYSTEM}
     Min OS Version required at runtime:                ${wxREQUIRED_OS_DESC}
-    Which GUI toolkit should wxWidgets use?:           ${wxBUILD_TOOLKIT} ${wxTOOLKIT_VERSION}
+    Which GUI toolkit should wxWidgets use?            ${wxBUILD_TOOLKIT} ${wxTOOLKIT_VERSION}
     Should wxWidgets be compiled into single library?  ${wxBUILD_MONOLITHIC}
     Should wxWidgets be linked as a shared library?    ${wxBUILD_SHARED}
     Should wxWidgets support Unicode?                  ${wxUSE_UNICODE}
-    What level of wxWidgets compatibility should be enabled? ${wxBUILD_COMPATIBILITY}"
+    What wxWidgets compatibility level should be used? ${wxBUILD_COMPATIBILITY}"
     )
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index 10797d80cc..59dd8b4692 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -47,11 +47,13 @@ wx_dependent_option(wxUSE_STD_CONTAINERS "use standard C++ container classes" OF
 wx_option(wxUSE_UNICODE "compile with Unicode support (NOT RECOMMENDED to be turned off)")
 if(NOT WIN32)
     wx_option(wxUSE_UNICODE_UTF8 "use UTF-8 representation for strings (Unix only)" OFF)
-    wx_dependent_option(wxUSE_UNICODE_UTF8_LOCALE "only support UTF-8 locales in UTF-8 build (Unix only)" ON "wxUSE_UNICODE_UTF8" OFF)
+    wx_dependent_option(wxUSE_UTF8_LOCALE_ONLY "only support UTF-8 locales in UTF-8 build (Unix only)" ON "wxUSE_UNICODE_UTF8" OFF)
 endif()
 
 wx_option(wxUSE_COMPILER_TLS "enable use of compiler TLS support")
 wx_option(wxUSE_VISIBILITY "use of ELF symbols visibility")
+wx_option(wxUSE_UNSAFE_WXSTRING_CONV "provide unsafe implicit conversions in wxString to const char* or std::string")
+wx_option(wxUSE_REPRODUCIBLE_BUILD "enable reproducable build" OFF)
 
 # ---------------------------------------------------------------------------
 # external libraries
@@ -70,10 +72,6 @@ wx_option(wxUSE_INTL "use internationalization system")
 wx_option(wxUSE_XLOCALE "use x-locale support (requires wxLocale)")
 wx_option(wxUSE_CONFIG "use wxConfig (and derived) classes")
 
-wx_option(wxUSE_PROTOCOL "use wxProtocol and derived classes")
-wx_option(wxUSE_PROTOCOL_FTP "use wxFTP (requires wxProtocol")
-wx_option(wxUSE_PROTOCOL_HTTP "use wxHTTP (requires wxProtocol")
-wx_option(wxUSE_PROTOCOL_FILE "use wxFileProto class (requires wxProtocol")
 wx_option(wxUSE_SOCKETS "use socket/network classes")
 wx_option(wxUSE_IPV6 "enable IPv6 support in wxSocket")
 if(WIN32)
@@ -163,6 +161,7 @@ wx_option(wxUSE_MS_HTML_HELP "use MS HTML Help (win32)")
 wx_option(wxUSE_HTML "use wxHTML sub-library")
 wx_option(wxUSE_WXHTML_HELP "use wxHTML-based help")
 wx_option(wxUSE_XRC "use XRC resources sub-library")
+wx_option(wxUSE_XML "use the xml library (overruled by wxUSE_XRC)")
 wx_option(wxUSE_AUI "use AUI docking library")
 wx_option(wxUSE_PROPGRID "use wxPropertyGrid library")
 wx_option(wxUSE_RIBBON "use wxRibbon library")
@@ -170,16 +169,19 @@ wx_option(wxUSE_STC "use wxStyledTextCtrl library")
 wx_option(wxUSE_CONSTRAINTS "use layout-constraints system")
 wx_option(wxUSE_LOGGUI "use standard GUI logger")
 wx_option(wxUSE_LOGWINDOW "use wxLogWindow")
-wx_option(wxUSE_LOGDIALOG "use wxLogDialog")
+wx_option(wxUSE_LOG_DIALOG "use wxLogDialog")
 wx_option(wxUSE_MDI "use multiple document interface architecture")
 wx_option(wxUSE_MDI_ARCHITECTURE "use docview architecture with MDI")
 wx_option(wxUSE_MEDIACTRL "use wxMediaCtrl class")
 wx_option(wxUSE_RICHTEXT "use wxRichTextCtrl")
 wx_option(wxUSE_POSTSCRIPT "use wxPostscriptDC device context (default for gtk+)")
+wx_option(wxUSE_AFM_FOR_POSTSCRIPT "in wxPostScriptDC class use AFM (adobe font metrics) file for character widths")
 wx_option(wxUSE_PRINTING_ARCHITECTURE "use printing architecture")
 wx_option(wxUSE_SVG "use wxSVGFileDC device context")
-wx_option(wxUSE_WEBKIT "use wxWebKitCtrl (Mac-only, use wxWebView instead)")
 wx_option(wxUSE_WEBVIEW "use wxWebView library")
+if(APPLE)
+    wx_option(wxUSE_WEBKIT "use wxWebKitCtrl (Mac-only, use wxWebView instead)")
+endif()
 
 # wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
 # can't be disabled, don't even provide an option to do it
@@ -187,8 +189,18 @@ if(APPLE)
     set(wxUSE_GRAPHICS_CONTEXT ON)
 else()
     wx_option(wxUSE_GRAPHICS_CONTEXT "use graphics context 2D drawing API")
+    if (WIN32 AND (NOT MSVC OR MSVC_VERSION LESS 1600))
+        wx_option(wxUSE_GRAPHICS_DIRECT2D "enable Direct2D graphics context" OFF)
+    endif()
 endif()
 
+if(WXGTK)
+    set(wxUSE_CAIRO_DEFAULT ON)
+else()
+    set(wxUSE_CAIRO_DEFAULT OFF)
+endif()
+wx_option(wxUSE_CAIRO "enable Cairo graphics context" ${wxUSE_CAIRO_DEFAULT})
+
 # ---------------------------------------------------------------------------
 # IPC &c
 # ---------------------------------------------------------------------------
@@ -291,7 +303,7 @@ wx_option(wxUSE_TREELISTCTRL "use wxTreeListCtrl class")
 # common dialogs
 # ---------------------------------------------------------------------------
 
-wx_option(wxUSE_COMMONDLGS "use all common dialogs")
+wx_option(wxUSE_COMMON_DIALOGS "use all common dialogs")
 wx_option(wxUSE_ABOUTDLG "use wxAboutBox")
 wx_option(wxUSE_CHOICEDLG "use wxChoiceDialog")
 wx_option(wxUSE_COLOURDLG "use wxColourDialog")
@@ -323,11 +335,18 @@ wx_option(wxUSE_JOYSTICK "use wxJoystick")
 wx_option(wxUSE_METAFILE "use wxMetaFile")
 wx_option(wxUSE_DRAGIMAGE "use wxDragImage")
 if(WIN32)
-    wx_option(wxUSE_ACCESSIBILITY "enable accessibility support" ON)
+    wx_option(wxUSE_ACCESSIBILITY "enable accessibility support")
 endif()
 wx_option(wxUSE_UIACTIONSIMULATOR "use wxUIActionSimulator (experimental)")
 wx_option(wxUSE_DC_TRANSFORM_MATRIX "use wxDC::SetTransformMatrix and related")
 wx_option(wxUSE_WEBVIEW_WEBKIT "use wxWebView WebKit backend")
+# TODO: wxUSE_WEBVIEW_WEBKIT2
+if(WIN32 OR APPLE)
+    set(wxUSE_PRIVATE_FONTS_DEFAULT ON)
+else()
+    set(wxUSE_PRIVATE_FONTS_DEFAULT OFF)
+endif()
+wx_option(wxUSE_PRIVATE_FONTS "use fonts not installed on the system" ${wxUSE_PRIVATE_FONTS_DEFAULT})
 
 # ---------------------------------------------------------------------------
 # support for image formats that do not rely on external library
@@ -341,19 +360,31 @@ wx_option(wxUSE_TGA "use tga images (TGA file format)")
 wx_option(wxUSE_IFF "use iff images (IFF file format)")
 wx_option(wxUSE_PNM "use pnm images (PNM file format)")
 wx_option(wxUSE_XPM "use xpm images (XPM file format)")
-wx_option(wxUSE_ICO_CUR "_cur        use Windows ICO and CUR formats")
+wx_option(wxUSE_ICO_CUR "use Windows ICO and CUR formats")
 
 # ---------------------------------------------------------------------------
 # wxMSW-only options
 # ---------------------------------------------------------------------------
 
 if(WIN32)
+    wx_option(wxUSE_ACTIVEX " enable wxActiveXContainer class (Win32 only)")
+    wx_option(wxUSE_CRASHREPORT "enable wxCrashReport::Generate() to create mini dumps (Win32 only)")
     wx_option(wxUSE_DC_CACHEING "cache temporary wxDC objects (Win32 only)")
-    wx_option(wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW "use PS printing in wxMSW (Win32 only)")
+    wx_option(wxUSE_NATIVE_PROGRESSDLG "use native progress dialog implementation")
+    wx_option(wxUSE_NATIVE_STATUSBAR "use native statusbar implementation)")
     wx_option(wxUSE_OWNER_DRAWN "use owner drawn controls (Win32)")
+    wx_option(wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW "use PS printing in wxMSW (Win32 only)")
+    wx_option(wxUSE_TASKBARICON_BALLOONS "enable wxTaskBarIcon::ShowBalloon() method (Win32 only)")
     wx_option(wxUSE_UXTHEME "enable support for Windows XP themed look (Win32 only)")
-    wx_option(wxUSE_DIB "use wxDIB class (Win32 only)")
     wx_option(wxUSE_WEBVIEW_IE "use wxWebView IE backend (Win32 only)")
+    wx_option(wxUSE_WXDIB "use wxDIB class (Win32 only)")
+    if(MSVC_VERSION GREATER 1600 AND NOT CMAKE_VS_PLATFORM_TOOLSET MATCHES "_xp$")
+        set(wxUSE_WINRT_DEFAULT ON)
+    else()
+        set(wxUSE_WINRT_DEFAULT OFF)
+    endif()
+    wx_option(wxUSE_WINRT "enable WinRT support" ${wxUSE_WINRT_DEFAULT})
+    
 endif()
 
 # this one is not really MSW-specific but it exists mainly to be turned off
diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index a21a2449a8..2dd2de9262 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -471,24 +471,6 @@ endif() # CMAKE_USE_PTHREADS_INIT
 check_symbol_exists(localtime_r time.h HAVE_LOCALTIME_R)
 check_symbol_exists(gmtime_r time.h HAVE_GMTIME_R)
 
-if(WXMSW)
-    set(wxUSE_WEBVIEW_IE ON)
-elseif(WXGTK OR APPLE)
-    set(wxUSE_WEBVIEW_WEBKIT ON)
-endif()
-
-if(MSVC)
-    set(wxUSE_GRAPHICS_CONTEXT ON)
-endif()
-
-if(MSVC_VERSION GREATER 1600 AND NOT CMAKE_VS_PLATFORM_TOOLSET MATCHES "_xp$")
-    set(wxUSE_WINRT ON)
-endif()
-
-if(wxUSE_OPENGL)
-    set(wxUSE_GLCANVAS ON)
-endif()
-
 # ---------------------------------------------------------------------------
 # Checks for typedefs
 # ---------------------------------------------------------------------------

From 04b79788fc6f8b17134cf31dae47dd3a056e11aa Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Mon, 29 Jan 2018 00:12:27 +0100
Subject: [PATCH 244/916] CMake: declare third-party libraries in options

So the wxUSE_[lib] variables can be used in init.cmake.
---
 build/cmake/lib/expat.cmake | 2 --
 build/cmake/lib/jpeg.cmake  | 2 --
 build/cmake/lib/png.cmake   | 2 --
 build/cmake/lib/regex.cmake | 2 --
 build/cmake/lib/tiff.cmake  | 2 --
 build/cmake/lib/zlib.cmake  | 3 ---
 build/cmake/options.cmake   | 7 +++++++
 7 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/build/cmake/lib/expat.cmake b/build/cmake/lib/expat.cmake
index 630ce175d3..1d2b79b1fa 100644
--- a/build/cmake/lib/expat.cmake
+++ b/build/cmake/lib/expat.cmake
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################
 
-wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_APPLE sys)
-
 if(wxUSE_EXPAT STREQUAL "builtin")
     wx_add_builtin_library(wxexpat
         src/expat/expat/lib/xmlparse.c
diff --git a/build/cmake/lib/jpeg.cmake b/build/cmake/lib/jpeg.cmake
index d46c7fb6e9..77014944a7 100644
--- a/build/cmake/lib/jpeg.cmake
+++ b/build/cmake/lib/jpeg.cmake
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################
 
-wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)")
-
 if(wxUSE_LIBJPEG STREQUAL "builtin")
     wx_add_builtin_library(wxjpeg
         src/jpeg/jaricom.c
diff --git a/build/cmake/lib/png.cmake b/build/cmake/lib/png.cmake
index d0fe5b854a..9dd9fdcf3b 100644
--- a/build/cmake/lib/png.cmake
+++ b/build/cmake/lib/png.cmake
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################
 
-wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
-
 if(wxUSE_LIBPNG STREQUAL "builtin")
     wx_add_builtin_library(wxpng
             src/png/png.c
diff --git a/build/cmake/lib/regex.cmake b/build/cmake/lib/regex.cmake
index e2bc97c546..0478f5d42e 100644
--- a/build/cmake/lib/regex.cmake
+++ b/build/cmake/lib/regex.cmake
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################
 
-wx_add_thirdparty_library(wxUSE_REGEX REGEX "enable support for wxRegEx class" DEFAULT builtin)
-
 if(wxUSE_REGEX)
     # TODO: Forcing builtin until sys is implemented
     set(wxUSE_REGEX builtin)
diff --git a/build/cmake/lib/tiff.cmake b/build/cmake/lib/tiff.cmake
index 3cd5a664ac..d1ef8d51f6 100644
--- a/build/cmake/lib/tiff.cmake
+++ b/build/cmake/lib/tiff.cmake
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################
 
-wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
-
 if(wxUSE_LIBTIFF STREQUAL "builtin")
     # TODO: implement building libtiff via ExternalProject_Add()
     if(UNIX AND NOT APPLE)
diff --git a/build/cmake/lib/zlib.cmake b/build/cmake/lib/zlib.cmake
index c5687f2deb..0666e010ec 100644
--- a/build/cmake/lib/zlib.cmake
+++ b/build/cmake/lib/zlib.cmake
@@ -7,9 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################
 
-wx_add_thirdparty_library(wxUSE_ZLIB ZLIB "use zlib for LZW compression"
-    DEFAULT_APPLE sys)
-
 if(wxUSE_ZLIB STREQUAL "builtin")
     wx_add_builtin_library(wxzlib
         src/zlib/adler32.c
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index 59dd8b4692..5d1d9a606e 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -59,6 +59,13 @@ wx_option(wxUSE_REPRODUCIBLE_BUILD "enable reproducable build" OFF)
 # external libraries
 # ---------------------------------------------------------------------------
 
+wx_add_thirdparty_library(wxUSE_REGEX REGEX "enable support for wxRegEx class" DEFAULT builtin)
+wx_add_thirdparty_library(wxUSE_ZLIB ZLIB "use zlib for LZW compression" DEFAULT_APPLE sys)
+wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_APPLE sys)
+wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)")
+wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
+wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
+
 wx_option(wxUSE_OPENGL "use OpenGL (or Mesa)")
 
 if(NOT WIN32)

From 6a2c4abcc111d67282388a2a0686ea82f47d4b21 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 28 Jan 2018 20:32:39 +0100
Subject: [PATCH 245/916] Define missing GUIDs for Direct2D in MinGW

The GUIDs are copied from wincodec.h in Windows SDK 10.0.16299.0.
Fixed another build error in code that is normally disabled.
---
 src/msw/graphicsd2d.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index 22306f9169..e7e41f6830 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -225,6 +225,17 @@ DEFINE_GUID(wxIID_IDWriteFactory,
 DEFINE_GUID(wxIID_IWICBitmapSource,
             0x00000120, 0xa8f2, 0x4877, 0xba, 0x0a, 0xfd, 0x2b, 0x66, 0x45, 0xfb, 0x94);
 
+DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA,
+            0x6fddc324, 0x4e03, 0x4bfe, 0xb1, 0x85, 0x3d, 0x77, 0x76, 0x8d, 0xc9, 0x10);
+
+DEFINE_GUID(GUID_WICPixelFormat32bppBGR,
+            0x6fddc324, 0x4e03, 0x4bfe, 0xb1, 0x85, 0x3d, 0x77, 0x76, 0x8d, 0xc9, 0x0e);
+
+#ifndef CLSID_WICImagingFactory
+DEFINE_GUID(CLSID_WICImagingFactory,
+            0xcacaf262, 0x9370, 0x4615, 0xa1, 0x3b, 0x9f, 0x55, 0x39, 0xda, 0x4c, 0xa);
+#endif
+
 // Implementation of the Direct2D functions
 HRESULT WINAPI wxD2D1CreateFactory(
     D2D1_FACTORY_TYPE factoryType,
@@ -3028,7 +3039,7 @@ public:
         wxCHECK_HRESULT_RET(hr);
     }
 
-    void DrawBitmap(ID2D1Image* image, D2D1_POINT_2F offset,
+    void DrawBitmap(ID2D1Bitmap* image, D2D1_POINT_2F offset,
         D2D1_RECT_F imageRectangle, wxInterpolationQuality interpolationQuality,
         wxCompositionMode compositionMode) wxOVERRIDE
     {

From 5bc208df3ce9124419cb12a05cd7c5bba6a88db2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 28 Jan 2018 17:50:51 +0100
Subject: [PATCH 246/916] Correct UTF-8 encoding of U+FFFF

Overlong (and hence invalid) 4-byte encoding was used for this character
instead of the correct 3-byte 0xEF 0xBF 0xBF sequence.

Fix this by using 3 bytes for the code points up to 0xFFFF included,
instead of excluding it as was done before.

Closes #17920.
---
 docs/changes.txt            |  1 +
 src/common/strconv.cpp      |  2 +-
 src/common/ustring.cpp      |  2 +-
 tests/mbconv/mbconvtest.cpp | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 42f60e8942..c6f30d83bc 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -108,6 +108,7 @@ All:
 - Update all bundled 3rd party libraries to their latest versions.
 - Use unique prefix for all zlib symbols to avoid link conflicts.
 - Make wxFile::ReadAll() work for unseekable files too.
+- Correct UTF-8 encoding of U+FFFF (axiom).
 
 All (GUI):
 
diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index dcdf7ba76d..88f22fe95d 100644
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -1135,7 +1135,7 @@ wxMBConvStrictUTF8::FromWChar(char *dst, size_t dstLen,
                 out[0] = 0xC0 | code;
             }
         }
-        else if ( code < 0xFFFF )
+        else if ( code <= 0xFFFF )
         {
             len = 3;
             if ( out )
diff --git a/src/common/ustring.cpp b/src/common/ustring.cpp
index 87d5158234..6e1768064b 100644
--- a/src/common/ustring.cpp
+++ b/src/common/ustring.cpp
@@ -431,7 +431,7 @@ wxScopedCharBuffer wxUString::utf8_str() const
         {
             utf8_length += 2;
         }
-        else if ( code < 0xFFFF )
+        else if ( code <= 0xFFFF )
         {
             utf8_length += 3;
         }
diff --git a/tests/mbconv/mbconvtest.cpp b/tests/mbconv/mbconvtest.cpp
index 7edee7bdd6..ae192bf0a4 100644
--- a/tests/mbconv/mbconvtest.cpp
+++ b/tests/mbconv/mbconvtest.cpp
@@ -474,6 +474,20 @@ void MBConvTestCase::UTF8Tests()
     const wchar_t wc = 0xd800;
     CPPUNIT_ASSERT_EQUAL(wxCONV_FAILED, wxConvUTF8.FromWChar(NULL, 0, &wc, 1));
 #endif // SIZEOF_WCHAR_T == 2
+
+    SECTION("UTF-8-FFFF")
+    {
+        const wchar_t wcFFFF = 0xFFFF;
+        REQUIRE(wxConvUTF8.FromWChar(NULL, 0, &wcFFFF, 1) == 3);
+
+        char buf[4];
+        buf[3] = '\0';
+        REQUIRE(wxConvUTF8.FromWChar(buf, 3, &wcFFFF, 1) == 3);
+
+        CHECK(static_cast<unsigned char>(buf[0]) == 0xef);
+        CHECK(static_cast<unsigned char>(buf[1]) == 0xbf);
+        CHECK(static_cast<unsigned char>(buf[2]) == 0xbf);
+    }
 }
 
 void MBConvTestCase::UTF16LETests()

From a3f56e186909291558ebb81fe45d4ef09b1d6c9f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 28 Jan 2018 17:35:31 +0100
Subject: [PATCH 247/916] Update libtiff to the latest version

This is more of a test as the security vulnerability (CVE-2017-9935)
fixed in the upstream doesn't affect our use of the library, but still
update it to check if we can do this as easily as by just merging the
new upstream version into our submodule.
---
 src/tiff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tiff b/src/tiff
index 3c7e58ef64..aa65abe076 160000
--- a/src/tiff
+++ b/src/tiff
@@ -1 +1 @@
-Subproject commit 3c7e58ef646090569de1a35cdc93abce2c547172
+Subproject commit aa65abe0762209d40ec5d4343ec426a4d67caf2d

From 84c3bc123ed30d5dde210e0463f605a7f08e89ad Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 28 Jan 2018 22:19:46 -0800
Subject: [PATCH 248/916] Prevent widgets from drawing outside their allocation
 with GTK+3

See #18043
---
 src/gtk/window.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 50973fcf02..9abbfbf99c 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -41,6 +41,7 @@
 #include <gdk/gdkkeysyms.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/gtk3-compat.h"
 #include "wx/gtk/private/event.h"
 #include "wx/gtk/private/win_gtk.h"
 #include "wx/private/textmeasure.h"
@@ -2191,10 +2192,19 @@ gtk_window_realized_callback(GtkWidget* WXUNUSED(widget), wxWindowGTK* win)
 //-----------------------------------------------------------------------------
 
 static void
-size_allocate(GtkWidget*, GtkAllocation* alloc, wxWindow* win)
+size_allocate(GtkWidget* WXUNUSED_IN_GTK2(widget), GtkAllocation* alloc, wxWindow* win)
 {
     int w = alloc->width;
     int h = alloc->height;
+#if GTK_CHECK_VERSION(3,14,0)
+    if (wx_is_at_least_gtk3(14))
+    {
+        GtkAllocation clip;
+        gtk_widget_get_clip(widget, &clip);
+        if (clip.width > w || clip.height > h)
+            gtk_widget_set_clip(widget, alloc);
+    }
+#endif
     if (win->m_wxwindow)
     {
         GtkBorder border;

From 72790218cb10e402a5774e87889cb6763c087c73 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 15:36:21 +0100
Subject: [PATCH 249/916] Fix wrongly restoring clipping region in wxDCClipper

The change of 2a8c290e0de5e657f22a0c13817df65688b01345 was wrong as it
unconditionally restored m_oldClipRect in dtor, even when it was empty,
indicating that no clipping had been in effect when wxDCClipper was
constructed. This totally broke all the code using wxDCClipper, notably
generic wxListCtrl which wasn't repainted correctly at all.

Fix this by checking if the clipping rectangle is not empty before
restoring it, this should work as well as we can make it without having
GetClippingRegion() that could return an invalid region if no clipping
is in effect.

See #13834.

Closes #18066.
---
 include/wx/dc.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index dadbe793a3..38edf9da5f 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1454,7 +1454,8 @@ public:
     ~wxDCClipper()
     {
         m_dc.DestroyClippingRegion();
-        m_dc.SetClippingRegion(m_oldClipRect);
+        if ( !m_oldClipRect.IsEmpty() )
+            m_dc.SetClippingRegion(m_oldClipRect);
     }
 
 private:

From 21823bd37a02f601f879039b3971ca2e7fc99516 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 18:29:34 +0100
Subject: [PATCH 250/916] Log focus messages for the search control in the
 widgets sample

This makes it easier to test various issues related to focus events for
composite controls, such as wxSearchCtrl.
---
 samples/widgets/searchctrl.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 23750f7a46..7586ffef10 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -86,6 +86,9 @@ protected:
     void OnSearch(wxCommandEvent& event);
     void OnSearchCancel(wxCommandEvent& event);
 
+    void OnSetFocus(wxFocusEvent& event);
+    void OnKillFocus(wxFocusEvent& event);
+
     wxMenu* CreateTestMenu();
 
     // (re)create the control
@@ -171,6 +174,9 @@ void SearchCtrlWidgetsPage::CreateControl()
 
     m_srchCtrl = new wxSearchCtrl(this, -1, wxEmptyString, wxDefaultPosition,
                                   wxSize(150, -1), style);
+
+    m_srchCtrl->Bind(wxEVT_SET_FOCUS, &SearchCtrlWidgetsPage::OnSetFocus, this);
+    m_srchCtrl->Bind(wxEVT_KILL_FOCUS, &SearchCtrlWidgetsPage::OnKillFocus, this);
 }
 
 void SearchCtrlWidgetsPage::RecreateWidget()
@@ -239,4 +245,18 @@ void SearchCtrlWidgetsPage::OnSearchCancel(wxCommandEvent& event)
     event.Skip();
 }
 
+void SearchCtrlWidgetsPage::OnSetFocus(wxFocusEvent& event)
+{
+    wxLogMessage("Search control got focus");
+
+    event.Skip();
+}
+
+void SearchCtrlWidgetsPage::OnKillFocus(wxFocusEvent& event)
+{
+    wxLogMessage("Search control lost focus");
+
+    event.Skip();
+}
+
 #endif  //  wxUSE_SEARCHCTRL

From 3b40ff0d4135076ef7811a98687e14c7b21cd1a4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 18:32:54 +0100
Subject: [PATCH 251/916] Send wxEVT_SET_FOCUS for composite window when a
 child gets focus

wxCompositeWindow already connected to child wxEVT_KILL_FOCUS events and
generated the same event for the composite window itself, but didn't do
it for wxEVT_SET_FOCUS, resulting in not getting these events for the
main window as expected. E.g. this resulted in never getting any
wxEVT_SET_FOCUS events for wxSearchCtrl when using its generic version
(i.e. not under Mac).

Fix this by connecting to wxEVT_SET_FOCUS events for the children too.
Note that this relies on having a correct "previously focused window" in
these events, if this doesn't work reliably for some ports, we might
need to maintain a "bool m_hasFocus" field in wxCompositeWindow itself
instead.

Also note that we might avoid having all this code in wxCompositeWindow
if we translated the underlying native focus event to wxFocusEvents for
both the real window and its GetMainWindowOfCompositeControl() if it's
different. This could potentially be simpler and would definitely be
more efficient, but would require more changes.

Closes #15569.
---
 include/wx/compositewin.h | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h
index 567d0e8999..c9a339ac44 100644
--- a/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@ -193,7 +193,10 @@ private:
         if ( child == this )
             return; // not a child, we don't want to Connect() to ourselves
 
-        // Always capture wxEVT_KILL_FOCUS:
+        child->Connect(wxEVT_SET_FOCUS,
+                       wxFocusEventHandler(wxCompositeWindow::OnSetFocus),
+                       NULL, this);
+
         child->Connect(wxEVT_KILL_FOCUS,
                        wxFocusEventHandler(wxCompositeWindow::OnKillFocus),
                        NULL, this);
@@ -221,6 +224,27 @@ private:
             event.Skip();
     }
 
+    void OnSetFocus(wxFocusEvent& event)
+    {
+        event.Skip();
+
+        // When a child of a composite window gains focus, the entire composite
+        // focus gains focus as well -- unless it had it already.
+        //
+        // We suppose that we hadn't had focus if the event doesn't carry the
+        // previously focused window as it normally means that it comes from
+        // outside of this program.
+        wxWindow* const oldFocus = event.GetWindow();
+        if ( !oldFocus || oldFocus->GetMainWindowOfCompositeControl() != this )
+        {
+            wxFocusEvent eventThis(wxEVT_SET_FOCUS, this->GetId());
+            eventThis.SetEventObject(this);
+            eventThis.SetWindow(event.GetWindow());
+
+            this->ProcessWindowEvent(eventThis);
+        }
+    }
+
     void OnKillFocus(wxFocusEvent& event)
     {
         // Ignore focus changes within the composite control:

From 99dea2e2e06d6ccab88f7766cbf9d4dd89523458 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 18:45:45 +0100
Subject: [PATCH 252/916] Remove unnecessary wxSearchCtrl::OnSetFocus()

This was useless as wxCompositeWindow, from which the generic
wxSearchCtrl derives, already sets focus to its first child and, since
the last commit, even harmful as it now resulted in calls to SetFocus()
from inside wxEVT_SET_FOCUS handler which is forbidden at least under
MSW.

See #15569.
---
 include/wx/generic/srchctlg.h | 1 -
 src/generic/srchctlg.cpp      | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index ebcae90e78..67d0c99ca2 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -223,7 +223,6 @@ protected:
 
     void OnCancelButton( wxCommandEvent& event );
 
-    void OnSetFocus( wxFocusEvent& event );
     void OnSize( wxSizeEvent& event );
 
     bool HasMenu() const
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 5ad5654fe4..01acd68ea9 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -241,7 +241,6 @@ wxEND_EVENT_TABLE()
 
 wxBEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
     EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, wxSearchCtrl::OnCancelButton)
-    EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus)
     EVT_SIZE(wxSearchCtrl::OnSize)
 wxEND_EVENT_TABLE()
 
@@ -1235,14 +1234,6 @@ void wxSearchCtrl::OnCancelButton( wxCommandEvent& event )
     event.Skip();
 }
 
-void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )
-{
-    if ( m_text )
-    {
-        m_text->SetFocus();
-    }
-}
-
 void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) )
 {
     LayoutControls();

From e1481385c506c084ecfa09c48e67be1b998b2b41 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Mon, 29 Jan 2018 09:49:51 -0800
Subject: [PATCH 253/916] Avoid use of uninitialized point size in wxFontInfo

See #18070
---
 include/wx/font.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/wx/font.h b/include/wx/font.h
index 27935bac55..e1a07a2e01 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -209,10 +209,9 @@ public:
     // Default copy ctor, assignment operator and dtor are OK.
 
 private:
-    // Common part of all ctor, initializing everything except the size (which
-    // is initialized by the ctors themselves).
     void Init()
     {
+        m_pointSize = -1;
         m_family = wxFONTFAMILY_DEFAULT;
         m_flags = wxFONTFLAG_DEFAULT;
         m_encoding = wxFONTENCODING_DEFAULT;

From 05ebeb6bac8df809cc65f7de1e6960b04c22676d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 19:04:47 +0100
Subject: [PATCH 254/916] Get rid of CppUnit compatibility macros in
 wxSearchCtrl unit test

No real changes, just remove all the CppUnit machinery not needed any
longer and replace it with a simple test function.
---
 tests/controls/searchctrltest.cpp | 53 +++++++++++--------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/tests/controls/searchctrltest.cpp b/tests/controls/searchctrltest.cpp
index a9bfb68103..2c8e5b821b 100644
--- a/tests/controls/searchctrltest.cpp
+++ b/tests/controls/searchctrltest.cpp
@@ -20,50 +20,33 @@
 
 #include "wx/srchctrl.h"
 
-class SearchCtrlTestCase : public CppUnit::TestCase
+class SearchCtrlTestCase
 {
 public:
-    SearchCtrlTestCase() { }
+    SearchCtrlTestCase()
+        : m_search(new wxSearchCtrl(wxTheApp->GetTopWindow(), wxID_ANY))
+    {
+    }
 
-    virtual void setUp();
-    virtual void tearDown();
+    ~SearchCtrlTestCase()
+    {
+        delete m_search;
+    }
 
-private:
-    CPPUNIT_TEST_SUITE( SearchCtrlTestCase );
-        CPPUNIT_TEST( Focus );
-    CPPUNIT_TEST_SUITE_END();
-
-    void Focus();
-
-    wxSearchCtrl* m_search;
-
-    wxDECLARE_NO_COPY_CLASS(SearchCtrlTestCase);
+protected:
+    wxSearchCtrl* const m_search;
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( SearchCtrlTestCase );
+#define SEARCH_CTRL_TEST_CASE(name, tags) \
+    TEST_CASE_METHOD(SearchCtrlTestCase, name, tags)
 
-// also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SearchCtrlTestCase, "SearchCtrlTestCase" );
-
-void SearchCtrlTestCase::setUp()
-{
-    m_search = new wxSearchCtrl(wxTheApp->GetTopWindow(), wxID_ANY);
-}
-
-void SearchCtrlTestCase::tearDown()
-{
-    delete m_search;
-    m_search = NULL;
-}
-
-void SearchCtrlTestCase::Focus()
-{
-    // TODO OS X test only passes when run solo ...
+// TODO OS X test only passes when run solo ...
 #ifndef __WXOSX__
+SEARCH_CTRL_TEST_CASE("wxSearchCtrl::Focus", "[wxSearchCtrl][focus]")
+{
     m_search->SetFocus();
-    CPPUNIT_ASSERT( m_search->HasFocus() );
-#endif
+    CHECK( m_search->HasFocus() );
 }
+#endif // !__WXOSX__
 
 #endif // wxUSE_SEARCHCTRL

From 58ac3d3690f05c98c2a377a7fe92c14ed11e9ca8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 19:33:29 +0100
Subject: [PATCH 255/916] Fix wxSearchCtrl::ChangeValue() to actually change
 value

This was broken because wxSearchCtrl inherited the base class version of
ChangeValue() which didn't really work for it due to the poor way in
which wxTextEntry is designed (see #18071).

Closes #16998.
---
 include/wx/generic/srchctlg.h | 2 ++
 src/generic/srchctlg.cpp      | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index 67d0c99ca2..188a92aa2e 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -88,6 +88,8 @@ public:
     // operations
     // ----------
 
+    virtual void ChangeValue(const wxString& value) wxOVERRIDE;
+
     // editing
     virtual void Clear() wxOVERRIDE;
     virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE;
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 01acd68ea9..93b2321b05 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -915,6 +915,14 @@ wxTextCtrl& operator<<(double d);
 wxTextCtrl& operator<<(const wxChar c);
 #endif
 
+// Note that overriding DoSetValue() is currently insufficient because the base
+// class ChangeValue() only updates m_hintData of this object (which is null
+// anyhow), instead of updating m_text->m_hintData, see #16998.
+void wxSearchCtrl::ChangeValue(const wxString& value)
+{
+    m_text->ChangeValue(value);
+}
+
 void wxSearchCtrl::DoSetValue(const wxString& value, int flags)
 {
     m_text->DoSetValue(value, flags);

From f24872f6f419db6567bc514e7f9755dd0529dfd1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 19:08:16 +0100
Subject: [PATCH 256/916] Add unit test for wxSearchCtrl::ChangeValue()

Verify that it actually does change the value.

See #16998.
---
 tests/controls/searchctrltest.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/controls/searchctrltest.cpp b/tests/controls/searchctrltest.cpp
index 2c8e5b821b..31dc748322 100644
--- a/tests/controls/searchctrltest.cpp
+++ b/tests/controls/searchctrltest.cpp
@@ -49,4 +49,12 @@ SEARCH_CTRL_TEST_CASE("wxSearchCtrl::Focus", "[wxSearchCtrl][focus]")
 }
 #endif // !__WXOSX__
 
+SEARCH_CTRL_TEST_CASE("wxSearchCtrl::ChangeValue", "[wxSearchCtrl][text]")
+{
+    CHECK( m_search->GetValue() == wxString() );
+
+    m_search->ChangeValue("foo");
+    CHECK( m_search->GetValue() == "foo" );
+}
+
 #endif // wxUSE_SEARCHCTRL

From f079f11736a1e9d7a08d38b046fe06ee8ccf62bf Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 19:40:03 +0100
Subject: [PATCH 257/916] Log EVT_TEXT_ENTER events for wxSearchCtrl in the
 widgets sample

This is convenient for checking that the behaviour is consistent among
different platforms.

See #17911.
---
 samples/widgets/searchctrl.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 7586ffef10..77cf9238ea 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -83,6 +83,8 @@ protected:
     void OnToggleCancelButton(wxCommandEvent&);
     void OnToggleSearchMenu(wxCommandEvent&);
 
+    void OnTextEnter(wxCommandEvent& event);
+
     void OnSearch(wxCommandEvent& event);
     void OnSearchCancel(wxCommandEvent& event);
 
@@ -114,6 +116,8 @@ wxBEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage)
     EVT_CHECKBOX(ID_CANCEL_CB, SearchCtrlWidgetsPage::OnToggleCancelButton)
     EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu)
 
+    EVT_TEXT_ENTER(wxID_ANY, SearchCtrlWidgetsPage::OnTextEnter)
+
     EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch)
     EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearchCancel)
 wxEND_EVENT_TABLE()
@@ -233,6 +237,12 @@ void SearchCtrlWidgetsPage::OnToggleSearchMenu(wxCommandEvent&)
         m_srchCtrl->SetMenu(NULL);
 }
 
+void SearchCtrlWidgetsPage::OnTextEnter(wxCommandEvent& event)
+{
+    wxLogMessage("Search control: enter pressed, contents is \"%s\".",
+                 event.GetString());
+}
+
 void SearchCtrlWidgetsPage::OnSearch(wxCommandEvent& event)
 {
     wxLogMessage("Search button: search for \"%s\".", event.GetString());

From e5a1931b64d2272b24c8fcbef41efa3c9de91d84 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2018 23:14:44 +0100
Subject: [PATCH 258/916] Log wxEVT_TEXT events for wxSearchCtrl in widgets
 sample

This is useful to check that these events are generated under all
platforms.
---
 samples/widgets/searchctrl.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 77cf9238ea..a647835ed8 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -83,6 +83,7 @@ protected:
     void OnToggleCancelButton(wxCommandEvent&);
     void OnToggleSearchMenu(wxCommandEvent&);
 
+    void OnText(wxCommandEvent& event);
     void OnTextEnter(wxCommandEvent& event);
 
     void OnSearch(wxCommandEvent& event);
@@ -116,6 +117,7 @@ wxBEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage)
     EVT_CHECKBOX(ID_CANCEL_CB, SearchCtrlWidgetsPage::OnToggleCancelButton)
     EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu)
 
+    EVT_TEXT(wxID_ANY, SearchCtrlWidgetsPage::OnText)
     EVT_TEXT_ENTER(wxID_ANY, SearchCtrlWidgetsPage::OnTextEnter)
 
     EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch)
@@ -237,6 +239,12 @@ void SearchCtrlWidgetsPage::OnToggleSearchMenu(wxCommandEvent&)
         m_srchCtrl->SetMenu(NULL);
 }
 
+void SearchCtrlWidgetsPage::OnText(wxCommandEvent& event)
+{
+    wxLogMessage("Search control: text changes, contents is \"%s\".",
+                 event.GetString());
+}
+
 void SearchCtrlWidgetsPage::OnTextEnter(wxCommandEvent& event)
 {
     wxLogMessage("Search control: enter pressed, contents is \"%s\".",

From 1119a44cdd5f5710d14a4d6bb9b67f55ba496258 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 01:21:24 +0100
Subject: [PATCH 259/916] Simplify and make more portable DWrite font weight
 translation

There doesn't seem to be any need for painstakingly translating STC font
weight to DWRITE_FONT_WEIGHT when they seem to use exactly the same
numeric values anyhow.

This also fixes compilation when using older SDK versions that don't
define DWRITE_FONT_WEIGHT_SEMI_LIGHT constant, which is relatively
recent (and presence of which can't be easily checked, as it's an enum
element and not a preprocessor constant).
---
 src/stc/PlatWX.cpp | 51 +---------------------------------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 22339fb672..431d7a7361 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -710,8 +710,6 @@ SurfaceFontDataD2D::SurfaceFontDataD2D(const FontParameters& fp)
         wxCOMPtr<IDWriteTextLayout> pTextLayout;
         wxString faceName = fp.faceName;
         wxString extentTest(EXTENT_TEST);
-        int weight = fp.weight;
-        DWRITE_FONT_WEIGHT fontWeight;
         DWRITE_FONT_STYLE fontStyle;
         DWRITE_TEXT_METRICS textmetrics = {0,0,0,0,0,0,0,0,0};
         const int maxLines = 2;
@@ -720,59 +718,12 @@ SurfaceFontDataD2D::SurfaceFontDataD2D(const FontParameters& fp)
         FLOAT emHeight = 0;
         HRESULT hr;
 
-        if ( weight <= 100 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_THIN;
-        }
-        else if ( weight <= 200 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_EXTRA_LIGHT;
-        }
-        else if ( weight <= 300 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_LIGHT;
-        }
-#ifndef __MINGW64_TOOLCHAIN__
-        else if ( weight <= 350 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_SEMI_LIGHT;
-        }
-#endif
-        else if ( weight <= 400 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_NORMAL;
-        }
-        else if ( weight <= 500 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_MEDIUM;
-        }
-        else if ( weight <= 600 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_SEMI_BOLD;
-        }
-        else if ( weight <= 700 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_BOLD;
-        }
-        else if ( weight <= 800 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_EXTRA_BOLD;
-        }
-        else if ( weight <= 900 )
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_HEAVY;
-        }
-        else
-        {
-            fontWeight = DWRITE_FONT_WEIGHT_EXTRA_BLACK;
-        }
-
         fontStyle = fp.italic?DWRITE_FONT_STYLE_ITALIC:DWRITE_FONT_STYLE_NORMAL;
 
         hr = pDWriteFactory->CreateTextFormat(
             faceName.wc_str(),
             NULL,
-            fontWeight,
+            static_cast<DWRITE_FONT_WEIGHT>(fp.weight),
             fontStyle,
             DWRITE_FONT_STRETCH_NORMAL,
             fp.size,

From ea08b8539adcf1b9d6f9c8f5e283c80f00123202 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 01:42:06 +0100
Subject: [PATCH 260/916] Generate wxEVT_SEARCHCTRL_SEARCH_BTN when Enter is
 pressed

Make it possible to bind to just wxEVT_SEARCHCTRL_SEARCH_BTN under all
platforms: previously, it was also necessary to bind to wxEVT_TEXT_ENTER
when using the generic implementation, as pressing Enter in the text
control didn't generate the dedicated SEARCH event.

It does now, and, to avoid any confusion, the control does not generate
wxEVT_TEXT_ENTER events at all any more. This is not really
incompatible, as wxOSX never generated these events anyhow and the
generic version only did for a couple of days, since the changes of
981697079739c4a920dc2d2cb261ca57dc2169f6 which were, finally, misguided
and so are undone by this commit.

Closes #17911.
---
 docs/changes.txt         |  1 +
 interface/wx/srchctrl.h  | 13 ++++++-------
 src/generic/srchctlg.cpp | 14 +++++++++++++-
 src/tiff                 |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 42f60e8942..d6ae9203dc 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -177,6 +177,7 @@ All (GUI):
 - Add Set/GetFooter/Text/Icon() to wxRichMessageDialog (Tobias Taschner)
 - Add wxFloatingPointValidator::SetFactor().
 - Add "hint" property to wxSearchCtrl XRC handler.
+- Generate wxEVT_SEARCHCTRL_SEARCH_BTN on Enter under all platforms.
 
 wxGTK:
 
diff --git a/interface/wx/srchctrl.h b/interface/wx/srchctrl.h
index 51410de7bb..d888d581fa 100644
--- a/interface/wx/srchctrl.h
+++ b/interface/wx/srchctrl.h
@@ -12,10 +12,6 @@
     control, and a cancel button.
 
     @beginStyleTable
-    @style{wxTE_PROCESS_ENTER}
-           The control will generate the event @c wxEVT_TEXT_ENTER
-           (otherwise pressing Enter key is either processed internally by the
-           control or used for navigation between dialog controls).
     @style{wxTE_PROCESS_TAB}
            The control will receive @c wxEVT_CHAR events for TAB pressed -
            normally, TAB is used for passing to the next control in a dialog
@@ -39,8 +35,11 @@
     @endStyleTable
 
     @beginEventEmissionTable{wxCommandEvent}
-    To retrieve actual search queries, use EVT_TEXT and EVT_TEXT_ENTER events,
-    just as you would with wxTextCtrl.
+    To react to the changes in the control contents, use EVT_TEXT event, just
+    as you would do with wxTextCtrl. However it is recommended to use
+    EVT_SEARCHCTRL_SEARCH_BTN to actually start searching to avoid doing it too
+    soon, while the user is still typing (note that EVT_SEARCHCTRL_SEARCH_BTN
+    is also triggered by pressing Enter in the control).
     @event{EVT_SEARCHCTRL_SEARCH_BTN(id, func)}
         Respond to a @c wxEVT_SEARCHCTRL_SEARCH_BTN event, generated when the
         search button is clicked. Note that this does not initiate a search on
@@ -56,7 +55,7 @@
     @category{ctrl}
     @appearance{searchctrl}
 
-    @see wxTextCtrl::Create, wxValidator
+    @see wxTextCtrl
 */
 class wxSearchCtrl : public wxTextCtrl
 {
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 93b2321b05..ce82d7875d 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -92,6 +92,18 @@ protected:
         m_search->GetEventHandler()->ProcessEvent(event);
     }
 
+    void OnTextEnter(wxCommandEvent& WXUNUSED(event))
+    {
+        if ( !IsEmpty() )
+        {
+            wxCommandEvent event(wxEVT_SEARCHCTRL_SEARCH_BTN, m_search->GetId());
+            event.SetEventObject(m_search);
+            event.SetString(m_search->GetValue());
+
+            m_search->ProcessWindowEvent(event);
+        }
+    }
+
     void OnTextUrl(wxTextUrlEvent& eventText)
     {
         // copy constructor is disabled for some reason?
@@ -149,7 +161,7 @@ private:
 
 wxBEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
     EVT_TEXT(wxID_ANY, wxSearchTextCtrl::OnText)
-    EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText)
+    EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnTextEnter)
     EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl)
     EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText)
 wxEND_EVENT_TABLE()
diff --git a/src/tiff b/src/tiff
index 3c7e58ef64..aa65abe076 160000
--- a/src/tiff
+++ b/src/tiff
@@ -1 +1 @@
-Subproject commit 3c7e58ef646090569de1a35cdc93abce2c547172
+Subproject commit aa65abe0762209d40ec5d4343ec426a4d67caf2d

From 784a397348da3289117324a88fad4f345f3ca702 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 01:45:28 +0100
Subject: [PATCH 261/916] Remove wxEVT_TEXT_URL generation from wxSearchCtrl

This event doesn't make any sense for this control, was never generated
by the native macOS version and couldn't be generated under MSW neither
as it's only supported by the multiline control and not the single-line
version used here, so having this code in wxSearchCtrl just made no
sense at all.
---
 src/generic/srchctlg.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index ce82d7875d..a0bcf165fa 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -104,21 +104,6 @@ protected:
         }
     }
 
-    void OnTextUrl(wxTextUrlEvent& eventText)
-    {
-        // copy constructor is disabled for some reason?
-        //wxTextUrlEvent event(eventText);
-        wxTextUrlEvent event(
-            m_search->GetId(),
-            eventText.GetMouseEvent(),
-            eventText.GetURLStart(),
-            eventText.GetURLEnd()
-            );
-        event.SetEventObject(m_search);
-
-        m_search->GetEventHandler()->ProcessEvent(event);
-    }
-
 #ifdef __WXMSW__
     // We increase the text control height to be the same as for the controls
     // with border as this is what we actually need here because even though
@@ -162,7 +147,6 @@ private:
 wxBEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
     EVT_TEXT(wxID_ANY, wxSearchTextCtrl::OnText)
     EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnTextEnter)
-    EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl)
     EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText)
 wxEND_EVENT_TABLE()
 

From ce43f772a9833d458fb4deb053ece681e62eeed5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 01:47:47 +0100
Subject: [PATCH 262/916] Don't erase background of wxSearchCtrl buttons twice

Set background style to indicate that wxSearchButton is painted entirely
by its wxEVT_PAINT handler.

This should eliminate potential flicker under MSW.
---
 src/generic/srchctlg.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index a0bcf165fa..6775f9bcae 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -162,7 +162,9 @@ public:
           m_search(search),
           m_eventType(eventType),
           m_bmp(bmp)
-    { }
+    {
+        SetBackgroundStyle(wxBG_STYLE_PAINT);
+    }
 
     void SetBitmapLabel(const wxBitmap& label)
     {

From 94620f6c5944fe5b953cbb36652406b959b55a40 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 02:01:40 +0100
Subject: [PATCH 263/916] Use simple wxEVT_SEARCH[_CANCEL] names for
 wxSearchCtrl events

The old wxEVT_SEARCHCTRL_{SEARCH,CANCEL}_BTN event names were unwieldy
and misleading because both of these events can be generated without
using the buttons, but by pressing Enter or Esc (the latter currently
works under macOS only, but this could change in the future).
---
 docs/changes.txt               |  3 ++-
 include/wx/srchctrl.h          | 21 ++++++++++++++-------
 interface/wx/srchctrl.h        | 20 ++++++++++----------
 samples/widgets/searchctrl.cpp |  4 ++--
 src/common/srchcmn.cpp         |  4 ++--
 src/generic/srchctlg.cpp       | 12 ++++++------
 src/osx/srchctrl_osx.cpp       |  4 ++--
 7 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index d6ae9203dc..03fbc91981 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -177,7 +177,8 @@ All (GUI):
 - Add Set/GetFooter/Text/Icon() to wxRichMessageDialog (Tobias Taschner)
 - Add wxFloatingPointValidator::SetFactor().
 - Add "hint" property to wxSearchCtrl XRC handler.
-- Generate wxEVT_SEARCHCTRL_SEARCH_BTN on Enter under all platforms.
+- Add wxEVT_SEARCH[_CANCEL] synonyms for wxSearchCtrl events.
+- Generate wxEVT_SEARCH on Enter under all platforms.
 
 wxGTK:
 
diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 791fcb8092..8a0fa4da73 100644
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -41,8 +41,8 @@
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxSearchCtrlNameStr[];
 
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCHCTRL_CANCEL_BTN, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCHCTRL_SEARCH_BTN, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCH_CANCEL, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SEARCH, wxCommandEvent);
 
 // ----------------------------------------------------------------------------
 // a search ctrl is a text control with a search button and a cancel button
@@ -90,13 +90,20 @@ private:
 // macros for handling search events
 // ----------------------------------------------------------------------------
 
-#define EVT_SEARCHCTRL_CANCEL_BTN(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_SEARCHCTRL_CANCEL_BTN, id, wxCommandEventHandler(fn))
+#define EVT_SEARCH_CANCEL(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_SEARCH_CANCEL, id, wxCommandEventHandler(fn))
 
-#define EVT_SEARCHCTRL_SEARCH_BTN(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_SEARCHCTRL_SEARCH_BTN, id, wxCommandEventHandler(fn))
+#define EVT_SEARCH(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_SEARCH, id, wxCommandEventHandler(fn))
 
-// old wxEVT_COMMAND_* constants
+// old synonyms
+#define wxEVT_SEARCHCTRL_CANCEL_BTN wxEVT_SEARCH_CANCEL
+#define wxEVT_SEARCHCTRL_SEARCH_BTN wxEVT_SEARCH
+
+#define EVT_SEARCHCTRL_CANCEL_BTN(id, fn) EVT_SEARCH_CANCEL(id, fn)
+#define EVT_SEARCHCTRL_SEARCH_BTN(id, fn) EVT_SEARCH(id, fn)
+
+// even older wxEVT_COMMAND_* constants
 #define wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN   wxEVT_SEARCHCTRL_CANCEL_BTN
 #define wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN   wxEVT_SEARCHCTRL_SEARCH_BTN
 
diff --git a/interface/wx/srchctrl.h b/interface/wx/srchctrl.h
index d888d581fa..975a137703 100644
--- a/interface/wx/srchctrl.h
+++ b/interface/wx/srchctrl.h
@@ -35,19 +35,19 @@
     @endStyleTable
 
     @beginEventEmissionTable{wxCommandEvent}
-    To react to the changes in the control contents, use EVT_TEXT event, just
+    To react to the changes in the control contents, use wxEVT_TEXT event, just
     as you would do with wxTextCtrl. However it is recommended to use
-    EVT_SEARCHCTRL_SEARCH_BTN to actually start searching to avoid doing it too
-    soon, while the user is still typing (note that EVT_SEARCHCTRL_SEARCH_BTN
-    is also triggered by pressing Enter in the control).
-    @event{EVT_SEARCHCTRL_SEARCH_BTN(id, func)}
-        Respond to a @c wxEVT_SEARCHCTRL_SEARCH_BTN event, generated when the
+    wxEVT_SEARCH to actually start searching to avoid doing it too soon, while
+    the user is still typing (note that wxEVT_SEARCH is also triggered by
+    pressing Enter in the control).
+    @event{EVT_SEARCH(id, func)}
+        Respond to a @c wxEVT_SEARCH event, generated when the
         search button is clicked. Note that this does not initiate a search on
         its own, you need to perform the appropriate action in your event
         handler. You may use @code event.GetString() @endcode to retrieve the
         string to search for in the event handler code.
-    @event{EVT_SEARCHCTRL_CANCEL_BTN(id, func)}
-        Respond to a @c wxEVT_SEARCHCTRL_CANCEL_BTN event, generated when the
+    @event{EVT_SEARCH_CANCEL(id, func)}
+        Respond to a @c wxEVT_SEARCH_CANCEL event, generated when the
         cancel button is clicked.
     @endEventTable
 
@@ -161,5 +161,5 @@ public:
 };
 
 
-wxEventType  wxEVT_SEARCHCTRL_CANCEL_BTN;
-wxEventType  wxEVT_SEARCHCTRL_SEARCH_BTN;
+wxEventType  wxEVT_SEARCH_CANCEL;
+wxEventType  wxEVT_SEARCH;
diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index a647835ed8..7252ab078d 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -120,8 +120,8 @@ wxBEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage)
     EVT_TEXT(wxID_ANY, SearchCtrlWidgetsPage::OnText)
     EVT_TEXT_ENTER(wxID_ANY, SearchCtrlWidgetsPage::OnTextEnter)
 
-    EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearch)
-    EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, SearchCtrlWidgetsPage::OnSearchCancel)
+    EVT_SEARCH(wxID_ANY, SearchCtrlWidgetsPage::OnSearch)
+    EVT_SEARCH_CANCEL(wxID_ANY, SearchCtrlWidgetsPage::OnSearchCancel)
 wxEND_EVENT_TABLE()
 
 // ============================================================================
diff --git a/src/common/srchcmn.cpp b/src/common/srchcmn.cpp
index 1e524b5394..788b466937 100644
--- a/src/common/srchcmn.cpp
+++ b/src/common/srchcmn.cpp
@@ -34,8 +34,8 @@
 
 const char wxSearchCtrlNameStr[] = "searchCtrl";
 
-wxDEFINE_EVENT(wxEVT_SEARCHCTRL_CANCEL_BTN, wxCommandEvent);
-wxDEFINE_EVENT(wxEVT_SEARCHCTRL_SEARCH_BTN, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SEARCH_CANCEL, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SEARCH, wxCommandEvent);
 
 
 #endif // wxUSE_SEARCHCTRL
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 6775f9bcae..074bee8722 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -96,7 +96,7 @@ protected:
     {
         if ( !IsEmpty() )
         {
-            wxCommandEvent event(wxEVT_SEARCHCTRL_SEARCH_BTN, m_search->GetId());
+            wxCommandEvent event(wxEVT_SEARCH, m_search->GetId());
             event.SetEventObject(m_search);
             event.SetString(m_search->GetValue());
 
@@ -196,7 +196,7 @@ protected:
         wxCommandEvent event(m_eventType, m_search->GetId());
         event.SetEventObject(m_search);
 
-        if ( m_eventType == wxEVT_SEARCHCTRL_SEARCH_BTN )
+        if ( m_eventType == wxEVT_SEARCH )
         {
             // it's convenient to have the string to search for directly in the
             // event instead of having to retrieve it from the control in the
@@ -209,7 +209,7 @@ protected:
         m_search->SetFocus();
 
 #if wxUSE_MENUS
-        if ( m_eventType == wxEVT_SEARCHCTRL_SEARCH_BTN )
+        if ( m_eventType == wxEVT_SEARCH )
         {
             // this happens automatically, just like on Mac OS X
             m_search->PopupSearchMenu();
@@ -238,7 +238,7 @@ wxBEGIN_EVENT_TABLE(wxSearchButton, wxControl)
 wxEND_EVENT_TABLE()
 
 wxBEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
-    EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, wxSearchCtrl::OnCancelButton)
+    EVT_SEARCH_CANCEL(wxID_ANY, wxSearchCtrl::OnCancelButton)
     EVT_SIZE(wxSearchCtrl::OnSize)
 wxEND_EVENT_TABLE()
 
@@ -322,10 +322,10 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
     m_text = new wxSearchTextCtrl(this, value, style);
 
     m_searchButton = new wxSearchButton(this,
-                                        wxEVT_SEARCHCTRL_SEARCH_BTN,
+                                        wxEVT_SEARCH,
                                         m_searchBitmap);
     m_cancelButton = new wxSearchButton(this,
-                                        wxEVT_SEARCHCTRL_CANCEL_BTN,
+                                        wxEVT_SEARCH_CANCEL,
                                         m_cancelBitmap);
 
     SetBackgroundColour( m_text->GetBackgroundColour() );
diff --git a/src/osx/srchctrl_osx.cpp b/src/osx/srchctrl_osx.cpp
index 928bb9340e..fa3101f42e 100644
--- a/src/osx/srchctrl_osx.cpp
+++ b/src/osx/srchctrl_osx.cpp
@@ -209,7 +209,7 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
 
 bool wxSearchCtrl::HandleSearchFieldSearchHit()
 {
-    wxCommandEvent event(wxEVT_SEARCHCTRL_SEARCH_BTN, m_windowId );
+    wxCommandEvent event(wxEVT_SEARCH, m_windowId );
     event.SetEventObject(this);
 
     // provide the string to search for directly in the event, this is more
@@ -221,7 +221,7 @@ bool wxSearchCtrl::HandleSearchFieldSearchHit()
 
 bool wxSearchCtrl::HandleSearchFieldCancelHit()
 {
-    wxCommandEvent event(wxEVT_SEARCHCTRL_CANCEL_BTN, m_windowId );
+    wxCommandEvent event(wxEVT_SEARCH_CANCEL, m_windowId );
     event.SetEventObject(this);
     return ProcessCommand(event);
 }

From 8565d8f2fcf1f27194283df29c5b055f092a9079 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 02:21:45 +0100
Subject: [PATCH 264/916] Set window field of wxEVT_SET_FOCUS events in wxGTK

It is often useful to know where is the focus coming from, for example
to determine if was in another window of the same composite control.

Remember the last focus in yet another global variable in wxGTK code to
allow setting wxFocusEvent::m_window correctly when generating
wxEVT_SET_FOCUS events.
---
 src/gtk/window.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 9abbfbf99c..a75c861f2e 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -213,6 +213,8 @@ static wxWindowGTK *gs_currentFocus = NULL;
 // The window that is scheduled to get focus in the next event loop iteration
 // or NULL if there's no pending focus change:
 static wxWindowGTK *gs_pendingFocus = NULL;
+// The window that had focus before we lost it last time:
+static wxWindowGTK *gs_lastFocus = NULL;
 
 // the window that has deferred focus-out event pending, if any (see
 // GTKAddDeferredFocusOut() for details)
@@ -2685,6 +2687,8 @@ wxWindowGTK::~wxWindowGTK()
         gs_currentFocus = NULL;
     if (gs_pendingFocus == this)
         gs_pendingFocus = NULL;
+    if (gs_lastFocus == this)
+        gs_lastFocus = NULL;
 
     if ( gs_deferredFocusOut == this )
         gs_deferredFocusOut = NULL;
@@ -4374,6 +4378,9 @@ bool wxWindowGTK::GTKHandleFocusIn()
 
     wxFocusEvent eventFocus(wxEVT_SET_FOCUS, GetId());
     eventFocus.SetEventObject(this);
+    eventFocus.SetWindow(gs_lastFocus);
+    gs_lastFocus = this;
+
     GTKProcessEvent(eventFocus);
 
     return retval;
@@ -4415,6 +4422,8 @@ void wxWindowGTK::GTKHandleFocusOutNoDeferring()
                "handling focus_out event for %s(%p, %s)",
                GetClassInfo()->GetClassName(), this, GetLabel());
 
+    gs_lastFocus = this;
+
     if (m_imContext)
         gtk_im_context_focus_out(m_imContext);
 

From 5f21280130b154ea517a0f283c7c554aa41d69e8 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 30 Jan 2018 17:17:47 +0100
Subject: [PATCH 265/916] Avoid duplicate wxEVT_SEARCHCTRL_CANCEL_BTN event
 under macOS

see https://github.com/wxWidgets/wxWidgets/pull/698 , along the idea by commit 1776f136f7d673c8e772c9ca6e1607089a071651, implemented a little bit more defensively
---
 src/osx/cocoa/srchctrl.mm | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/osx/cocoa/srchctrl.mm b/src/osx/cocoa/srchctrl.mm
index 162408426b..7cf1695285 100644
--- a/src/osx/cocoa/srchctrl.mm
+++ b/src/osx/cocoa/srchctrl.mm
@@ -30,6 +30,7 @@
 
 @interface wxNSSearchField : NSSearchField
 {
+    BOOL m_withinTextDidChange;
 }
 
 @end
@@ -48,10 +49,20 @@
 
 - (id)initWithFrame:(NSRect)frame
 {
-    self = [super initWithFrame:frame];
+    if ( self = [super initWithFrame:frame] )
+    {
+        m_withinTextDidChange = NO;
+    }
     return self;
 }
- 
+
+- (void)textDidChange:(NSNotification *)aNotification
+{
+    m_withinTextDidChange = YES;
+    [super textDidChange:aNotification];
+    m_withinTextDidChange = NO;
+}
+
 - (void)controlTextDidChange:(NSNotification *)aNotification
 {
     wxUnusedVar(aNotification);
@@ -84,6 +95,11 @@
     return matches;
 }
 
+- (BOOL) isWithinTextDidChange
+{
+    return m_withinTextDidChange;
+}
+
 @end
 
 // ============================================================================
@@ -157,7 +173,8 @@ public :
             NSString *searchString = [m_searchField stringValue];
             if ( searchString == nil || !searchString.length )
             {
-                wxpeer->HandleSearchFieldCancelHit();
+                if ( ![m_searchField isWithinTextDidChange])
+                   wxpeer->HandleSearchFieldCancelHit();
             }
             else
             {

From 9f57b6ed20f1e3937da66134b9c46576ac3dae90 Mon Sep 17 00:00:00 2001
From: Stephen Smith <stephen_a_smith@me.com>
Date: Tue, 30 Jan 2018 12:03:36 -0500
Subject: [PATCH 266/916] Explicitly mention "cd" in install.txt configure
 instructions

Adds one extra shell command instruction (was missing but implied) to
assist newcomers with configure.

Closes https://github.com/wxWidgets/wxWidgets/pull/701
---
 docs/msw/install.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index d63d1db455..f5093ee160 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -200,6 +200,7 @@ either MSYS or Cygwin.
 
         $ cd $WXWIN
         $ mkdir build-debug
+        $ cd build-debug
 
 2. Run configure passing it any of the options shown by "configure
    --help". Notice that configure builds shared libraries by default,

From f775501ba0a3b514cd0417e947c307c850d1dfec Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 19:40:59 +0100
Subject: [PATCH 267/916] Don't eat TAB unconditionally in wxComboCtrl

This prevented TAB navigation from doing anything at all when the focus
was on wxComboCtrl in wxGTK and, probably, all the other non-MSW ports
(in wxMSW TAB navigation happens before normal key processing, so this
check was irrelevant there).
---
 src/common/combocmn.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 33342b6952..3dc6901f82 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -751,9 +751,7 @@ void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
 
     if ( !combo->GetEventHandler()->ProcessEvent(redirectedEvent) )
     {
-        // Don't let TAB through to the text ctrl - looks ugly
-        if ( event.GetKeyCode() != WXK_TAB )
-            event.Skip();
+        event.Skip();
     }
 }
 

From 3825baf708dc1a7f41290fabad55d83b25a22637 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 19:45:32 +0100
Subject: [PATCH 268/916] Remove wx/dcbuffer.h dependency from
 wx/generic/combo.h

This header doesn't really need to be included from here and it was done
solely in order to get the value of wxALWAYS_NATIVE_DOUBLE_BUFFER from
it.

Move the code using this macro in the .cpp file instead.
---
 include/wx/generic/combo.h | 16 +---------------
 src/generic/combog.cpp     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 92b3ff624e..dc9155394f 100644
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -30,8 +30,6 @@
 
 #endif
 
-#include "wx/dcbuffer.h"
-
 extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
 class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase
@@ -96,19 +94,7 @@ protected:
 #endif
 
     // For better transparent background rendering
-    virtual bool HasTransparentBackground() wxOVERRIDE
-    {
-        #if wxALWAYS_NATIVE_DOUBLE_BUFFER
-          #ifdef __WXGTK__
-            // Sanity check for GTK+
-            return IsDoubleBuffered();
-          #else
-            return true;
-          #endif
-        #else
-            return false;
-        #endif
-    }
+    virtual bool HasTransparentBackground() wxOVERRIDE;
 
     // Mandatory virtuals
     virtual void OnResize() wxOVERRIDE;
diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index 1bac5e630e..411dc2e782 100644
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -198,6 +198,20 @@ wxGenericComboCtrl::~wxGenericComboCtrl()
 {
 }
 
+bool wxGenericComboCtrl::HasTransparentBackground()
+{
+#if wxALWAYS_NATIVE_DOUBLE_BUFFER
+  #ifdef __WXGTK__
+    // Sanity check for GTK+
+    return IsDoubleBuffered();
+  #else
+    return true;
+  #endif
+#else
+    return false;
+#endif
+}
+
 void wxGenericComboCtrl::OnResize()
 {
 

From 27cad5e04d4de436c1ebf0aa167e1502040fb502 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 19:50:09 +0100
Subject: [PATCH 269/916] Fix TAB navigation with wxComboCtrl in non-MSW ports

Derive wxGenericComboCtrl from wxNavigationEnabled<> to make TAB work
correctly when the focus was on it, otherwise it didn't move it
correctly to the next control.

This notably allows TAB to cycle through all the controls in the "combo"
sample whereas previously it stopped on reaching the combo control with
the list popup with wxGTK.
---
 include/wx/generic/combo.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index dc9155394f..9c5da101d0 100644
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -16,6 +16,8 @@
 // Only define generic if native doesn't have all the features
 #if !defined(wxCOMBOCONTROL_FULLY_FEATURED)
 
+#include "wx/containr.h"
+
 // ----------------------------------------------------------------------------
 // Generic wxComboCtrl
 // ----------------------------------------------------------------------------
@@ -32,11 +34,12 @@
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
-class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase
+class WXDLLIMPEXP_CORE wxGenericComboCtrl
+    : public wxNavigationEnabled<wxComboCtrlBase>
 {
 public:
     // ctors and such
-    wxGenericComboCtrl() : wxComboCtrlBase() { Init(); }
+    wxGenericComboCtrl() { Init(); }
 
     wxGenericComboCtrl(wxWindow *parent,
                        wxWindowID id = wxID_ANY,
@@ -46,7 +49,6 @@ public:
                        long style = 0,
                        const wxValidator& validator = wxDefaultValidator,
                        const wxString& name = wxComboBoxNameStr)
-        : wxComboCtrlBase()
     {
         Init();
 

From 1de107c03706de5e1864f7e167d29eea93df066f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 19:49:03 +0100
Subject: [PATCH 270/916] Derive wxDatePickerCtrlGeneric from
 wxCompositeWindowSettersOnly

This class doesn't need the extra focus-related features of
wxCompositeWindow.
---
 include/wx/generic/datectrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 61a4ad18c9..9c273a6e40 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
 class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric
-    : public wxCompositeWindow<wxDatePickerCtrlBase>
+    : public wxCompositeWindowSettersOnly<wxDatePickerCtrlBase>
 {
 public:
     // creating the control

From 648cfe074305512952132c40b03758be577bda93 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 21:35:20 +0100
Subject: [PATCH 271/916] Fix TAB navigation for wxDatePickerCtrl in wxGTK

Inherit from wxNavigationEnabled<> to make navigation work correctly in
wxGTK.
---
 include/wx/generic/datectrl.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 9c273a6e40..09d340739d 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -12,6 +12,7 @@
 #define _WX_GENERIC_DATECTRL_H_
 
 #include "wx/compositewin.h"
+#include "wx/containr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
 
@@ -19,7 +20,7 @@ class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
 class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric
-    : public wxCompositeWindowSettersOnly<wxDatePickerCtrlBase>
+    : public wxCompositeWindowSettersOnly< wxNavigationEnabled<wxDatePickerCtrlBase> >
 {
 public:
     // creating the control

From a0cc098ef0883d1893c4412e4dbde8155314732f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 22:58:08 +0100
Subject: [PATCH 272/916] Use only existing directories in Unix
 wxMimeTypesManager

Avoid using directories under /opt if they don't exist anyhow.

This also makes the code easier to modify in the future, see #16704.
---
 src/unix/mimetype.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index fef68d3abf..50a555f45e 100644
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -520,6 +520,11 @@ void wxMimeTypesManagerImpl::InitIfNeeded()
 }
 
 
+static void AppendToPathIfExists(wxString& pathvar, const wxString& dir)
+{
+    if ( wxFileName::DirExists(dir) )
+        pathvar << ":" << dir;
+}
 
 // read system and user mailcaps and other files
 void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
@@ -546,10 +551,18 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
         if ( xdgDataDirs.empty() )
         {
             xdgDataDirs = "/usr/local/share:/usr/share";
-            if (mailcapStyles & wxMAILCAP_GNOME)
-                xdgDataDirs += ":/usr/share/gnome:/opt/gnome/share";
-            if (mailcapStyles & wxMAILCAP_KDE)
-                xdgDataDirs += ":/usr/share/kde3:/opt/kde3/share";
+
+            if ( mailcapStyles & wxMAILCAP_GNOME )
+            {
+                AppendToPathIfExists(xdgDataDirs, "/usr/share/gnome");
+                AppendToPathIfExists(xdgDataDirs, "/opt/gnome/share");
+            }
+
+            if ( mailcapStyles & wxMAILCAP_KDE )
+            {
+                AppendToPathIfExists(xdgDataDirs, "/usr/share/kde3");
+                AppendToPathIfExists(xdgDataDirs, "/opt/kde3/share");
+            }
         }
         if ( !sExtraDir.empty() )
         {

From 2ff1e633e9e157e824e9a5aa0e069fe15e1cef77 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 23:01:39 +0100
Subject: [PATCH 273/916] Use KDE 4 and 5 directories in Unix
 wxMimeTypesManager too

KDE 3 is throughly outdated, but keep support for it too because it
doesn't cost much.

Closes #16704.
---
 src/unix/mimetype.cpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 50a555f45e..d09a814873 100644
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -520,10 +520,13 @@ void wxMimeTypesManagerImpl::InitIfNeeded()
 }
 
 
-static void AppendToPathIfExists(wxString& pathvar, const wxString& dir)
+static bool AppendToPathIfExists(wxString& pathvar, const wxString& dir)
 {
-    if ( wxFileName::DirExists(dir) )
-        pathvar << ":" << dir;
+    if ( !wxFileName::DirExists(dir) )
+        return false;
+
+    pathvar << ":" << dir;
+    return true;
 }
 
 // read system and user mailcaps and other files
@@ -560,8 +563,17 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
 
             if ( mailcapStyles & wxMAILCAP_KDE )
             {
-                AppendToPathIfExists(xdgDataDirs, "/usr/share/kde3");
-                AppendToPathIfExists(xdgDataDirs, "/opt/kde3/share");
+                for ( int kdeVer = 5; kdeVer >= 3; kdeVer-- )
+                {
+                    const wxString& kdeDir = wxString::Format("kde%d", kdeVer);
+                    if ( AppendToPathIfExists(xdgDataDirs, "/usr/share/" + kdeDir)
+                            || AppendToPathIfExists(xdgDataDirs, "/opt/" + kdeDir + "/share") )
+                    {
+                        // We don't need to use earlier versions if we found a
+                        // later one.
+                        break;
+                    }
+                }
             }
         }
         if ( !sExtraDir.empty() )

From 96d9f7361b8e756d6445478c101a1746932a6bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gunter=20K=C3=B6nigsmann?= <gunter@peterpall.de>
Date: Sat, 25 Jun 2016 08:37:23 +0200
Subject: [PATCH 274/916] Document listbox item activation on Enter in wxGTK

Mention that EVT_LISTBOX_DCLICK event can also be generated from
keyboard.

Closes #17577.
---
 interface/wx/listbox.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/interface/wx/listbox.h b/interface/wx/listbox.h
index a736e943f0..00b4c53338 100644
--- a/interface/wx/listbox.h
+++ b/interface/wx/listbox.h
@@ -61,7 +61,9 @@
         list is selected or the selection changes.
     @event{EVT_LISTBOX_DCLICK(id, func)}
         Process a @c wxEVT_LISTBOX_DCLICK event, when the listbox
-        is double-clicked.
+        is double-clicked. On some platforms (notably wxGTK2) 
+	pressing the enter key is handled as an equivalent of a 
+	double-click.
     @endEventTable
 
     @library{wxcore}

From caea08e6b2b9e4843e84c61abc879880a08634b0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 23:34:33 +0100
Subject: [PATCH 275/916] Generate wxEVT_CONTEXT_MENU everywhere in generic
 wxTreeCtrl

Clicking outside of the items area didn't generate wxEVT_CONTEXT_MENU in
the generic version, unlike the native MSW one and contrary to
expectations.

Also update the documentation to make it clear when exactly are
wxEVT_TREE_ITEM_MENU and wxEVT_CONTEXT_MENU events generated.

Closes #17361.
---
 src/generic/treectlg.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index f45fca5e24..ad360ca93d 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -3743,7 +3743,11 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 
         m_dragCount = 0;
 
-        if (item == NULL) return;  /* we hit the blank area */
+        if ( item == NULL )
+        {
+            event.Skip();
+            return;
+        }
 
         if ( event.RightDown() )
         {

From 06c29a7f2072395daf4b7416cf76297a00470e43 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 31 Jan 2018 00:02:54 +0100
Subject: [PATCH 276/916] Document missing ActivateCell() calls in macOS
 version

Native macOS version of wxDataViewCtrl doesn't support cell activation
currently.

See #17746.
---
 interface/wx/dataview.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index bfc8fa8d1b..8d087a9367 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -2427,6 +2427,10 @@ public:
             corresponding event. Is @NULL otherwise (for keyboard activation).
             Mouse coordinates are adjusted to be relative to the cell.
 
+        @note Currently support for this method is not implemented in the
+            native macOS version of the control, i.e. it will be never called
+            there.
+
         @since 2.9.3
 
         @note Do not confuse this method with item activation in wxDataViewCtrl

From 193939453e4fdb11d74ac700ce959d21050b6e61 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 31 Jan 2018 03:00:51 +0100
Subject: [PATCH 277/916] Fix assert due to wrong sizer flags in
 wxGenericRichMessageDialog

This assert was especially annoying because it could be shown when
showing a previous assert message on the platforms without the native
rich message dialog (i.e. anything but MSW), resulting in reentering the
assert handler and killing the application.
---
 src/generic/richmsgdlgg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generic/richmsgdlgg.cpp b/src/generic/richmsgdlgg.cpp
index ed9a5d9717..eb83cb099d 100644
--- a/src/generic/richmsgdlgg.cpp
+++ b/src/generic/richmsgdlgg.cpp
@@ -77,7 +77,7 @@ void wxGenericRichMessageDialog::AddMessageDialogDetails(wxSizer *sizer)
         sizerPane->Add( new wxStaticText( windowPane, -1, m_detailedText ) );
         windowPane->SetSizer( sizerPane );
 
-        sizerDetails->Add( m_detailsPane, wxSizerFlags().Right().Expand() );
+        sizerDetails->Add( m_detailsPane, wxSizerFlags().Expand() );
         sizer->Add( sizerDetails, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
     }
 

From ad71bbb9ad2e3f97c24b77f7a5311c81c1156bc3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Jan 2018 22:12:22 +0100
Subject: [PATCH 278/916] Fix behaviour of wxTextCtrl without wxTE_PROCESS_TAB
 in wxGTK

TAB should be used for navigation by default and only should be inserted
into the control as a literal character if wxTE_PROCESS_TAB is specified
for consistency with wxMSW and because this behaviour is much more
useful by default.

Fix this by calling gtk_text_view_set_accepts_tab() as appropriate for
multiline text controls. For single line ones, the behaviour is
unchanged but it's more reasonable as TAB is always handled as if
wxTE_PROCESS_TAB were not specified and it doesn't seem really useful to
try to support wxTE_PROCESS_TAB for them anyhow, so just document this
limitation.

Also remove the outdated/misleading documentation of this style, notably
don't say that it is required to get char events for TAB presses as
these events are generated both with and without this style in both
wxGTK and wxMSW.

Closes https://github.com/wxWidgets/wxWidgets/pull/704
---
 docs/changes.txt        |  1 +
 interface/wx/textctrl.h | 10 ++++++----
 src/gtk/textctrl.cpp    | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 140530df3b..41b4baba6d 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -185,6 +185,7 @@ wxGTK:
 
 - Make wxUIActionSimulator work with GTK+ 3 (Scott Talbert).
 - Make wxBORDER_NONE work for wxTextCtrl with GTK+ 3 (Adrien Tétar).
+- Handle wxTE_PROCESS_TAB, and its absence, correctly in multiline wxTextCtrl.
 - Apply wxTextCtrl::SetDefaultStyle() to user-entered text (Andreas Falkenhahn).
 - Implement dynamic auto-completion in wxTextEntry (AliKet).
 - Fix wxTextCtrl::GetStyle() with GTK+ 3.
diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h
index a2c9615d4a..70b296c5b0 100644
--- a/interface/wx/textctrl.h
+++ b/interface/wx/textctrl.h
@@ -945,10 +945,12 @@ public:
            (otherwise pressing Enter key is either processed internally by the
            control or used to activate the default button of the dialog, if any).
     @style{wxTE_PROCESS_TAB}
-           The control will receive @c wxEVT_CHAR events for TAB pressed -
-           normally, TAB is used for passing to the next control in a dialog
-           instead. For the control created with this style, you can still use
-           Ctrl-Enter to pass to the next control from the keyboard.
+           Normally, TAB key is used for keyboard navigation and pressing it in
+           a control switches focus to the next one. With this style, this
+           won't happen and if the TAB is not otherwise processed (e.g. by @c
+           wxEVT_CHAR event handler), a literal TAB character is inserted into
+           the control. Notice that this style has no effect for single-line
+           text controls when using wxGTK.
     @style{wxTE_MULTILINE}
            The text control allows multiple lines. If this style is not
            specified, line break characters should not be used in the controls
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index dd02a570ba..16a73318a3 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -323,6 +323,14 @@ au_apply_tag_callback(GtkTextBuffer *buffer,
 }
 }
 
+// Check if the style contains wxTE_PROCESS_TAB and update the given
+// GtkTextView accordingly.
+static void wxGtkSetAcceptsTab(GtkWidget* text, long style)
+{
+    gtk_text_view_set_accepts_tab(GTK_TEXT_VIEW(text),
+                                  (style & wxTE_PROCESS_TAB) != 0);
+}
+
 //-----------------------------------------------------------------------------
 //  GtkTextCharPredicates for gtk_text_iter_*_find_char
 //-----------------------------------------------------------------------------
@@ -800,6 +808,8 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     if (multi_line)
     {
+        wxGtkSetAcceptsTab(m_text, style);
+
         // Handle URLs on multi-line controls with wxTE_AUTO_URL style
         if (style & wxTE_AUTO_URL)
         {
@@ -984,6 +994,15 @@ void wxTextCtrl::SetWindowStyleFlag(long style)
     if ( (style & wxTE_PROCESS_ENTER) != (styleOld & wxTE_PROCESS_ENTER) )
         GTKSetActivatesDefault();
 
+    if ( IsMultiLine() )
+    {
+        wxGtkSetAcceptsTab(m_text, style);
+    }
+    //else: there doesn't seem to be any way to do it for entries and while we
+    //      could emulate wxTE_PROCESS_TAB for them by handling Tab key events
+    //      explicitly, it doesn't seem to be worth doing it, this style is
+    //      pretty useless with single-line controls.
+
     static const long flagsWrap = wxTE_WORDWRAP | wxTE_CHARWRAP | wxTE_DONTWRAP;
     if ( (style & flagsWrap) != (styleOld & flagsWrap) )
         GTKSetWrapMode();

From 5bfe0fdcc48718a4b16d20f6faf5c1ee5e6cb792 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 1 Feb 2018 17:35:02 +0100
Subject: [PATCH 279/916] Add helper wxRendererMSWBase::ConvertToRECT()

Combine MSWApplyGDIPlusTransform() and wxCopyRectToRECT() into a single
helper function to simplify the code and, importantly, to make it more
difficult to forget call the former function.

No real changes, this is a pure refactoring.
---
 src/msw/renderer.cpp | 45 +++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index fff5432e6d..e08ceb2a09 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -99,6 +99,16 @@ public:
                                          wxDC& dc,
                                          const wxRect& rect,
                                          int flags = 0) wxOVERRIDE = 0;
+
+protected:
+    // Helper function returning the MSW RECT corresponding to the wxRect
+    // adjusted for the given wxDC.
+    static RECT ConvertToRECT(wxDC& dc, const wxRect& rect)
+    {
+        RECT rc;
+        wxCopyRectToRECT(dc.GetImpl()->MSWApplyGDIPlusTransform(rect), rc);
+        return rc;
+    }
 };
 
 // ----------------------------------------------------------------------------
@@ -411,10 +421,7 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
 {
     wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
 
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-    
-    RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    RECT r = ConvertToRECT(dc, rect);
 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )
@@ -435,10 +442,7 @@ wxRendererMSW::DoDrawFrameControl(UINT type,
 {
     wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
 
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
-    RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    RECT r = ConvertToRECT(dc, rect);
 
     int style = kind;
     if ( flags & wxCONTROL_CHECKED )
@@ -613,10 +617,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
 
     wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
 
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
-    RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    RECT r = ConvertToRECT(dc, rect);
 
     int state;
     if ( flags & wxCONTROL_PRESSED )
@@ -656,10 +657,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
 
     wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") );
 
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
-    RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    RECT r = ConvertToRECT(dc, rect);
 
     int state;
     if ( flags & wxCONTROL_PRESSED )
@@ -702,10 +700,7 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
 
     wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
 
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
-    RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    RECT r = ConvertToRECT(dc, rect);
 
     int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
     ::DrawThemeBackground
@@ -744,10 +739,7 @@ wxRendererXP::DoDrawButtonLike(HTHEME htheme,
 {
     wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
 
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
-    RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    RECT r = ConvertToRECT(dc, rect);
 
     // the base state is always 1, whether it is PBS_NORMAL,
     // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL
@@ -876,10 +868,7 @@ wxRendererXP::DrawCollapseButton(wxWindow *win,
         if (flags & wxCONTROL_EXPANDED)
             flags |= wxCONTROL_CHECKED;
 
-        wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
-        RECT r;
-        wxCopyRectToRECT(adjustedRect, r);
+        RECT r = ConvertToRECT(dc, rect);
 
         ::DrawThemeBackground
             (

From 92891cee476b2bd1a7d8848227bdb42cd37f2488 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 1 Feb 2018 17:38:23 +0100
Subject: [PATCH 280/916] Add missing GDI+ adjustments to wxRendererXP

A few methods, notably including DrawFocusRect() and DrawItemText(),
were missing MSWApplyGDIPlusTransform() calls that need to be done
before drawing on an HDC corresponding to a wxGCDC object.

Add them by replacing calls to wxCopyRectToRECT() with the just added
ConvertToRECT() function, which adjusts the coordinates and copies
wxRect to RECT at once.
---
 src/msw/renderer.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index e08ceb2a09..1886d68516 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -322,8 +322,7 @@ void wxRendererMSWBase::DrawFocusRect(wxWindow * WXUNUSED(win),
                                       const wxRect& rect,
                                       int WXUNUSED(flags))
 {
-    RECT rc;
-    wxCopyRectToRECT(rect, rc);
+    RECT rc = ConvertToRECT(dc, rect);
 
     ::DrawFocusRect(GetHdcOf(dc.GetTempHDC()), &rc);
 }
@@ -919,8 +918,8 @@ wxRendererXP::DrawItemSelectionRect(wxWindow *win,
 
     if ( ::IsThemePartDefined(hTheme, LVP_LISTITEM, 0) )
     {
-        RECT rc;
-        wxCopyRectToRECT(rect, rc);
+        RECT rc = ConvertToRECT(dc, rect);
+
         if ( ::IsThemeBackgroundPartiallyTransparent(hTheme, LVP_LISTITEM, itemState) )
             ::DrawThemeParentBackground(GetHwndOf(win), GetHdcOf(dc.GetTempHDC()), &rc);
 
@@ -956,8 +955,7 @@ void wxRendererXP::DrawItemText(wxWindow* win,
     if ( s_DrawThemeTextEx && // Might be not available if we're under XP
             ::IsThemePartDefined(hTheme, LVP_LISTITEM, 0) )
     {
-        RECT rc;
-        wxCopyRectToRECT(rect, rc);
+        RECT rc = ConvertToRECT(dc, rect);
 
         WXDTTOPTS textOpts;
         textOpts.dwSize = sizeof(textOpts);
@@ -1081,8 +1079,7 @@ void wxRendererXP::DrawGauge(wxWindow* win,
         return;
     }
 
-    RECT r;
-    wxCopyRectToRECT(rect, r);
+    RECT r = ConvertToRECT(dc, rect);
 
     ::DrawThemeBackground(
         hTheme,

From 94e201df78dc742988ddeb228009ba6ee037df24 Mon Sep 17 00:00:00 2001
From: Danny Scott <doscott@doscott.ca>
Date: Fri, 2 Feb 2018 10:05:04 -0400
Subject: [PATCH 281/916] Update batch file for MSW binaries for MSVS 2017

VS2017 environment bat files change the working directory so the build
directory is returned to after calling them.

A warning has been added that the VS150COMNTOOLS environment variable
needs to be set or a VS2017 command prompt needs to be used for VS2017
builds. MS no longer sets this variable on install.

For vc110 and vc120 builds the x64 switch has been changed to x86_amd64.

Closes #18075.
---
 build/tools/msvs/officialbuild.bat | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/build/tools/msvs/officialbuild.bat b/build/tools/msvs/officialbuild.bat
index d622d2d495..af1e4f2d62 100755
--- a/build/tools/msvs/officialbuild.bat
+++ b/build/tools/msvs/officialbuild.bat
@@ -6,6 +6,13 @@ set curr_dir=%cd%
 
 cd ..\..\msw
 
+rem VS2017 changes the build directory when environment batch files
+rem are called, so remember where we are building from.
+
+set build_dir=%cd%
+
+del ..\..\include\wx\msw\setup.h
+
 rem ================ wxWidgets Official Build ===============
 rem
 rem Open a command prompt and run this from the build\tools\msvs folder.
@@ -17,9 +24,12 @@ set compvers="Unknown"
 
 if "%1" == "vc141" (
   @echo Building for vc141 / vs2017
+  @echo This will only work if the environment varialbe VS150COMNTOOLS is set
+  @echo or a VS2017 command prompt is used.
   set comp=141
   set compvers=vc141
   call "%VS150COMNTOOLS%VsDevCmd.bat"
+  cd %build_dir%
 )
 if "%1" == "vc140" (
   @echo Building for vc140 / vs2015
@@ -80,11 +90,13 @@ del %compvers%x64_Release.txt
 
 if "%compvers%" == "vc141" call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64
 if "%compvers%" == "vc140" call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64
-if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x64
-if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x64
+if "%compvers%" == "vc120" call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
+if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
 if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X64 /Release
 if "%compvers%" == "vc90"  call "%WINDOWS61SDK%SetEnv.Cmd" /X64 /Release
 
+cd %build_dir%
+
 @echo 64 bit release build
 
 nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> %compvers%x64_Release.txt
@@ -107,6 +119,8 @@ if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Release
 if "%compvers%" == "vc90"  call "%WINDOWS61SDK%SetEnv.Cmd" /X86 /Release
 
+cd %build_dir%
+
 @echo 32 bit release build
 
 nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> %compvers%x86_Release.txt

From cf588d7a647aa30a83ad8ebff35649f5b80fde15 Mon Sep 17 00:00:00 2001
From: Danny Scott <doscott@doscott.ca>
Date: Fri, 2 Feb 2018 18:17:41 +0100
Subject: [PATCH 282/916] Handle current directory with MSVS 2017 in a better
 way

Set VSCMD_START_DIR to "%CD%" to prevent MSVS 2017 build scripts from
changing the directory.

See #18075.
---
 build/tools/msvs/officialbuild.bat | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/build/tools/msvs/officialbuild.bat b/build/tools/msvs/officialbuild.bat
index af1e4f2d62..4771bf9664 100755
--- a/build/tools/msvs/officialbuild.bat
+++ b/build/tools/msvs/officialbuild.bat
@@ -9,9 +9,7 @@ cd ..\..\msw
 rem VS2017 changes the build directory when environment batch files
 rem are called, so remember where we are building from.
 
-set build_dir=%cd%
-
-del ..\..\include\wx\msw\setup.h
+set "VSCMD_START_DIR=%CD%"
 
 rem ================ wxWidgets Official Build ===============
 rem
@@ -29,7 +27,6 @@ if "%1" == "vc141" (
   set comp=141
   set compvers=vc141
   call "%VS150COMNTOOLS%VsDevCmd.bat"
-  cd %build_dir%
 )
 if "%1" == "vc140" (
   @echo Building for vc140 / vs2015
@@ -95,8 +92,6 @@ if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd
 if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X64 /Release
 if "%compvers%" == "vc90"  call "%WINDOWS61SDK%SetEnv.Cmd" /X64 /Release
 
-cd %build_dir%
-
 @echo 64 bit release build
 
 nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> %compvers%x64_Release.txt
@@ -119,8 +114,6 @@ if "%compvers%" == "vc110" call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Release
 if "%compvers%" == "vc90"  call "%WINDOWS61SDK%SetEnv.Cmd" /X86 /Release
 
-cd %build_dir%
-
 @echo 32 bit release build
 
 nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> %compvers%x86_Release.txt

From d3d8778542f6662843a69c59068aa64e6b99ba70 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 2 Feb 2018 23:58:24 +0100
Subject: [PATCH 283/916] Reduce debug warnings of Direct2D Debug Layer

---
 src/msw/graphicsd2d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index 69a20f5730..5d562102b0 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -338,7 +338,7 @@ ID2D1Factory* wxD2D1Factory()
 #if defined(__WXDEBUG__) && defined(__VISUALC__) && wxCHECK_VISUALC_VERSION(11)
         if ( wxGetWinVersion() >= wxWinVersion_8 )
         {
-            factoryOptions.debugLevel = D2D1_DEBUG_LEVEL_INFORMATION;
+            factoryOptions.debugLevel = D2D1_DEBUG_LEVEL_WARNING;
         }
 #endif  //__WXDEBUG__
 

From 879b81aacff3aebf05be78c0a73ff215ef6dc783 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 15:29:26 +0100
Subject: [PATCH 284/916] Avoid bogus warning when running Expat configure

Skip docbook checks in Expat configure to speed it up a bit and, mainly,
to avoid the harmless but confusing

$wx/src/expat/expat/configure: line 16683: program: command not found

which was given when running it.
---
 src/expat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/expat b/src/expat
index a0c3149026..6b2e0e6802 160000
--- a/src/expat
+++ b/src/expat
@@ -1 +1 @@
-Subproject commit a0c31490268c5178c8b2273b19c44e64fb6c7dc7
+Subproject commit 6b2e0e680289cdf92839b2a3f8b0735c84dc9326

From 65589e8c68201e1e0bdb973f568acf4aaa1f6ffa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 17:59:50 +0100
Subject: [PATCH 285/916] Remove unneeded wxRendererNative::GetDefault() in
 render sample

This method is used to illustrate the difference between the default and
the overridden GetHeaderButton() implementations, but doesn't need to be
used for any other methods, that are not overridden in MyRenderer.

No real changes, but just make the code shorter and less confusing.
---
 samples/render/render.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index d626b301de..e1f68fe077 100644
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -223,6 +223,8 @@ private:
                                                                wxART_LIST);
         }
 
+        // Note that we need to use GetDefault() explicitly to show the default
+        // implementation.
         dc.DrawText("DrawHeaderButton() (default)", x1, y);
         wxRendererNative::GetDefault().DrawHeaderButton(this, dc,
                                   wxRect(x2, y, widthHdr, heightHdr), m_flags,
@@ -282,7 +284,7 @@ private:
         const wxCoord widthGauge = 180;
 
         dc.DrawText("DrawGauge()", x1, y);
-        wxRendererNative::GetDefault().DrawGauge(this, dc,
+        renderer.DrawGauge(this, dc,
             wxRect(x2, y, widthGauge, heightGauge), 25, 100, m_flags);
 
         y += lineHeight + heightGauge;
@@ -291,10 +293,10 @@ private:
         const wxCoord widthListItem = 260;
 
         dc.DrawText("DrawItemSelectionRect()", x1, y);
-        wxRendererNative::GetDefault().DrawItemSelectionRect(this, dc,
+        renderer.DrawItemSelectionRect(this, dc,
             wxRect(x2, y, widthListItem, heightListItem), m_flags | wxCONTROL_SELECTED);
 
-        wxRendererNative::GetDefault().DrawItemText(this, dc, "DrawItemText()",
+        renderer.DrawItemText(this, dc, "DrawItemText()",
             wxRect(x2, y, widthListItem, heightListItem).Inflate(-2, -2), m_align, m_flags | wxCONTROL_SELECTED);
 
         y += lineHeight + heightListItem;

From 359eda1359521725fdb428ea8cb3c3e01f2e7e17 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 18:02:31 +0100
Subject: [PATCH 286/916] Make render sample window bigger initially

It wasn't big enough to show all of its contents.
---
 samples/render/render.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index e1f68fe077..46a527e128 100644
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -424,9 +424,7 @@ bool MyApp::OnInit()
 MyFrame::MyFrame()
        : wxFrame(NULL,
                  wxID_ANY,
-                 wxT("Render wxWidgets Sample"),
-                 wxPoint(50, 50),
-                 wxSize(450, 340))
+                 wxT("Render wxWidgets Sample"))
 {
     // set the frame icon
     SetIcon(wxICON(sample));
@@ -481,6 +479,8 @@ MyFrame::MyFrame()
 
     m_panel = new MyPanel(this);
 
+    SetClientSize(600, 600);
+
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);

From 3284420b09754006d2f6cb45d85e950b0896c71b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 18:08:13 +0100
Subject: [PATCH 287/916] Add a menu option to use generic renderer in the
 sample

This makes it easier to compare the native and generic implementations
of the functions shown.
---
 samples/render/render.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index 46a527e128..2d899c58b6 100644
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -138,6 +138,7 @@ private:
     void OnUseIcon(wxCommandEvent& event);
     void OnUseBitmap(wxCommandEvent& event);
 
+    void OnUseGeneric(wxCommandEvent& event);
 #if wxUSE_DYNLIB_CLASS
     void OnLoad(wxCommandEvent& event);
     void OnUnload(wxCommandEvent& event);
@@ -163,7 +164,8 @@ public:
         m_flags = 0;
         m_align = wxALIGN_LEFT;
         m_useIcon =
-        m_useBitmap = false;
+        m_useBitmap =
+        m_useGeneric = false;
     }
 
     int GetFlags() const { return m_flags; }
@@ -172,13 +174,15 @@ public:
     void SetAlignment(int align) { m_align = align; }
     void SetUseIcon(bool useIcon) { m_useIcon = useIcon; }
     void SetUseBitmap(bool useBitmap) { m_useBitmap = useBitmap; }
+    void SetUseGeneric(bool useGeneric) { m_useGeneric = useGeneric; }
 
 private:
     void OnPaint(wxPaintEvent&)
     {
         wxPaintDC dc(this);
 
-        wxRendererNative& renderer = wxRendererNative::Get();
+        wxRendererNative& renderer = m_useGeneric ? wxRendererNative::GetGeneric()
+                                                  : wxRendererNative::Get();
 
         int x1 = 10,    // text offset
             x2 = 300,   // drawing offset
@@ -305,7 +309,8 @@ private:
     int m_flags;
     int m_align;
     bool m_useIcon,
-         m_useBitmap;
+         m_useBitmap,
+         m_useGeneric;
 
     wxDECLARE_EVENT_TABLE();
 };
@@ -337,6 +342,7 @@ enum
     Render_UseIcon,
     Render_UseBitmap,
 
+    Render_UseGeneric,
 #if wxUSE_DYNLIB_CLASS
     Render_Load,
     Render_Unload,
@@ -373,6 +379,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Render_UseIcon, MyFrame::OnUseIcon)
     EVT_MENU(Render_UseBitmap, MyFrame::OnUseBitmap)
 
+    EVT_MENU(Render_UseGeneric, MyFrame::OnUseGeneric)
 #if wxUSE_DYNLIB_CLASS
     EVT_MENU(Render_Load,  MyFrame::OnLoad)
     EVT_MENU(Render_Unload,MyFrame::OnUnload)
@@ -457,6 +464,7 @@ MyFrame::MyFrame()
     menuFile->AppendCheckItem(Render_UseBitmap, "Draw &bitmap\tCtrl-B");
     menuFile->AppendSeparator();
 
+    menuFile->AppendCheckItem(Render_UseGeneric, "Use &generic renderer\tCtrl-G");
 #if wxUSE_DYNLIB_CLASS
     menuFile->Append(Render_Load, wxT("&Load renderer...\tCtrl-L"));
     menuFile->Append(Render_Unload, wxT("&Unload renderer\tCtrl-U"));
@@ -528,6 +536,12 @@ void MyFrame::OnUseBitmap(wxCommandEvent& event)
     m_panel->Refresh();
 }
 
+void MyFrame::OnUseGeneric(wxCommandEvent& event)
+{
+    m_panel->SetUseGeneric(event.IsChecked());
+    m_panel->Refresh();
+}
+
 #if wxUSE_DYNLIB_CLASS
 
 void MyFrame::OnLoad(wxCommandEvent& WXUNUSED(event))

From fa41d06ccef75666ba3dc59a3ce043f83b2343fc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 18:21:36 +0100
Subject: [PATCH 288/916] Fix some harmless gcc 7 -Wimplicit-fallthrough
 warnings

Add wxFALLTHROUGH to avoid the warnings where fall-through is actually
desired.
---
 include/wx/private/wxprintf.h | 1 +
 src/common/list.cpp           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/include/wx/private/wxprintf.h b/include/wx/private/wxprintf.h
index f34d68495e..5854d894d7 100644
--- a/include/wx/private/wxprintf.h
+++ b/include/wx/private/wxprintf.h
@@ -302,6 +302,7 @@ bool wxPrintfConvSpec<CharType>::Parse(const CharType *format)
                     break;
                 }
                 // else: fall-through, 'I' is MSVC equivalent of C99 'z'
+                wxFALLTHROUGH;
 #endif      // __WINDOWS__
 
             case wxT('z'):
diff --git a/src/common/list.cpp b/src/common/list.cpp
index efaf12a195..decaf8bb36 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -51,6 +51,7 @@ bool wxListKey::operator==(wxListKeyValue value) const
             wxFAIL_MSG(wxT("bad key type."));
             // let compiler optimize the line above away in release build
             // by not putting return here...
+            wxFALLTHROUGH;
 
         case wxKEY_STRING:
             return *m_key.string == *value.string;

From 5f8f60107ad942657759f5769175f9a0973becad Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 18:12:13 +0100
Subject: [PATCH 289/916] Allow using wxRendererNative::DrawGauge() for
 vertical gauges too

It was unexpected that this method could only be used for horizontal
gauges, so make it work for the vertical ones if wxCONTROL_SPECIAL flag
is specified.

Update MSW and generic implementations and the render sample to show a
vertical gauge as well.
---
 docs/changes.txt          |  1 +
 include/wx/renderer.h     |  4 +++-
 interface/wx/renderer.h   |  2 ++
 samples/render/render.cpp |  5 +++++
 src/generic/renderg.cpp   | 13 +++++++++++--
 src/msw/renderer.cpp      | 19 +++++++++++++++----
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 41b4baba6d..5f1698d1b7 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -180,6 +180,7 @@ All (GUI):
 - Add "hint" property to wxSearchCtrl XRC handler.
 - Add wxEVT_SEARCH[_CANCEL] synonyms for wxSearchCtrl events.
 - Generate wxEVT_SEARCH on Enter under all platforms.
+- Extend wxRendererNative::DrawGauge() to work for vertical gauges too.
 
 wxGTK:
 
diff --git a/include/wx/renderer.h b/include/wx/renderer.h
index fd67b7a760..e816725bbf 100644
--- a/include/wx/renderer.h
+++ b/include/wx/renderer.h
@@ -333,7 +333,9 @@ public:
                                     int flags = 0) = 0;
 #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
 
-    // Draw a gauge with native style like a wxGauge would display
+    // Draw a gauge with native style like a wxGauge would display.
+    //
+    // wxCONTROL_SPECIAL flag must be used for drawing vertical gauges.
     virtual void DrawGauge(wxWindow* win,
                            wxDC& dc,
                            const wxRect& rect,
diff --git a/interface/wx/renderer.h b/interface/wx/renderer.h
index 92be723034..2a3772b78a 100644
--- a/interface/wx/renderer.h
+++ b/interface/wx/renderer.h
@@ -359,6 +359,8 @@ public:
         bar that is drawn as being filled in, @a max must be strictly positive
         and @a value must be between 0 and @a max.
 
+        @c wxCONTROL_SPECIAL must be set in @a flags for the vertical gauges.
+
         @since 3.1.0
      */
     virtual void DrawGauge(wxWindow* win,
diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index 2d899c58b6..1e4b819dcf 100644
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -284,12 +284,17 @@ private:
         y += lineHeight + rBtn.height;
 #endif // wxHAS_DRAW_TITLE_BAR_BITMAP
 
+        // The meanings of those are reversed for the vertical gauge below.
         const wxCoord heightGauge = 24;
         const wxCoord widthGauge = 180;
 
         dc.DrawText("DrawGauge()", x1, y);
         renderer.DrawGauge(this, dc,
             wxRect(x2, y, widthGauge, heightGauge), 25, 100, m_flags);
+        renderer.DrawGauge(this, dc,
+            wxRect(x2 + widthGauge + 30, y + heightGauge - widthGauge,
+                   heightGauge, widthGauge),
+            25, 100, m_flags | wxCONTROL_SPECIAL);
 
         y += lineHeight + heightGauge;
 
diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 1961141fc4..5cf2656cef 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -910,7 +910,7 @@ void wxRendererGeneric::DrawGauge(wxWindow* win,
                                   const wxRect& rect,
                                   int value,
                                   int max,
-                                  int WXUNUSED(flags))
+                                  int flags)
 {
     // Use same background as text controls.
     DrawTextCtrl(win, dc, rect);
@@ -918,7 +918,16 @@ void wxRendererGeneric::DrawGauge(wxWindow* win,
     // Calculate the progress bar size.
     wxRect progRect(rect);
     progRect.Deflate(2);
-    progRect.width = wxMulDivInt32(progRect.width, value, max);
+    if ( flags & wxCONTROL_SPECIAL )
+    {
+        const int h = wxMulDivInt32(progRect.height, value, max);
+        progRect.y += progRect.height - h;
+        progRect.height = h;
+    }
+    else // Horizontal.
+    {
+        progRect.width = wxMulDivInt32(progRect.width, value, max);
+    }
 
     dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
     dc.SetPen(*wxTRANSPARENT_PEN);
diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index fff5432e6d..7935e05dcc 100644
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -1098,7 +1098,7 @@ void wxRendererXP::DrawGauge(wxWindow* win,
     ::DrawThemeBackground(
         hTheme,
         GetHdcOf(dc.GetTempHDC()),
-        PP_BAR,
+        flags & wxCONTROL_SPECIAL ? PP_BARVERT : PP_BAR,
         0,
         &r,
         NULL);
@@ -1107,20 +1107,31 @@ void wxRendererXP::DrawGauge(wxWindow* win,
     ::GetThemeBackgroundContentRect(
         hTheme,
         GetHdcOf(dc.GetTempHDC()),
-        PP_BAR,
+        flags & wxCONTROL_SPECIAL ? PP_BARVERT : PP_BAR,
         0,
         &r,
         &contentRect);
 
-    contentRect.right = contentRect.left +
+    if ( flags & wxCONTROL_SPECIAL )
+    {
+        // For a vertical gauge, the value grows from the bottom to the top.
+        contentRect.top = contentRect.bottom -
+                          wxMulDivInt32(contentRect.bottom - contentRect.top,
+                                        value,
+                                        max);
+    }
+    else // Horizontal.
+    {
+        contentRect.right = contentRect.left +
                             wxMulDivInt32(contentRect.right - contentRect.left,
                                           value,
                                           max);
+    }
 
     ::DrawThemeBackground(
         hTheme,
         GetHdcOf(dc.GetTempHDC()),
-        PP_CHUNK,
+        flags & wxCONTROL_SPECIAL ? PP_CHUNKVERT : PP_CHUNK,
         0,
         &contentRect,
         NULL);

From f8674c7ff034e759a7edc68a5bbe274f15d74875 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 23:30:31 +0100
Subject: [PATCH 290/916] Remove unnecessary check for gs_deferredFocusOut

GTKHandleDeferredFocusOut() is only ever called when gs_deferredFocusOut
is non-null, so there is no need to check for it inside this function
again.

No real changes.
---
 src/gtk/window.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index a75c861f2e..b6182ede53 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4465,17 +4465,14 @@ void wxWindowGTK::GTKHandleDeferredFocusOut()
     // NB: See GTKHandleFocusOut() for explanation. This function is called
     //     from either GTKHandleFocusIn() or OnInternalIdle() to process
     //     deferred event.
-    if ( gs_deferredFocusOut )
-    {
-        wxWindowGTK *win = gs_deferredFocusOut;
-        gs_deferredFocusOut = NULL;
+    wxWindowGTK *win = gs_deferredFocusOut;
+    gs_deferredFocusOut = NULL;
 
-        wxLogTrace(TRACE_FOCUS,
-                   "processing deferred focus_out event for %s(%p, %s)",
-                   win->GetClassInfo()->GetClassName(), win, win->GetLabel());
+    wxLogTrace(TRACE_FOCUS,
+               "processing deferred focus_out event for %s(%p, %s)",
+               win->GetClassInfo()->GetClassName(), win, win->GetLabel());
 
-        win->GTKHandleFocusOutNoDeferring();
-    }
+    win->GTKHandleFocusOutNoDeferring();
 }
 
 void wxWindowGTK::SetFocus()

From 1148b2e0fe99698293cd63f56646fc3ebd31e011 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 23:56:44 +0100
Subject: [PATCH 291/916] Make GTKHandleDeferredFocusOut() non-static

Slightly simplify the code by making it a member function.

No real changes.
---
 include/wx/gtk/window.h |  2 +-
 src/gtk/window.cpp      | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index d7b55ae685..2430773c43 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -199,7 +199,7 @@ public:
     bool GTKHandleFocusIn();
     bool GTKHandleFocusOut();
     void GTKHandleFocusOutNoDeferring();
-    static void GTKHandleDeferredFocusOut();
+    void GTKHandleDeferredFocusOut();
 
     // Called when m_widget becomes realized. Derived classes must call the
     // base class method if they override it.
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index b6182ede53..1f1c6244ec 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3828,7 +3828,7 @@ bool wxWindowGTK::GTKShowFromOnIdle()
 void wxWindowGTK::OnInternalIdle()
 {
     if ( gs_deferredFocusOut )
-        GTKHandleDeferredFocusOut();
+        gs_deferredFocusOut->GTKHandleDeferredFocusOut();
 
     // Check if we have to show window now
     if (GTKShowFromOnIdle()) return;
@@ -4348,7 +4348,7 @@ bool wxWindowGTK::GTKHandleFocusIn()
         // otherwise we need to send focus-out first
         wxASSERT_MSG ( gs_deferredFocusOut != this,
                        "GTKHandleFocusIn(GTKFocus_Normal) called even though focus changed back to itself - derived class should handle this" );
-        GTKHandleDeferredFocusOut();
+        gs_deferredFocusOut->GTKHandleDeferredFocusOut();
     }
 
 
@@ -4459,20 +4459,18 @@ void wxWindowGTK::GTKHandleFocusOutNoDeferring()
     GTKProcessEvent( event );
 }
 
-/*static*/
 void wxWindowGTK::GTKHandleDeferredFocusOut()
 {
     // NB: See GTKHandleFocusOut() for explanation. This function is called
     //     from either GTKHandleFocusIn() or OnInternalIdle() to process
-    //     deferred event.
-    wxWindowGTK *win = gs_deferredFocusOut;
+    //     deferred event for this window.
     gs_deferredFocusOut = NULL;
 
     wxLogTrace(TRACE_FOCUS,
                "processing deferred focus_out event for %s(%p, %s)",
-               win->GetClassInfo()->GetClassName(), win, win->GetLabel());
+               GetClassInfo()->GetClassName(), this, GetLabel());
 
-    win->GTKHandleFocusOutNoDeferring();
+    GTKHandleFocusOutNoDeferring();
 }
 
 void wxWindowGTK::SetFocus()

From bfd3f1b33fac8ca48656fb5a97719acdc6796e62 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 31 Jan 2018 23:47:15 +0100
Subject: [PATCH 292/916] Fix some typos in wxDataViewCtrl documentation

No real changes.
---
 interface/wx/dataview.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 8d087a9367..e98ab8a387 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -155,7 +155,8 @@ public:
         @param column
             The column holding the items to be compared.
         @param ascending
-            The sort is being peformed in ascending or descending order.
+            Indicates whether the sort is being performed in ascending or
+            descending order.
         @return
             For an ascending comparison: a negative value if the item1 is less
             than (i.e. should appear above) item2, zero if the two items are
@@ -163,11 +164,12 @@ public:
             appear below) the second one. The reverse for a descending
             comparison.
         @note If there can be multiple rows with the same value, consider
-            differentiating them form each other by their ID's rather than
+            differentiating them form each other by their IDs rather than
             returning zero. This to prevent rows with the same value jumping
             positions when items are added etc. For example:
         @code
-            // Differentiate items with the same value.
+            // Note that we need to distinguish between items with the same
+            // value.
             wxUIntPtr id1 = wxPtrToUInt(item1.GetID()),
                       id2 = wxPtrToUInt(item2.GetID());
 
@@ -1956,7 +1958,7 @@ public:
 
     /**
         Sets the alignment of the renderer's content.
-        The default value of @c wxDVR_DEFAULT_ALIGMENT indicates that the content
+        The default value of @c wxDVR_DEFAULT_ALIGNMENT indicates that the content
         should have the same alignment as the column header.
 
         The method is not implemented under OS X and the renderer always aligns

From 945cec4be14af13fd073dfc06d659ca1d2aaf1cd Mon Sep 17 00:00:00 2001
From: mikek <mikek@trac.wxwidgets.org>
Date: Thu, 1 Feb 2018 01:02:56 +0100
Subject: [PATCH 293/916] Refresh generic wxDataViewCtrl after disabling it

Grey the control out immediately, instead of waiting until the next
refresh to do it.

Closes #17887.
---
 include/wx/generic/dataview.h |  2 +-
 src/generic/datavgen.cpp      | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index f4ebc64cae..5efc0e1eec 100644
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -257,10 +257,10 @@ public:
 
 #if wxUSE_ACCESSIBILITY
     virtual bool Show(bool show = true) wxOVERRIDE;
-    virtual bool Enable(bool enable = true) wxOVERRIDE;
     virtual void SetName(const wxString &name) wxOVERRIDE;
     virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE;
 #endif // wxUSE_ACCESSIBILITY
+    virtual bool Enable(bool enable = true) wxOVERRIDE;
 
     virtual bool AllowMultiColumnSort(bool allow) wxOVERRIDE;
     virtual bool IsMultiColumnSortAllowed() const wxOVERRIDE { return m_allowMultiColumnSort; }
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 9a4f08276e..34fdcc7409 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -5228,17 +5228,6 @@ bool wxDataViewCtrl::Show(bool show)
     return changed;
 }
 
-bool wxDataViewCtrl::Enable(bool enable)
-{
-    bool changed = wxControl::Enable(enable);
-    if ( changed )
-    {
-        wxAccessible::NotifyEvent(wxACC_EVENT_OBJECT_STATECHANGE, this, wxOBJID_CLIENT, wxACC_SELF);
-    }
-
-    return changed;
-}
-
 void wxDataViewCtrl::SetName(const wxString &name)
 {
     wxControl::SetName(name);
@@ -5257,6 +5246,20 @@ bool wxDataViewCtrl::Reparent(wxWindowBase *newParent)
 }
 #endif // wxUSE_ACCESIBILITY
 
+bool wxDataViewCtrl::Enable(bool enable)
+{
+    bool changed = wxControl::Enable(enable);
+    if ( changed )
+    {
+#if wxUSE_ACCESSIBILITY
+        wxAccessible::NotifyEvent(wxACC_EVENT_OBJECT_STATECHANGE, this, wxOBJID_CLIENT, wxACC_SELF);
+#endif // wxUSE_ACCESIBILITY
+        Refresh();
+    }
+
+    return changed;
+}
+
 bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model )
 {
     if (!wxDataViewCtrlBase::AssociateModel( model ))

From 0d14dd8fe09e2a43eec043b798583e1f32fe3e16 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 1 Feb 2018 01:05:17 +0100
Subject: [PATCH 294/916] Test disabling wxDataViewCtrl in the dataview sample

Just make it simple to verify whether disabling the control works as
expected.

See #14186.

See #17887.
---
 samples/dataview/dataview.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index a53b1c7be3..77af616a00 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -84,6 +84,7 @@ private:
     void OnCustomHeaderHeight(wxCommandEvent& event);
 #endif // wxHAS_GENERIC_DATAVIEWCTRL
     void OnGetPageInfo(wxCommandEvent& event);
+    void OnDisable(wxCommandEvent& event);
     void OnSetForegroundColour(wxCommandEvent& event);
     void OnIncIndent(wxCommandEvent& event);
     void OnDecIndent(wxCommandEvent& event);
@@ -307,6 +308,7 @@ enum
 {
     ID_CLEARLOG = wxID_HIGHEST+1,
     ID_GET_PAGE_INFO,
+    ID_DISABLE,
     ID_BACKGROUND_COLOUR,
     ID_FOREGROUND_COLOUR,
     ID_CUSTOM_HEADER_ATTR,
@@ -367,6 +369,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU( ID_CLEARLOG, MyFrame::OnClearLog )
 
     EVT_MENU( ID_GET_PAGE_INFO, MyFrame::OnGetPageInfo )
+    EVT_MENU( ID_DISABLE, MyFrame::OnDisable )
     EVT_MENU( ID_FOREGROUND_COLOUR, MyFrame::OnSetForegroundColour )
     EVT_MENU( ID_BACKGROUND_COLOUR, MyFrame::OnSetBackgroundColour )
     EVT_MENU( ID_CUSTOM_HEADER_ATTR, MyFrame::OnCustomHeaderAttr )
@@ -460,6 +463,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
     wxMenu *file_menu = new wxMenu;
     file_menu->Append(ID_CLEARLOG, "&Clear log\tCtrl-L");
     file_menu->Append(ID_GET_PAGE_INFO, "Show current &page info");
+    file_menu->AppendCheckItem(ID_DISABLE, "&Disable\tCtrl-D");
     file_menu->Append(ID_FOREGROUND_COLOUR, "Set &foreground colour...\tCtrl-S");
     file_menu->Append(ID_BACKGROUND_COLOUR, "Set &background colour...\tCtrl-B");
     file_menu->AppendCheckItem(ID_CUSTOM_HEADER_ATTR, "C&ustom header attributes");
@@ -830,6 +834,11 @@ void MyFrame::OnGetPageInfo(wxCommandEvent& WXUNUSED(event))
                  dvc->GetCountPerPage());
 }
 
+void MyFrame::OnDisable(wxCommandEvent& event)
+{
+    m_ctrl[m_notebook->GetSelection()]->Enable(!event.IsChecked());
+}
+
 void MyFrame::OnSetForegroundColour(wxCommandEvent& WXUNUSED(event))
 {
     wxDataViewCtrl * const dvc = m_ctrl[m_notebook->GetSelection()];
@@ -934,6 +943,8 @@ void MyFrame::OnPageChanged( wxBookCtrlEvent& WXUNUSED(event) )
 
         GetMenuBar()->FindItem(id)->Check( m_ctrl[nPanel]->HasFlag(style) );
     }
+
+    GetMenuBar()->FindItem(ID_DISABLE)->Check(!m_ctrl[nPanel]->IsEnabled());
 }
 
 void MyFrame::OnStyleChange( wxCommandEvent& WXUNUSED(event) )

From f1087d7fd51a1238a484c7e2761f62a5f9e04776 Mon Sep 17 00:00:00 2001
From: mikek <mikek@trac.wxwidgets.org>
Date: Thu, 1 Feb 2018 01:14:18 +0100
Subject: [PATCH 295/916] Fix missing selection event in generic wxDataViewCtrl

No event was sent if the selection was narrowed by clicking on an
already selected item without any key modifiers pressed.

Fix this by generating an event always on click and not only when
selecting a new item.

Closes #17881.
---
 docs/changes.txt         | 1 +
 src/generic/datavgen.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 5f1698d1b7..1c82160ae2 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -248,6 +248,7 @@ wxMSW:
 - Fix focus-related problems when using native wxProgressDialog.
 - Fix crash when reparenting the currently focused window to another TLW.
 - Fix sending wxEVT_TEXT_ENTER when using auto-completion (Dubby).
+- Fix missing selection event on click in multiselection wxDataViewCtrl (mikek).
 
 wxOSX:
 
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 34fdcc7409..79daf5517d 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -4728,9 +4728,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             if ( UnselectAllRows(m_lineSelectSingleOnUp) )
             {
                 SelectRow( m_lineSelectSingleOnUp, true );
-                SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );
             }
-            //else: it was already selected, nothing to do
+
+            SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) );
         }
 
         // If the user click the expander, we do not do editing even if the column

From 0b1acae0a76829cd736f57b9b27cb2ca9ff0b3ca Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 14:40:40 +0100
Subject: [PATCH 296/916] Fix drawing of expander buttons in wxDataViewCtrl
 under MSW

The buttons were truncated, making them look ugly, because we didn't
allocate enough space for them. Instead of complicating generic
wxDataViewCtrl code even further with more MSW-specific code, just let
DrawItemTreeButton() center the expander itself in the space allocated
for it.

This still involves guessing the width of the expander, but this doesn't
need to be done as precisely, so it's still an advantage. Note that
previously calculating expander size involved m_lineHeight, for some
reason, but now we use GetCharWidth() for it, which is more appropriate.

Closes #17863.
---
 src/generic/datavgen.cpp | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 79daf5517d..801f9dd2ed 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -75,15 +75,6 @@ static const int SCROLL_UNIT_X = 15;
 // the cell padding on the left/right
 static const int PADDING_RIGHTLEFT = 3;
 
-// the expander space margin
-static const int EXPANDER_MARGIN = 4;
-
-#ifdef __WXMSW__
-static const int EXPANDER_OFFSET = 4;
-#else
-static const int EXPANDER_OFFSET = 1;
-#endif
-
 namespace
 {
 
@@ -2540,23 +2531,20 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 // Calculate the indent first
                 indent = GetOwner()->GetIndent() * node->GetIndentLevel();
 
-                // we reserve m_lineHeight of horizontal space for the expander
-                // but leave EXPANDER_MARGIN around the expander itself
-                int exp_x = cell_rect.x + indent + EXPANDER_MARGIN;
+                // We don't have any method to return the size of the expander
+                // button currently (TODO: add one to wxRendererNative), so
+                // just guesstimate it.
+                const int expWidth = 3*dc.GetCharWidth();
 
-                indent += m_lineHeight;
-
-                // draw expander if needed and visible
-                if ( node->HasChildren() && exp_x < cell_rect.GetRight() )
+                // draw expander if needed
+                if ( node->HasChildren() )
                 {
                     dc.SetPen( m_penExpander );
                     dc.SetBrush( wxNullBrush );
 
-                    int exp_size = m_lineHeight - 2*EXPANDER_MARGIN;
-                    int exp_y = cell_rect.y + (cell_rect.height - exp_size)/2
-                                   + EXPANDER_MARGIN - EXPANDER_OFFSET;
-
-                    const wxRect rect(exp_x, exp_y, exp_size, exp_size);
+                    wxRect rect = cell_rect;
+                    rect.x += indent;
+                    rect.width = expWidth;
 
                     int flag = 0;
                     if ( m_underMouse == node )
@@ -2571,6 +2559,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                     wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
                 }
 
+                indent += expWidth;
+
                 // force the expander column to left-center align
                 cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
             }

From fd73ae16237f0800fa15f32c93f7a94bf074850a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 15:05:46 +0100
Subject: [PATCH 297/916] Add wxHD_BITMAP_ON_RIGHT style to wxHeaderCtrl

Implement this style for wxMSW to allow putting the column images on the
right side, for consistency with wxMSW wxListCtrl.

See #13350.
---
 docs/changes.txt          | 1 +
 include/wx/headerctrl.h   | 3 +++
 interface/wx/headerctrl.h | 8 ++++++++
 src/msw/headerctrl.cpp    | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index 1c82160ae2..99680a7aac 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -181,6 +181,7 @@ All (GUI):
 - Add wxEVT_SEARCH[_CANCEL] synonyms for wxSearchCtrl events.
 - Generate wxEVT_SEARCH on Enter under all platforms.
 - Extend wxRendererNative::DrawGauge() to work for vertical gauges too.
+- Add wxHD_BITMAP_ON_RIGHT style to wxHeaderCtrl.
 
 wxGTK:
 
diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index 928ed7aa5e..f491fcbc7a 100644
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -37,6 +37,9 @@ enum
     // right clicking the header
     wxHD_ALLOW_HIDE = 0x0002,
 
+    // force putting column images on right
+    wxHD_BITMAP_ON_RIGHT = 0x0004,
+
     // style used by default when creating the control
     wxHD_DEFAULT_STYLE = wxHD_ALLOW_REORDER
 };
diff --git a/interface/wx/headerctrl.h b/interface/wx/headerctrl.h
index 662d20df0e..8a9907d546 100644
--- a/interface/wx/headerctrl.h
+++ b/interface/wx/headerctrl.h
@@ -17,6 +17,9 @@ enum
     // right clicking the header
     wxHD_ALLOW_HIDE = 0x0002,
 
+    // force putting column images on right
+    wxHD_BITMAP_ON_RIGHT = 0x0004,
+
     // style used by default when creating the control
     wxHD_DEFAULT_STYLE = wxHD_ALLOW_REORDER
 };
@@ -76,6 +79,11 @@ enum
         user to change the columns visibility on right mouse click. Notice that
         the program can always hide or show the columns, this style only
         affects the users capability to do it.
+    @style{wxHD_BITMAP_ON_RIGHT}
+        The column image, if any, will be shown on the right side if this style
+        is used. Note that this style is only implemented in wxMSW currently
+        and doesn't do anything under the other platforms. It is available
+        since wxWidgets 3.1.1.
     @style{wxHD_DEFAULT_STYLE}
         Symbolic name for the default control style, currently equal to
         @c wxHD_ALLOW_REORDER.
diff --git a/src/msw/headerctrl.cpp b/src/msw/headerctrl.cpp
index 267775f582..1694a8e288 100644
--- a/src/msw/headerctrl.cpp
+++ b/src/msw/headerctrl.cpp
@@ -314,6 +314,9 @@ void wxHeaderCtrl::DoInsertItem(const wxHeaderColumn& col, unsigned int idx)
     {
         hdi.mask |= HDI_IMAGE;
 
+        if ( HasFlag(wxHD_BITMAP_ON_RIGHT) )
+            hdi.fmt |= HDF_BITMAP_ON_RIGHT;
+
         if ( bmp.IsOk() )
         {
             const int bmpWidth = bmp.GetWidth(),

From 2600bc34ffd0647d7450024df3b20d95e52f9836 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 15:08:29 +0100
Subject: [PATCH 298/916] Put column images on the right side in generic
 wxDataViewCtrl

For consistency with wxListCtrl under MSW (which is the only platform
where this change has any effect, as wxHD_BITMAP_ON_RIGHT is only
supported there), put the column images on the right side in
wxDataViewCtrl too.

Closes #13350.
---
 samples/dataview/dataview.cpp | 2 ++
 src/generic/datavgen.cpp      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 77af616a00..26773c624d 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -23,6 +23,7 @@
     #include "wx/wx.h"
 #endif
 
+#include "wx/artprov.h"
 #include "wx/dataview.h"
 #include "wx/datetime.h"
 #include "wx/splitter.h"
@@ -689,6 +690,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             wxDataViewColumn *column5 =
                 new wxDataViewColumn( "custom", cr, 5, -1, wxALIGN_LEFT,
                                       wxDATAVIEW_COL_RESIZABLE );
+            column5->SetBitmap(wxArtProvider::GetBitmap(wxART_INFORMATION, wxART_MENU));
             m_ctrl[0]->AppendColumn( column5 );
 
 
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 801f9dd2ed..2dff6c1e3d 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -264,7 +264,9 @@ class wxDataViewHeaderWindow : public wxHeaderCtrl
 {
 public:
     wxDataViewHeaderWindow(wxDataViewCtrl *parent)
-        : wxHeaderCtrl(parent)
+        : wxHeaderCtrl(parent, wxID_ANY,
+                       wxDefaultPosition, wxDefaultSize,
+                       wxHD_DEFAULT_STYLE | wxHD_BITMAP_ON_RIGHT)
     {
     }
 

From 4b69c1a71899df6d8eb73a1d0899f38a1f3918e2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 15:35:20 +0100
Subject: [PATCH 299/916] Remove m_penExpander from generic wxDataViewCtrl code

This pen was never used as wxRendererNative::DrawTreeItemButton() always
uses its own colours, even in the generic version.
---
 src/generic/datavgen.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 2dff6c1e3d..95a056e350 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -932,9 +932,6 @@ private:
     // the pen used to draw horiz/vertical rules
     wxPen m_penRule;
 
-    // the pen used to draw the expander and the lines
-    wxPen m_penExpander;
-
     // This is the tree structure of the model
     wxDataViewTreeNode * m_root;
     int m_count;
@@ -1959,10 +1956,6 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
 
     m_penRule = wxPen(GetRuleColour());
 
-    // compose a pen whichcan draw black lines
-    // TODO: maybe there is something system colour to use
-    m_penExpander = wxPen(wxColour(0,0,0));
-
     m_root = wxDataViewTreeNode::CreateRootNode();
 
     // Make m_count = -1 will cause the class recaculate the real displaying number of rows.
@@ -2541,9 +2534,6 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
                 // draw expander if needed
                 if ( node->HasChildren() )
                 {
-                    dc.SetPen( m_penExpander );
-                    dc.SetBrush( wxNullBrush );
-
                     wxRect rect = cell_rect;
                     rect.x += indent;
                     rect.width = expWidth;

From 30f73aea6af19df18bfcf7ba394e357ced5ace62 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 19:21:46 +0100
Subject: [PATCH 300/916] Make using custom colour for
 wxDataViewProgressRenderer work again

This used to work in 3.0, but got broken with the switch to using a
native function for rendering the gauge in generic wxDataViewCtrl
86cf756ba95be9ac6988bc466b462e899edf5c4b (see #16406).

Restore it now, even if it requires not one, but two hacks: one at
wxRendererGeneric level to guess whether a custom colour is being used
or not by examining wxDC::GetBackground(), and the other one in
wxDataViewProgressRenderer itself to fall back to wxRendererGeneric if
the colour is specified. But it is arguably worth doing this to fix the
regression, even if it would be nice to provide a better API instead
(see #18076).

Closes #17885.
---
 src/generic/datavgen.cpp | 13 ++++++++++++-
 src/generic/renderg.cpp  | 14 +++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 95a056e350..d9840af8ab 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1373,7 +1373,18 @@ wxString wxDataViewProgressRenderer::GetAccessibleDescription() const
 bool
 wxDataViewProgressRenderer::Render(wxRect rect, wxDC *dc, int WXUNUSED(state))
 {
-    wxRendererNative::Get().DrawGauge(
+    const wxDataViewItemAttr& attr = GetAttr();
+    if ( attr.HasColour() )
+        dc->SetBackground(attr.GetColour());
+
+    // This is a hack, but native renderers don't support using custom colours,
+    // but typically gauge colour is important (e.g. it's commonly green/red to
+    // indicate some qualitative difference), so we fall back to the generic
+    // implementation which looks ugly but does support using custom colour.
+    wxRendererNative& renderer = attr.HasColour()
+                                    ? wxRendererNative::GetGeneric()
+                                    : wxRendererNative::Get();
+    renderer.DrawGauge(
         GetOwner()->GetOwner(),
         *dc,
         rect,
diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 5cf2656cef..fc2f39645d 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -912,6 +912,18 @@ void wxRendererGeneric::DrawGauge(wxWindow* win,
                                   int max,
                                   int flags)
 {
+    // This is a hack, but we want to allow customizing the colour used for the
+    // gauge body, as this is important for the generic wxDataViewCtrl
+    // implementation which uses this method. So we assume that if the caller
+    // had set up a brush using background colour different from the default,
+    // it should be used. Otherwise we use the default one.
+    const wxBrush& bg = dc.GetBackground();
+    wxColour colBar;
+    if ( bg.IsOk() && bg.GetColour() != win->GetBackgroundColour() )
+        colBar = bg.GetColour();
+    else
+        colBar = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+
     // Use same background as text controls.
     DrawTextCtrl(win, dc, rect);
 
@@ -929,7 +941,7 @@ void wxRendererGeneric::DrawGauge(wxWindow* win,
         progRect.width = wxMulDivInt32(progRect.width, value, max);
     }
 
-    dc.SetBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+    dc.SetBrush(colBar);
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.DrawRectangle(progRect);
 }

From bb0a2952b19ff4b42a62c8ed8ed8ee36a5ab92f6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 20:00:08 +0100
Subject: [PATCH 301/916] Replace macros with wxVector<> for
 wxDataViewModelNotifiers

Don't use deprecated macro-based linked list class, use wxVector<>
instead for m_notifiers.

Also make it private, as it should have been from the beginning.
---
 include/wx/dataview.h   | 11 ++++++-----
 src/common/datavcmn.cpp | 28 +++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 304864aab1..a3547fb13c 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -27,6 +27,7 @@
 #include "wx/dataobj.h"
 #include "wx/withimages.h"
 #include "wx/systhemectrl.h"
+#include "wx/vector.h"
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 class wxItemAttr;
@@ -179,8 +180,7 @@ private:
 // wxDataViewModel
 // ---------------------------------------------------------
 
-WX_DECLARE_LIST_WITH_DECL(wxDataViewModelNotifier, wxDataViewModelNotifiers,
-                          class WXDLLIMPEXP_ADV);
+typedef wxVector<wxDataViewModelNotifier*> wxDataViewModelNotifiers;
 
 class WXDLLIMPEXP_ADV wxDataViewModel: public wxRefCounter
 {
@@ -273,8 +273,9 @@ public:
     virtual bool IsVirtualListModel() const { return false; }
 
 protected:
-    // the user should not delete this class directly: he should use DecRef() instead!
-    virtual ~wxDataViewModel() { }
+    // Dtor is protected because the objects of this class must not be deleted,
+    // DecRef() must be used instead.
+    virtual ~wxDataViewModel();
 
     // Helper function used by the default Compare() implementation to compare
     // values of types it is not aware about. Can be overridden in the derived
@@ -285,7 +286,7 @@ protected:
         return 0;
     }
 
-
+private:
     wxDataViewModelNotifiers  m_notifiers;
 };
 
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 0f2ccc24b8..117dec03e3 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -95,9 +95,6 @@ wxFont wxDataViewItemAttr::GetEffectiveFont(const wxFont& font) const
 // wxDataViewModelNotifier
 // ---------------------------------------------------------
 
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewModelNotifiers)
-
 bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items )
 {
     size_t count = items.GetCount();
@@ -134,7 +131,15 @@ bool wxDataViewModelNotifier::ItemsChanged( const wxDataViewItemArray &items )
 
 wxDataViewModel::wxDataViewModel()
 {
-    m_notifiers.DeleteContents( true );
+}
+
+wxDataViewModel::~wxDataViewModel()
+{
+    wxDataViewModelNotifiers::const_iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        delete *iter;
+    }
 }
 
 bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
@@ -305,7 +310,20 @@ void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier )
 
 void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
 {
-    m_notifiers.DeleteObject( notifier );
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        if ( *iter == notifier )
+        {
+            delete notifier;
+            m_notifiers.erase(iter);
+
+            // Skip the assert below.
+            return;
+        }
+    }
+
+    wxFAIL_MSG(wxS("Removing non-registered notifier"));
 }
 
 int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

From 342388a456b22cc7c1a25ef68017b66f178ba3c9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 20:19:14 +0100
Subject: [PATCH 302/916] Use wxCHECK_MSG() instead of wxLogError in
 wxDataViewTreeStore

This is a check for a programming error and should never be shown to the
user, so assert that the items being compared in wxDataViewTreeStore are
under the same parent instead of using wxLogError.
---
 src/common/datavcmn.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 117dec03e3..c8d82f4131 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -2770,16 +2770,11 @@ int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewI
     if (!node1 || !node2)
         return 0;
 
-    wxDataViewTreeStoreContainerNode* parent1 =
+    wxDataViewTreeStoreContainerNode* const parent =
         (wxDataViewTreeStoreContainerNode*) node1->GetParent();
-    wxDataViewTreeStoreContainerNode* parent2 =
-        (wxDataViewTreeStoreContainerNode*) node2->GetParent();
 
-    if (parent1 != parent2)
-    {
-        wxLogError( wxT("Comparing items with different parent.") );
-        return 0;
-    }
+    wxCHECK_MSG( node2->GetParent() == parent, 0
+                 wxS("Comparing items with different parent.") );
 
     if (node1->IsContainer() && !node2->IsContainer())
         return -1;

From f7e592b33506440dac18b7f61eb7b9d3c43c5c71 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 20:35:38 +0100
Subject: [PATCH 303/916] Use wxVector for storing wxDataViewTreeStoreNodes

Replace the use of wxList macros with wxVector.

Also make wxDataViewTreeStore::Compare() slightly more efficient by
iterating over the children list only once instead of doing it twice.
---
 include/wx/dataview.h   | 13 +++---
 src/common/datavcmn.cpp | 90 ++++++++++++++++++++++++++++++-----------
 2 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index a3547fb13c..9162cd9d0d 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -1212,8 +1212,7 @@ private:
     wxClientData             *m_data;
 };
 
-WX_DECLARE_LIST_WITH_DECL(wxDataViewTreeStoreNode, wxDataViewTreeStoreNodeList,
-                          class WXDLLIMPEXP_ADV);
+typedef wxVector<wxDataViewTreeStoreNode*> wxDataViewTreeStoreNodes;
 
 class WXDLLIMPEXP_ADV wxDataViewTreeStoreContainerNode: public wxDataViewTreeStoreNode
 {
@@ -1223,11 +1222,13 @@ public:
         wxClientData *data = NULL );
     virtual ~wxDataViewTreeStoreContainerNode();
 
-    const wxDataViewTreeStoreNodeList &GetChildren() const
+    const wxDataViewTreeStoreNodes &GetChildren() const
         { return m_children; }
-    wxDataViewTreeStoreNodeList &GetChildren()
+    wxDataViewTreeStoreNodes &GetChildren()
         { return m_children; }
 
+    wxDataViewTreeStoreNodes::iterator FindChild(wxDataViewTreeStoreNode* node);
+
     void SetExpandedIcon( const wxIcon &icon )
         { m_iconExpanded = icon; }
     const wxIcon &GetExpandedIcon() const
@@ -1241,8 +1242,10 @@ public:
     virtual bool IsContainer() wxOVERRIDE
         { return true; }
 
+    void DestroyChildren();
+
 private:
-    wxDataViewTreeStoreNodeList  m_children;
+    wxDataViewTreeStoreNodes     m_children;
     wxIcon                       m_iconExpanded;
     bool                         m_isExpanded;
 };
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index c8d82f4131..a0519fab0d 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -2439,9 +2439,6 @@ wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode()
         delete m_data;
 }
 
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewTreeStoreNodeList)
-
 wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode(
         wxDataViewTreeStoreNode *parent, const wxString &text,
         const wxIcon &icon, const wxIcon &expanded, wxClientData *data )
@@ -2449,11 +2446,35 @@ wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode(
     , m_iconExpanded(expanded)
 {
     m_isExpanded = false;
-    m_children.DeleteContents(true);
 }
 
 wxDataViewTreeStoreContainerNode::~wxDataViewTreeStoreContainerNode()
 {
+    DestroyChildren();
+}
+
+wxDataViewTreeStoreNodes::iterator
+wxDataViewTreeStoreContainerNode::FindChild(wxDataViewTreeStoreNode* node)
+{
+    wxDataViewTreeStoreNodes::iterator iter;
+    for (iter = m_children.begin(); iter != m_children.end(); ++iter)
+    {
+        if ( *iter == node )
+            break;
+    }
+
+    return iter;
+}
+
+void wxDataViewTreeStoreContainerNode::DestroyChildren()
+{
+    wxDataViewTreeStoreNodes::const_iterator iter;
+    for (iter = m_children.begin(); iter != m_children.end(); ++iter)
+    {
+        delete *iter;
+    }
+
+    m_children.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -2476,7 +2497,7 @@ wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent,
 
     wxDataViewTreeStoreNode *node =
         new wxDataViewTreeStoreNode( parent_node, text, icon, data );
-    parent_node->GetChildren().Append( node );
+    parent_node->GetChildren().push_back( node );
 
     return node->GetItem();
 }
@@ -2489,7 +2510,8 @@ wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent,
 
     wxDataViewTreeStoreNode *node =
         new wxDataViewTreeStoreNode( parent_node, text, icon, data );
-    parent_node->GetChildren().Insert( node );
+    wxDataViewTreeStoreNodes& children = parent_node->GetChildren();
+    children.insert(children.begin(), node);
 
     return node->GetItem();
 }
@@ -2505,12 +2527,13 @@ wxDataViewTreeStore::InsertItem(const wxDataViewItem& parent,
     if (!parent_node) return wxDataViewItem(0);
 
     wxDataViewTreeStoreNode *previous_node = FindNode( previous );
-    int pos = parent_node->GetChildren().IndexOf( previous_node );
-    if (pos == wxNOT_FOUND) return wxDataViewItem(0);
+    wxDataViewTreeStoreNodes& children = parent_node->GetChildren();
+    const wxDataViewTreeStoreNodes::iterator iter = parent_node->FindChild( previous_node );
+    if (iter == children.end()) return wxDataViewItem(0);
 
     wxDataViewTreeStoreNode *node =
         new wxDataViewTreeStoreNode( parent_node, text, icon, data );
-    parent_node->GetChildren().Insert( (size_t) pos, node );
+    children.insert(iter, node);
 
     return node->GetItem();
 }
@@ -2524,7 +2547,8 @@ wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& pare
 
     wxDataViewTreeStoreContainerNode *node =
         new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
-    parent_node->GetChildren().Insert( node );
+    wxDataViewTreeStoreNodes& children = parent_node->GetChildren();
+    children.insert(children.begin(), node);
 
     return node->GetItem();
 }
@@ -2541,7 +2565,7 @@ wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent,
 
     wxDataViewTreeStoreContainerNode *node =
         new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
-    parent_node->GetChildren().Append( node );
+    parent_node->GetChildren().push_back( node );
 
     return node->GetItem();
 }
@@ -2558,12 +2582,13 @@ wxDataViewTreeStore::InsertContainer(const wxDataViewItem& parent,
     if (!parent_node) return wxDataViewItem(0);
 
     wxDataViewTreeStoreNode *previous_node = FindNode( previous );
-    int pos = parent_node->GetChildren().IndexOf( previous_node );
-    if (pos == wxNOT_FOUND) return wxDataViewItem(0);
+    wxDataViewTreeStoreNodes& children = parent_node->GetChildren();
+    const wxDataViewTreeStoreNodes::iterator iter = parent_node->FindChild( previous_node );
+    if (iter == children.end()) return wxDataViewItem(0);
 
     wxDataViewTreeStoreContainerNode *node =
         new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
-    parent_node->GetChildren().Insert( (size_t) pos, node );
+    children.insert(iter, node);
 
     return node->GetItem();
 }
@@ -2581,7 +2606,7 @@ wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, u
     wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
     if (!parent_node) return wxDataViewItem(0);
 
-    wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos );
+    wxDataViewTreeStoreNode* const node = parent_node->GetChildren()[pos];
     if (node)
         return wxDataViewItem(node->GetData());
 
@@ -2597,7 +2622,7 @@ int wxDataViewTreeStore::GetChildCount( const wxDataViewItem& parent ) const
         return 0;
 
     wxDataViewTreeStoreContainerNode *container_node = (wxDataViewTreeStoreContainerNode*) node;
-    return (int) container_node->GetChildren().GetCount();
+    return (int) container_node->GetChildren().size();
 }
 
 void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxString &text )
@@ -2673,7 +2698,13 @@ void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item )
     wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent_item );
     if (!parent_node) return;
 
-    parent_node->GetChildren().DeleteObject( FindNode(item) );
+    const wxDataViewTreeStoreNodes::iterator
+        iter = parent_node->FindChild(FindNode(item));
+    if ( iter != parent_node->GetChildren().end() )
+    {
+        delete *iter;
+        parent_node->GetChildren().erase(iter);
+    }
 }
 
 void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item )
@@ -2681,7 +2712,7 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item )
     wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
     if (!node) return;
 
-    node->GetChildren().clear();
+    node->DestroyChildren();
 }
 
 void wxDataViewTreeStore::DeleteAllItems()
@@ -2751,14 +2782,14 @@ unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDat
     wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
     if (!node) return 0;
 
-    wxDataViewTreeStoreNodeList::iterator iter;
+    wxDataViewTreeStoreNodes::iterator iter;
     for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); ++iter)
     {
         wxDataViewTreeStoreNode* child = *iter;
         children.Add( child->GetItem() );
     }
 
-    return node->GetChildren().GetCount();
+    return node->GetChildren().size();
 }
 
 int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
@@ -2767,13 +2798,13 @@ int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewI
     wxDataViewTreeStoreNode *node1 = FindNode( item1 );
     wxDataViewTreeStoreNode *node2 = FindNode( item2 );
 
-    if (!node1 || !node2)
+    if (!node1 || !node2 || (node1 == node2))
         return 0;
 
     wxDataViewTreeStoreContainerNode* const parent =
         (wxDataViewTreeStoreContainerNode*) node1->GetParent();
 
-    wxCHECK_MSG( node2->GetParent() == parent, 0
+    wxCHECK_MSG( node2->GetParent() == parent, 0,
                  wxS("Comparing items with different parent.") );
 
     if (node1->IsContainer() && !node2->IsContainer())
@@ -2782,7 +2813,18 @@ int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewI
     if (node2->IsContainer() && !node1->IsContainer())
         return 1;
 
-    return parent1->GetChildren().IndexOf( node1 ) - parent2->GetChildren().IndexOf( node2 );
+    wxDataViewTreeStoreNodes::const_iterator iter;
+    for (iter = parent->GetChildren().begin(); iter != parent->GetChildren().end(); ++iter)
+    {
+        if ( *iter == node1 )
+            return -1;
+
+        if ( *iter == node2 )
+            return 1;
+    }
+
+    wxFAIL_MSG(wxS("Unreachable"));
+    return 0;
 }
 
 wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &item ) const
@@ -2951,7 +2993,7 @@ void wxDataViewTreeCtrl::DeleteChildren( const wxDataViewItem& item )
     if (!node) return;
 
     wxDataViewItemArray array;
-    wxDataViewTreeStoreNodeList::iterator iter;
+    wxDataViewTreeStoreNodes::iterator iter;
     for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); ++iter)
     {
         wxDataViewTreeStoreNode* child = *iter;

From 6c9ced9be238dee06edb573c7a9024d7ce380ec0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 20:42:03 +0100
Subject: [PATCH 304/916] Document wxDataViewListCtrl default sort order

Also explain how to change it if the default behaviour of putting all
the container items before all the leaves is undesirable.

Closes #16105.
---
 interface/wx/dataview.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index e98ab8a387..ed3a535159 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3405,6 +3405,13 @@ public:
     without having to derive any class from it, but it is mostly used from within
     wxDataViewTreeCtrl.
 
+    Notice that by default this class sorts all items with children before the
+    leaf items. If this behaviour is inappropriate, you need to derive a custom
+    class from this one and override either its HasDefaultCompare() method to
+    return false, which would result in items being sorted just in the order in
+    which they were added, or its Compare() function to compare the items using
+    some other criterion, e.g. alphabetically.
+
     @library{wxadv}
     @category{dvc}
 */

From 43c1baf1bd59ab36b53364a3aa5a28cb08578308 Mon Sep 17 00:00:00 2001
From: Hartwig Wiesmann <hartwig.wiesmann@wanadoo.nl>
Date: Sat, 3 Feb 2018 21:03:49 +0100
Subject: [PATCH 305/916] Fix wxDataViewColumn::SetSortOrder() under macOS

Don't check if we already sort by the column in SetSortOrder() as this
meant the sort order couldn't be changed programmatically at all.

Closes #15405.
---
 docs/changes.txt          |  1 +
 src/osx/cocoa/dataview.mm | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 99680a7aac..5fe6a0ba0b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -282,6 +282,7 @@ wxOSX:
 - Fix selecting RGB bitmaps (with no alpha channel) into wxMemoryDC.
 - Fix updating radio groups when menu item is inserted/removed from wxMenu.
 - Allow changing alignment styles after wxTextCtrl creation (Andreas Falkenhahn).
+- Fix wxDataViewColumn::SetSortOrder() (hartwigw).
 
 wxQt
 
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index c48c9c976e..e160b1ad92 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -3513,23 +3513,27 @@ void wxDataViewColumn::SetSortable(bool sortable)
 
 void wxDataViewColumn::SetSortOrder(bool ascending)
 {
-    if (m_ascending != ascending)
+    NSTableColumn* const tableColumn = m_NativeDataPtr->GetNativeColumnPtr();
+    NSTableView* tableView = [tableColumn tableView];
+
+    wxCHECK_RET( tableView, wxS("Column has to be associated with a table view when the sorting order is set") );
+
+    if ( (m_ascending != ascending) || ([tableColumn sortDescriptorPrototype] == nil) )
     {
         m_ascending = ascending;
-        if (IsSortKey())
-        {
-            // change sorting order:
-            NSArray*          sortDescriptors;
-            NSSortDescriptor* sortDescriptor;
-            NSTableColumn*    tableColumn;
 
-            tableColumn     = m_NativeDataPtr->GetNativeColumnPtr();
-            sortDescriptor  = [[NSSortDescriptor alloc] initWithKey:[[tableColumn sortDescriptorPrototype] key] ascending:m_ascending];
-            sortDescriptors = [NSArray arrayWithObject:sortDescriptor];
-            [tableColumn setSortDescriptorPrototype:sortDescriptor];
-            [[tableColumn tableView] setSortDescriptors:sortDescriptors];
-            [sortDescriptor release];
-        }
+        // change sorting order for the native implementation (this will
+        // trigger a call to outlineView:sortDescriptorsDidChange: where the
+        // wxWidget's sort descriptors are going to be set):
+        NSSortDescriptor* const
+            sortDescriptor = [[NSSortDescriptor alloc]
+                                initWithKey:[NSString stringWithFormat:@"%ld",(long)[tableView columnWithIdentifier:[tableColumn identifier]]]
+                                ascending:m_ascending];
+
+        NSArray* sortDescriptors = [NSArray arrayWithObject:sortDescriptor];
+        [tableColumn setSortDescriptorPrototype:sortDescriptor];
+        [tableView setSortDescriptors:sortDescriptors];
+        [sortDescriptor release];
     }
 }
 

From d7b88827b80bc5c0397ba0158ee18e65263e7f0f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 3 Feb 2018 22:32:37 +0100
Subject: [PATCH 306/916] Avoid spurious focus events for composite windows in
 wxMSW

Composite windows, i.e. wxWindows composed of several HWNDs at MSW
level, didn't handle focus events correctly and, for example, generated
wxEVT_KILL_FOCUS event when the focus simply switched from wxComboBox
itself to the EDIT control inside it, which broke using non-readonly
wxComboBox as in-place editor inside wxDataViewCtrl.

Check if the focus event notifies about the focus switching to, or from,
another HWND belonging to the same window, and suppress wx event
generation in this case as they don't make sense because the focus
doesn't change at wx level.

See #17034.
---
 src/msw/window.cpp | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ead90f0321..0082cef587 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4169,6 +4169,14 @@ bool wxWindowMSW::HandleSetFocus(WXHWND hwnd)
         return false;
     }
 
+    if ( ContainsHWND(hwnd) )
+    {
+        // If another subwindow of this window already had focus before, this
+        // window should already have focus at wx level, no need for another
+        // event.
+        return false;
+    }
+
     // notify the parent keeping track of focus for the kbd navigation
     // purposes that we got it
     wxChildFocusEvent eventFocus((wxWindow *)this);
@@ -4193,6 +4201,20 @@ bool wxWindowMSW::HandleSetFocus(WXHWND hwnd)
 
 bool wxWindowMSW::HandleKillFocus(WXHWND hwnd)
 {
+    // Don't send the event when in the process of being deleted.  This can
+    // only cause problems if the event handler tries to access the object.
+    if ( m_isBeingDeleted )
+    {
+        return false;
+    }
+
+    if ( ContainsHWND(hwnd) )
+    {
+        // If the focus switches to another HWND which is part of the same
+        // wxWindow, we must not generate a wxEVT_KILL_FOCUS.
+        return false;
+    }
+
 #if wxUSE_CARET
     // Deal with caret
     if ( m_caret )
@@ -4201,13 +4223,6 @@ bool wxWindowMSW::HandleKillFocus(WXHWND hwnd)
     }
 #endif // wxUSE_CARET
 
-    // Don't send the event when in the process of being deleted.  This can
-    // only cause problems if the event handler tries to access the object.
-    if ( m_isBeingDeleted )
-    {
-        return false;
-    }
-
     wxFocusEvent event(wxEVT_KILL_FOCUS, m_windowId);
     event.SetEventObject(this);
 

From d44dd8caf4f7cee320a096d8d80f4e1e85347681 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 00:28:08 +0100
Subject: [PATCH 307/916] Document wxDataViewCtrl::GetMainWindow()

This method can be useful, so make it part of the public API, similarly
to e.g. wxGrid::GetGridWindow().

See #17786.
---
 interface/wx/dataview.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index ed3a535159..8c2b303bdc 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -1442,6 +1442,16 @@ public:
     virtual wxRect GetItemRect(const wxDataViewItem& item,
                                const wxDataViewColumn* col = NULL) const;
 
+    /**
+        Returns the window corresponding to the main area of the control.
+
+        This is the window that actually shows the control items and may be
+        different from wxDataViewCtrl window itself in some ports (currently
+        this is only the case for the generic implementation used by default
+        under MSW).
+     */
+    wxWindow* GetMainWindow();
+
     /**
         Returns pointer to the data model associated with the control (if any).
     */

From 683185aee1460d4966acdf7343b6813b5853011e Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 1 Feb 2018 00:02:02 +0100
Subject: [PATCH 308/916] Explicitly mention build environments for Travis CI

This removes a duplicate build on Travis, cause by a change of the
default build environment.
---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index afc314c983..66d6216a07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,13 @@ sudo: required
 
 matrix:
     include:
-        - compiler: gcc
-        - compiler: gcc
-          env: wxCONFIGURE_FLAGS="--enable-utf8 --enable-utf8only --enable-monolithic"
+        - dist: precise
+          compiler: gcc
         - dist: trusty
           compiler: gcc
+        - dist: trusty
+          compiler: gcc
+          env: wxCONFIGURE_FLAGS="--enable-utf8 --enable-utf8only --enable-monolithic"
         - dist: trusty
           compiler: gcc
           env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11"

From 2fb4e1117491405adcf44d05c0ddecd1a6599f06 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 3 Feb 2018 18:28:20 +0100
Subject: [PATCH 309/916] Remove "update = checkout" option for submodules

This reverts af16d8ba5c9680febadeeed51a9be4bb5e9bf1d5. It caused
problems with older git versions (e.g. 1.8.5) that do not recognize the
checkout option: warning: unknown update mode 'checkout' suggested for
submodule '3rdparty/catch' Skipping submodule '3rdparty/catch'

Also specify the branch for the catch submodule, to be in line with the
other submodules.
---
 .gitmodules | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ec57ac48de..8373eef871 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,29 +1,24 @@
 [submodule "3rdparty/catch"]
 	path = 3rdparty/catch
 	url = https://github.com/wxWidgets/Catch.git
-	update = checkout
+	branch = wx
 [submodule "src/zlib"]
 	path = src/zlib
 	url = https://github.com/wxWidgets/zlib.git
 	branch = wx
-	update = checkout
 [submodule "src/png"]
 	path = src/png
 	url = https://github.com/wxWidgets/libpng.git
 	branch = wx
-	update = checkout
 [submodule "src/expat"]
 	path = src/expat
 	url = https://github.com/wxWidgets/libexpat.git
 	branch = wx
-	update = checkout
 [submodule "src/tiff"]
 	path = src/tiff
 	url = https://github.com/wxWidgets/libtiff.git
 	branch = wx
-	update = checkout
 [submodule "src/jpeg"]
 	path = src/jpeg
 	url = https://github.com/wxWidgets/libjpeg-turbo.git
 	branch = wx
-	update = checkout

From 3a1625030314f501effb9620f5b39b470b2435c3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 31 Jan 2018 03:11:07 +0100
Subject: [PATCH 310/916] Don't make inert toggle/choice wxDataViewCtrl cell
 editable in wxOSX

Don't disable all inert renderers as this results in ugly "disabled"
look for some of them (see 6e885992f52f73b7b0c636167c5e9717f0d9b293),
but do disable the renderers that would be editable otherwise, such as
wxDataViewChoiceRenderer and wxDataViewToggleRenderer, in wxOSX as it
shouldn't be possible to change value of the inert cells.

See https://github.com/wxWidgets/wxWidgets/pull/707

Closes #18056.
---
 include/wx/osx/dvrenderers.h | 29 +++++++++++++++++++++++++++--
 src/common/datavcmn.cpp      | 15 +--------------
 src/osx/cocoa/dataview.mm    | 10 ++--------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/include/wx/osx/dvrenderers.h b/include/wx/osx/dvrenderers.h
index c62a19ffb5..0aa10473dc 100644
--- a/include/wx/osx/dvrenderers.h
+++ b/include/wx/osx/dvrenderers.h
@@ -42,6 +42,29 @@ private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer);
 };
 
+// ---------------------------------------------------------------------------
+// This is a Mac-specific class that should be used as the base class for the
+// renderers that should be disabled when they're inert, to prevent the user
+// from editing them.
+// ---------------------------------------------------------------------------
+
+class wxOSXDataViewDisabledInertRenderer : public wxDataViewRenderer
+{
+protected:
+    wxOSXDataViewDisabledInertRenderer(const wxString& varianttype,
+                                       wxDataViewCellMode mode,
+                                       int alignment)
+        : wxDataViewRenderer(varianttype, mode, alignment)
+    {
+    }
+
+    virtual void SetEnabled(bool enabled) wxOVERRIDE
+    {
+        wxDataViewRenderer::SetEnabled(enabled &&
+                                        GetMode() != wxDATAVIEW_CELL_INERT);
+    }
+};
+
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
@@ -97,7 +120,8 @@ private:
 // wxDataViewChoiceRenderer
 // -------------------------------------
 
-class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer
+    : public wxOSXDataViewDisabledInertRenderer
 {
 public:
     wxDataViewChoiceRenderer(const wxArrayString& choices,
@@ -164,7 +188,8 @@ private:
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer
+class WXDLLIMPEXP_ADV wxDataViewToggleRenderer
+    : public wxOSXDataViewDisabledInertRenderer
 {
 public:
     static wxString GetDefaultType() { return wxS("bool"); }
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 0f2ccc24b8..008a61ad3d 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -862,20 +862,7 @@ wxDataViewRendererBase::PrepareForItem(const wxDataViewModel *model,
 
     // Finally determine the enabled/disabled state and apply it, even to the
     // empty cells.
-    bool enabled = true;
-    switch ( GetMode() )
-    {
-        case wxDATAVIEW_CELL_INERT:
-            enabled = false;
-            break;
-
-        case wxDATAVIEW_CELL_ACTIVATABLE:
-        case wxDATAVIEW_CELL_EDITABLE:
-            enabled = model->IsEnabled(item, column);
-            break;
-    }
-
-    SetEnabled(enabled);
+    SetEnabled(model->IsEnabled(item, column));
 
     }
     wxCATCH_ALL
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index c48c9c976e..eac9a0fbda 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -2897,12 +2897,6 @@ void wxDataViewRenderer::SetAttr(const wxDataViewItemAttr& attr)
 
 void wxDataViewRenderer::SetEnabled(bool enabled)
 {
-    // setting the appearance to disabled grey should only be done for
-    // the active cells which are disabled, not for the cells which can
-    // never be edited at all
-    if ( GetMode() == wxDATAVIEW_CELL_INERT )
-        enabled = true;
-
     [GetNativeData()->GetItemCell() setEnabled:enabled];
 }
 
@@ -3071,7 +3065,7 @@ wxIMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer);
 wxDataViewChoiceRenderer::wxDataViewChoiceRenderer(const wxArrayString& choices,
                                                    wxDataViewCellMode mode,
                                                    int alignment)
-    : wxDataViewRenderer(wxT("string"), mode, alignment),
+    : wxOSXDataViewDisabledInertRenderer(wxT("string"), mode, alignment),
       m_choices(choices)
 {
     NSPopUpButtonCell* cell;
@@ -3318,7 +3312,7 @@ wxIMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer);
 wxDataViewToggleRenderer::wxDataViewToggleRenderer(const wxString& varianttype,
                                                    wxDataViewCellMode mode,
                                                    int align)
-    : wxDataViewRenderer(varianttype,mode)
+    : wxOSXDataViewDisabledInertRenderer(varianttype, mode, align)
 {
     NSButtonCell* cell;
 

From c391cfd6171c79968b44f0ed2e794aebcab010d8 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 3 Feb 2018 22:28:35 -0800
Subject: [PATCH 311/916] Avoid using already-destroyed parts of
 wxChoice/wxComboBox during destruction

When used as a wxDVC cell editor, GtkComboBox has already destroyed
it's model and child GtkEntry by the time our dtor is called.
See #17034
---
 src/gtk/choice.cpp   | 3 ++-
 src/gtk/combobox.cpp | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index db2240b11e..c65967ab1a 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -170,7 +170,8 @@ void wxChoice::DoClear()
 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );
-    gtk_list_store_clear(GTK_LIST_STORE(model));
+    if (model)
+        gtk_list_store_clear(GTK_LIST_STORE(model));
 
     m_clientData.Clear();
 
diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index e848edac65..4c0231dcf3 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -99,7 +99,10 @@ wxEND_EVENT_TABLE()
 wxComboBox::~wxComboBox()
 {
     if (m_entry)
+    {
         GTKDisconnect(m_entry);
+        g_object_remove_weak_pointer(G_OBJECT(m_entry), (void**)&m_entry);
+    }
 }
 
 void wxComboBox::Init()
@@ -213,6 +216,7 @@ void wxComboBox::GTKCreateComboBoxWidget()
     g_object_ref(m_widget);
 
     m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
+    g_object_add_weak_pointer(G_OBJECT(m_entry), (void**)&m_entry);
 }
 
 GtkEditable *wxComboBox::GetEditable() const

From e2a04e1fd77bb16562c84db89a26aced26b911c0 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 3 Feb 2018 22:30:36 -0800
Subject: [PATCH 312/916] Use signal blocking rather than disconnection to
 temporarily disable events

---
 src/gtk/dataview.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 91b7621fde..b677de2b69 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -4681,7 +4681,8 @@ bool wxDataViewCtrl::Create(wxWindow *parent,
 
     PostCreation(size);
 
-    GtkEnableSelectionEvents();
+    g_signal_connect_after(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_treeview)),
+        "changed", G_CALLBACK(wxdataview_selection_changed_callback), this);
 
     g_signal_connect_after (m_treeview, "row-activated",
                             G_CALLBACK (wxdataview_row_activated_callback), this);
@@ -5287,15 +5288,15 @@ void wxDataViewCtrl::DoSetIndent()
 void wxDataViewCtrl::GtkDisableSelectionEvents()
 {
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
-    g_signal_handlers_disconnect_by_func( selection,
-                            (gpointer) (wxdataview_selection_changed_callback), this);
+    g_signal_handlers_block_by_func(
+        selection, (void*)wxdataview_selection_changed_callback, this);
 }
 
 void wxDataViewCtrl::GtkEnableSelectionEvents()
 {
     GtkTreeSelection *selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(m_treeview) );
-    g_signal_connect_after (selection, "changed",
-                            G_CALLBACK (wxdataview_selection_changed_callback), this);
+    g_signal_handlers_unblock_by_func(
+        selection, (void*)wxdataview_selection_changed_callback, this);
 }
 
 // ----------------------------------------------------------------------------

From 52a30cde6f8a89cc3c8528c496e37f84cda65518 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 3 Feb 2018 22:36:44 -0800
Subject: [PATCH 313/916] Remove useless gtk_widget_set_size_request()

It won't have any effect on the best size computation, and leaving the
size set to (0,0) is really bad form
---
 src/gtk/choice.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index c65967ab1a..c86e4eebb9 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -348,11 +348,6 @@ wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const
     // a GtkEntry for wxComboBox and a GtkCellView for wxChoice
     GtkWidget* childPart = gtk_bin_get_child(GTK_BIN(m_widget));
 
-    // Set a as small as possible size for the control, so preferred sizes
-    // return "natural" sizes, not taking into account the previous ones (which
-    // seems to be GTK+3 behaviour)
-    gtk_widget_set_size_request(m_widget, 0, 0);
-
     // We are interested in the difference of sizes between the whole contol
     // and its child part. I.e. arrow, separators, etc.
     GtkRequisition req;

From fa000d254da264e9f6333d4fdb55b310d6cdd9aa Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 3 Feb 2018 22:38:23 -0800
Subject: [PATCH 314/916] Use wxFALLTHROUGH

---
 src/gtk/textctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 16a73318a3..5febd63944 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -187,7 +187,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                     align = GTK_JUSTIFY_FILL;
                     break;
                 }
-                // fallthrough
+                wxFALLTHROUGH;
 #endif
             default:
                 align = GTK_JUSTIFY_LEFT;

From 508a409f7e53d790ab38f8f34c011e7a43c3044f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 00:05:48 +0100
Subject: [PATCH 315/916] Suppress focus loss on opening combobox popup in
 wxGTK

Make GTKHandleFocusOut() virtual and override it in wxChoice in order to
avoid generating wxEVT_KILL_FOCUS events when the combobox dropdown
button is clicked.

This is important because it allows fatal problems when using a
combobox-based in-place editor in wxDataViewCtrl as getting these events
totally broke the UI before.

See #17034.
---
 docs/changes.txt        |  1 +
 include/wx/gtk/choice.h |  1 +
 include/wx/gtk/window.h |  2 +-
 src/gtk/choice.cpp      | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 41b4baba6d..bcf61cd909 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -206,6 +206,7 @@ wxGTK:
 - Implement XYToPosition() for single-line wxTextCtrl.
 - Implement ShowPosition() for single-line wxTextCtrl.
 - Improve wx{Client,Paint,Screen,Window}DC::GetPPI() (GTK+ 3).
+- Suppress focus loss events for wxChoice and wxComboBox on opening popup.
 
 wxMSW:
 
diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index ce43533dd3..c594624812 100644
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -101,6 +101,7 @@ protected:
     virtual void DoClear() wxOVERRIDE;
     virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
 
+    virtual bool GTKHandleFocusOut() wxOVERRIDE;
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
 
diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 2430773c43..16c755c413 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -197,7 +197,7 @@ public:
     GdkWindow* GTKGetDrawingWindow() const;
 
     bool GTKHandleFocusIn();
-    bool GTKHandleFocusOut();
+    virtual bool GTKHandleFocusOut();
     void GTKHandleFocusOutNoDeferring();
     void GTKHandleDeferredFocusOut();
 
diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index db2240b11e..41bece0eed 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -111,6 +111,23 @@ wxChoice::~wxChoice()
  #endif // __WXGTK3__
 }
 
+bool wxChoice::GTKHandleFocusOut()
+{
+    if ( wx_is_at_least_gtk2(10) )
+    {
+        gboolean isShown;
+        g_object_get( m_widget, "popup-shown", &isShown, NULL );
+
+        // Don't send "focus lost" events if the focus is grabbed by our own
+        // popup, it counts as part of this window, even though wx doesn't know
+        // about it (and can't, because GtkComboBox doesn't expose it).
+        if ( isShown )
+            return true;
+    }
+
+    return wxChoiceBase::GTKHandleFocusOut();
+}
+
 void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text )
 {
 #ifdef __WXGTK3__

From af78ad3b499e9258fc62b710db43cdcff4c4beea Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 15:27:02 +0100
Subject: [PATCH 316/916] Add wxDataViewCtrlBase::SetAlternateRowColour()

Previously this method was only available in the generic wxDataViewCtrl,
move it to the base class to make it possible calling it in portable
code and document it.

Closes #14617.
---
 include/wx/dataview.h         |  6 ++++++
 include/wx/generic/dataview.h |  5 +++--
 interface/wx/dataview.h       | 15 +++++++++++++++
 src/generic/datavgen.cpp      |  3 ++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 9162cd9d0d..c94c8fe3c1 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -755,6 +755,12 @@ public:
     virtual bool SetHeaderAttr(const wxItemAttr& WXUNUSED(attr))
         { return false; }
 
+    // Set the colour used for the "alternate" rows when wxDV_ROW_LINES is on.
+    // Also only supported in the generic version, which returns true to
+    // indicate it.
+    virtual bool SetAlternateRowColour(const wxColour& WXUNUSED(colour))
+        { return false; }
+
     virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
     {
         return GetClassDefaultAttributes(GetWindowVariant());
diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 5efc0e1eec..6fe74d55db 100644
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -277,10 +277,11 @@ public:
 
     virtual bool SetHeaderAttr(const wxItemAttr& attr) wxOVERRIDE;
 
-    // These methods are specific to generic wxDataViewCtrl implementation and
+    virtual bool SetAlternateRowColour(const wxColour& colour) wxOVERRIDE;
+
+    // This method is specific to generic wxDataViewCtrl implementation and
     // should not be used in portable code.
     wxColour GetAlternateRowColour() const { return m_alternateRowColour; }
-    void SetAlternateRowColour(const wxColour& colour);
 
     // The returned pointer is null if the control has wxDV_NO_HEADER style.
     //
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 8c2b303bdc..90c9f1b6d6 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -1566,6 +1566,21 @@ public:
     */
     virtual void SelectAll();
 
+    /**
+        Set custom colour for the alternate rows used with wxDV_ROW_LINES
+        style.
+
+        Note that calling this method has no effect if wxDV_ROW_LINES is off.
+
+        @param colour The colour to use for the alternate rows.
+        @return @true if customizing this colour is supported (currently only
+            in the generic version), @false if this method is not implemented
+            under this platform.
+
+        @since 3.1.1
+     */
+    bool SetAlternateRowColour(const wxColour& colour);
+
     /**
         Set which column shall contain the tree-like expanders.
     */
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index d9840af8ab..298ff6bcb8 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -5781,9 +5781,10 @@ bool wxDataViewCtrl::SetHeaderAttr(const wxItemAttr& attr)
     return true;
 }
 
-void wxDataViewCtrl::SetAlternateRowColour(const wxColour& colour)
+bool wxDataViewCtrl::SetAlternateRowColour(const wxColour& colour)
 {
     m_alternateRowColour = colour;
+    return true;
 }
 
 void wxDataViewCtrl::SelectAll()

From f33f1f2078ade742e8059d8be82829c8f68fda89 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 15:32:01 +0100
Subject: [PATCH 317/916] Fix a typo in EVT_DATAVIEW_COLUMN_REORDERED
 documentation

See #14297.
---
 interface/wx/dataview.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 90c9f1b6d6..8e3312c126 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3648,7 +3648,7 @@ public:
            Process a @c wxEVT_DATAVIEW_COLUMN_SORTED event.
     @event{EVT_DATAVIEW_COLUMN_REORDERED(id, func)}
            Process a @c wxEVT_DATAVIEW_COLUMN_REORDERED event.
-           Currently this even is only generated when using the native OS X
+           Currently this event is only generated when using the native OS X
            version.
     @event{EVT_DATAVIEW_ITEM_BEGIN_DRAG(id, func)}
            Process a @c wxEVT_DATAVIEW_ITEM_BEGIN_DRAG event.

From 48fb2b42b137b0bd0e4611a054fba5d734b788d7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 15:45:23 +0100
Subject: [PATCH 318/916] Send wxEVT_DATAVIEW_COLUMN_REORDERED in generic
 wxDataViewCtrl

Simply translate wxEVT_HEADER_END_REORDER into this event, which was
previously only sent by the macOS version.

GtkTreeView doesn't seem to support column drag-and-drop at all, so this
event is still never generated by wxGTK.

Closes #14297.
---
 include/wx/dataview.h         |  4 ++--
 interface/wx/dataview.h       |  7 +++++--
 samples/dataview/dataview.cpp | 15 +++++++++++++++
 src/generic/datavgen.cpp      |  7 +++++--
 src/osx/cocoa/dataview.mm     |  1 +
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index c94c8fe3c1..79b200cc09 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -903,11 +903,11 @@ public:
     wxDEPRECATED_MSG("Pass the argument to the ctor instead")
     void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; }
     wxDEPRECATED_MSG("Pass the argument to the ctor instead")
-    void SetColumn( int col ) { m_col = col; }
-    wxDEPRECATED_MSG("Pass the argument to the ctor instead")
     void SetItem( const wxDataViewItem &item ) { m_item = item; }
 #endif // WXWIN_COMPATIBILITY_3_0
 
+    void SetColumn( int col ) { m_col = col; }
+
 protected:
     wxDataViewItem      m_item;
     int                 m_col;
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 8e3312c126..cbb5ba2566 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3648,8 +3648,8 @@ public:
            Process a @c wxEVT_DATAVIEW_COLUMN_SORTED event.
     @event{EVT_DATAVIEW_COLUMN_REORDERED(id, func)}
            Process a @c wxEVT_DATAVIEW_COLUMN_REORDERED event.
-           Currently this event is only generated when using the native OS X
-           version.
+           Currently this event is not generated when using the native GTK+
+           version of the control.
     @event{EVT_DATAVIEW_ITEM_BEGIN_DRAG(id, func)}
            Process a @c wxEVT_DATAVIEW_ITEM_BEGIN_DRAG event.
     @event{EVT_DATAVIEW_ITEM_DROP_POSSIBLE(id, func)}
@@ -3675,6 +3675,9 @@ public:
     /**
         Returns the position of the column in the control or -1
         if no column field was set by the event emitter.
+
+        For wxEVT_DATAVIEW_COLUMN_REORDERED, this is the new position of the
+        column.
     */
     int GetColumn() const;
 
diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 26773c624d..64e89e7b71 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -133,6 +133,7 @@ private:
     void OnHeaderClickList( wxDataViewEvent &event );
     void OnSorted( wxDataViewEvent &event );
     void OnSortedList( wxDataViewEvent &event );
+    void OnColumnReordered( wxDataViewEvent &event);
 
     void OnContextMenu( wxDataViewEvent &event );
 
@@ -423,6 +424,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderRightClick)
     EVT_DATAVIEW_COLUMN_SORTED(ID_MUSIC_CTRL, MyFrame::OnSorted)
     EVT_DATAVIEW_COLUMN_SORTED(ID_ATTR_CTRL, MyFrame::OnSortedList)
+    EVT_DATAVIEW_COLUMN_REORDERED(wxID_ANY, MyFrame::OnColumnReordered)
     EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_ATTR_CTRL, MyFrame::OnHeaderClickList)
 
     EVT_DATAVIEW_ITEM_CONTEXT_MENU(ID_MUSIC_CTRL, MyFrame::OnContextMenu)
@@ -1290,6 +1292,19 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
     wxLogMessage( "wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d", pos );
 }
 
+void MyFrame::OnColumnReordered(wxDataViewEvent& event)
+{
+    wxDataViewColumn* const col = event.GetDataViewColumn();
+    if ( !col )
+    {
+        wxLogError("Unknown column reordered?");
+        return;
+    }
+
+    wxLogMessage("wxEVT_DATAVIEW_COLUMN_REORDERED: \"%s\" is now at position %d",
+                 col->GetTitle(), event.GetColumn());
+}
+
 void MyFrame::OnSortedList( wxDataViewEvent &/*event*/)
 {
     wxVector<wxDataViewColumn *> const columns = m_ctrl[1]->GetSortingColumns();
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 298ff6bcb8..54d745f6cf 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -5512,13 +5512,16 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
     return max_width;
 }
 
-void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col),
-                                unsigned int WXUNUSED(new_pos))
+void wxDataViewCtrl::ColumnMoved(wxDataViewColumn *col, unsigned int new_pos)
 {
     // do _not_ reorder m_cols elements here, they should always be in the
     // order in which columns were added, we only display the columns in
     // different order
     m_clientArea->UpdateDisplay();
+
+    wxDataViewEvent event(wxEVT_DATAVIEW_COLUMN_REORDERED, this, col);
+    event.SetColumn(new_pos);
+    ProcessWindowEvent(event);
 }
 
 bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 0b1ee6b419..abaf02276d 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -1881,6 +1881,7 @@ outlineView:(NSOutlineView*)outlineView
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
     wxDataViewEvent event(wxEVT_DATAVIEW_COLUMN_REORDERED, dvc, col);
+    event.SetColumn(newColumnPosition);
     dvc->GetEventHandler()->ProcessEvent(event);
 }
 

From a342582eb158ccb00b2f6c021863754c71f16bea Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Sun, 4 Feb 2018 15:53:08 +0100
Subject: [PATCH 319/916] Don't build samples that cannot be built with CMake

When using CMake to generate project files, do not create projects for
samples that rely on a feature that is not available. For example, do
not create a project for the AUI sample when wxUSE_AUI=0.

Closes https://github.com/wxWidgets/wxWidgets/pull/713
---
 build/cmake/samples/CMakeLists.txt | 148 +++++++++++++++--------------
 build/cmake/samples/html.cmake     |   9 +-
 2 files changed, 84 insertions(+), 73 deletions(-)

diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index 51eae43b51..40fbf44dd6 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -7,37 +7,38 @@
 # Licence:     wxWindows licence
 #############################################################################
 
-wx_add_sample(access accesstest.cpp)
-wx_add_sample(animate anitest.cpp anitest.h LIBRARIES adv DATA throbber.gif hourglass.ani)
+wx_add_sample(access accesstest.cpp DEPENDS wxUSE_ACCESSBILITY)
+wx_add_sample(animate anitest.cpp anitest.h LIBRARIES adv DATA throbber.gif hourglass.ani DEPENDS wxUSE_ANIMATIONCTRL)
 wx_add_sample(artprov arttest.cpp artbrows.cpp artbrows.h)
-wx_add_sample(aui auidemo.cpp LIBRARIES adv aui html NAME auidemo)
-wx_add_sample(calendar RES calendar.rc LIBRARIES adv)
-wx_add_sample(caret)
-wx_add_sample(clipboard)
-wx_add_sample(collpane LIBRARIES adv)
-wx_add_sample(combo LIBRARIES adv DATA dropbuth.png dropbutn.png dropbutp.png)
-wx_add_sample(config conftest.cpp)
+wx_add_sample(aui auidemo.cpp LIBRARIES adv aui html NAME auidemo DEPENDS wxUSE_AUI)
+wx_add_sample(calendar RES calendar.rc LIBRARIES adv DEPENDS wxUSE_CALENDARCTRL)
+wx_add_sample(caret DEPENDS wxUSE_CARET)
+wx_add_sample(clipboard DEPENDS wxUSE_CLIPBOARD)
+wx_add_sample(collpane LIBRARIES adv DEPENDS wxUSE_COLLPANE)
+wx_add_sample(combo LIBRARIES adv DATA dropbuth.png dropbutn.png dropbutp.png DEPENDS wxUSE_COMBOCTRL)
+wx_add_sample(config conftest.cpp DEPENDS wxUSE_CONFIG)
 wx_add_sample(console CONSOLE IMPORTANT)
-wx_add_sample(dataview IMPORTANT dataview.cpp mymodels.cpp mymodels.h LIBRARIES adv)
+wx_add_sample(dataview IMPORTANT dataview.cpp mymodels.cpp mymodels.h LIBRARIES adv DEPENDS wxUSE_DATAVIEWCTRL)
 if(wxUSE_ON_FATAL_EXCEPTION AND (NOT WIN32 OR MSVC))
-    wx_add_sample(debugrpt LIBRARIES qa)
+    wx_add_sample(debugrpt LIBRARIES qa DEPENDS wxUSE_DEBUGREPORT)
 endif()
 wx_add_sample(dialogs dialogs.cpp dialogs.h LIBRARIES adv DATA tips.txt)
-wx_add_sample(dialup nettest.cpp)
-wx_add_sample(display)
-wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png)
+wx_add_sample(dialup nettest.cpp DEPENDS wxUSE_DIALUP_MANAGER)
+wx_add_sample(display DEPENDS wxUSE_DISPLAY)
+wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP)
 wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h
-    RES docview.rc)
+    RES docview.rc DEPENDS wxUSE_DOC_VIEW_ARCHITECTURE)
 wx_add_sample(dragimag dragimag.cpp dragimag.h RES dragimag.rc
-    DATA backgrnd.png shape01.png shape02.png shape03.png)
+    DATA backgrnd.png shape01.png shape02.png shape03.png
+    DEPENDS wxUSE_DRAGIMAGE)
 wx_add_sample(drawing DATA pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp)
 wx_add_sample(erase)
 wx_add_sample(event event.cpp gestures.cpp gestures.h)
-wx_add_sample(except)
+wx_add_sample(except DEPENDS wxUSE_EXCEPTIONS)
 wx_add_sample(exec)
 wx_add_sample(font DATA wxprivate.ttf)
-wx_add_sample(fswatcher)
-wx_add_sample(grid griddemo.cpp griddemo.h LIBRARIES adv)
+wx_add_sample(fswatcher DEPENDS wxUSE_FSWATCHER)
+wx_add_sample(grid griddemo.cpp griddemo.h LIBRARIES adv DEPENDS wxUSE_GRID)
 
 wx_list_add_prefix(HELP_DOC_FILES doc/
     aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html
@@ -49,34 +50,38 @@ wx_add_sample(help demo.cpp LIBRARIES html adv
     doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif
     ${HELP_DOC_FILES}
     NAME helpdemo
+    DEPENDS wxUSE_HELP
     )
-wx_add_sample(htlbox LIBRARIES html)
-include(html.cmake)
+wx_add_sample(htlbox LIBRARIES html DEPENDS wxUSE_HTML)
+if(wxUSE_HTML)
+    include(html.cmake)
+endif()
 wx_add_sample(image image.cpp canvas.cpp canvas.h cursor_png.c RES image.rc
     DATA horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm
     horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur
-    horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png)
+    horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png
+    DEPENDS wxUSE_IMAGE)
 foreach(lang ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP)
     list(APPEND INTERNAT_DATA_FILES ${lang}/internat.po ${lang}/internat.mo)
 endforeach()
-wx_add_sample(internat DATA ${INTERNAT_DATA_FILES})
+wx_add_sample(internat DATA ${INTERNAT_DATA_FILES} DEPENDS wxUSE_INTL)
 # IPC samples
 set(wxSAMPLE_FOLDER ipc)
-wx_add_sample(ipc client.cpp client.h connection.h ipcsetup.h NAME ipcclient LIBRARIES net)
-wx_add_sample(ipc server.cpp server.h connection.h ipcsetup.h NAME ipcserver LIBRARIES net)
-wx_add_sample(ipc CONSOLE baseclient.cpp connection.h ipcsetup.h NAME baseipcclient LIBRARIES net)
-wx_add_sample(ipc CONSOLE baseserver.cpp connection.h ipcsetup.h NAME baseipcserver LIBRARIES net)
+wx_add_sample(ipc client.cpp client.h connection.h ipcsetup.h NAME ipcclient LIBRARIES net DEPENDS wxUSE_IPC)
+wx_add_sample(ipc server.cpp server.h connection.h ipcsetup.h NAME ipcserver LIBRARIES net DEPENDS wxUSE_IPC)
+wx_add_sample(ipc CONSOLE baseclient.cpp connection.h ipcsetup.h NAME baseipcclient LIBRARIES net DEPENDS wxUSE_IPC)
+wx_add_sample(ipc CONSOLE baseserver.cpp connection.h ipcsetup.h NAME baseipcserver LIBRARIES net DEPENDS wxUSE_IPC)
 set(wxSAMPLE_FOLDER)
-wx_add_sample(joytest joytest.cpp joytest.h DATA buttonpress.wav LIBRARIES adv)
+wx_add_sample(joytest joytest.cpp joytest.h DATA buttonpress.wav LIBRARIES adv DEPENDS wxUSE_JOYSTICK)
 wx_add_sample(keyboard)
 wx_add_sample(layout layout.cpp layout.h)
-wx_add_sample(listctrl listtest.cpp listtest.h RES listtest.rc)
-wx_add_sample(mdi mdi.cpp mdi.h RES mdi.rc)
+wx_add_sample(listctrl listtest.cpp listtest.h RES listtest.rc DEPENDS wxUSE_LISTCTRL)
+wx_add_sample(mdi mdi.cpp mdi.h RES mdi.rc DEPENDS wxUSE_MDI wxUSE_DOC_VIEW_ARCHITECTURE wxUSE_MDI_ARCHITECTURE)
 wx_add_sample(mediaplayer LIBRARIES media DEPENDS wxUSE_MEDIACTRL)
 wx_add_sample(memcheck)
-wx_add_sample(menu)
+wx_add_sample(menu DEPENDS wxUSE_MENUS)
 wx_add_sample(minimal IMPORTANT)
-wx_add_sample(notebook notebook.cpp notebook.h LIBRARIES aui adv)
+wx_add_sample(notebook notebook.cpp notebook.h LIBRARIES aui adv DEPENDS wxUSE_NOTEBOOK)
 if(wxUSE_OPENGL)
     set(wxSAMPLE_SUBDIR opengl/)
     set(wxSAMPLE_FOLDER OpenGL)
@@ -95,46 +100,48 @@ if(wxUSE_OPENGL)
     set(wxSAMPLE_FOLDER)
 endif()
 wx_add_sample(ownerdrw RES ownerdrw.rc DATA sound.png nosound.png DEPENDS wxUSE_OWNER_DRAWN)
-wx_add_sample(popup)
+wx_add_sample(popup DEPENDS wxUSE_POPUPWIN)
 wx_add_sample(power)
-wx_add_sample(preferences)
-wx_add_sample(printing printing.cpp printing.h)
+wx_add_sample(preferences DEPENDS wxUSE_PREFERENCES_EDITOR)
+wx_add_sample(printing printing.cpp printing.h DEPENDS wxUSE_PRINTING_ARCHITECTURE)
 wx_add_sample(propgrid propgrid.cpp propgrid_minimal.cpp sampleprops.cpp
-    tests.cpp sampleprops.h propgrid.h LIBRARIES adv propgrid NAME propgriddemo)
+    tests.cpp sampleprops.h propgrid.h LIBRARIES adv propgrid NAME propgriddemo DEPENDS wxUSE_PROPGRID)
 wx_add_sample(render FOLDER render)
 wx_add_sample(render DLL renddll.cpp NAME renddll FOLDER render)
-wx_add_sample(ribbon ribbondemo.cpp LIBRARIES ribbon adv NAME ribbondemo)
-wx_add_sample(richtext LIBRARIES richtext adv html xml NAME richtextdemo)
-wx_add_sample(sashtest sashtest.cpp sashtest.h RES sashtest.rc LIBRARIES adv)
+wx_add_sample(ribbon ribbondemo.cpp LIBRARIES ribbon adv NAME ribbondemo DEPENDS wxUSE_RIBBON)
+wx_add_sample(richtext LIBRARIES richtext adv html xml NAME richtextdemo DEPENDS wxUSE_XML wxUSE_RICHTEXT)
+wx_add_sample(sashtest sashtest.cpp sashtest.h RES sashtest.rc LIBRARIES adv DEPENDS wxUSE_SASH)
 wx_add_sample(scroll)
 wx_add_sample(secretstore CONSOLE DEPENDS wxUSE_SECRETSTORE)
 wx_add_sample(shaped DATA star.png)
-wx_add_sample(sockets client.cpp NAME client LIBRARIES net FOLDER sockets)
-wx_add_sample(sockets server.cpp NAME server LIBRARIES net FOLDER sockets)
-wx_add_sample(sockets CONSOLE baseclient.cpp NAME baseclient LIBRARIES net FOLDER sockets)
-wx_add_sample(sockets CONSOLE baseserver.cpp NAME baseserver LIBRARIES net FOLDER sockets)
-wx_add_sample(sound RES sound.rc DATA 9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav LIBRARIES adv)
-wx_add_sample(splash DATA splash.png press.mpg LIBRARIES adv)
+if(wxUSE_SOCKETS)
+    wx_add_sample(sockets client.cpp NAME client LIBRARIES net FOLDER sockets)
+    wx_add_sample(sockets server.cpp NAME server LIBRARIES net FOLDER sockets)
+    wx_add_sample(sockets CONSOLE baseclient.cpp NAME baseclient LIBRARIES net FOLDER sockets)
+    wx_add_sample(sockets CONSOLE baseserver.cpp NAME baseserver LIBRARIES net FOLDER sockets)
+endif()
+wx_add_sample(sound RES sound.rc DATA 9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav LIBRARIES adv DEPENDS wxUSE_SOUND)
+wx_add_sample(splash DATA splash.png press.mpg LIBRARIES adv DEPENDS wxUSE_SPLASH)
 if(TARGET splash AND wxUSE_MEDIACTRL)
     target_link_libraries(splash media)
 endif()
-wx_add_sample(splitter)
-wx_add_sample(statbar)
+wx_add_sample(splitter DEPENDS wxUSE_SPLITTER)
+wx_add_sample(statbar DEPENDS wxUSE_STATUSBAR)
 wx_add_sample(stc stctest.cpp edit.cpp prefs.cpp edit.h defsext.h prefs.h
-    DATA stctest.cpp NAME stctest LIBRARIES stc)
-wx_add_sample(svg svgtest.cpp RES svgtest.rc)
+    DATA stctest.cpp NAME stctest LIBRARIES stc DEPENDS wxUSE_STC)
+wx_add_sample(svg svgtest.cpp RES svgtest.rc DEPENDS wxUSE_SVG)
 wx_add_sample(taborder)
 wx_add_sample(taskbar tbtest.cpp tbtest.h LIBRARIES adv DEPENDS wxUSE_TASKBARICON)
-wx_add_sample(text)
-wx_add_sample(thread)
-wx_add_sample(toolbar RES toolbar.rc)
-wx_add_sample(treectrl treetest.cpp treetest.h)
-wx_add_sample(treelist LIBRARIES adv)
+wx_add_sample(text DEPENDS wxUSE_TEXTCTRL)
+wx_add_sample(thread DEPENDS wxUSE_THREADS)
+wx_add_sample(toolbar RES toolbar.rc DEPENDS wxUSE_TOOLBAR)
+wx_add_sample(treectrl treetest.cpp treetest.h DEPENDS wxUSE_TREECTRL)
+wx_add_sample(treelist LIBRARIES adv DEPENDS wxUSE_TREELISTCTRL)
 wx_add_sample(typetest typetest.cpp typetest.h)
-wx_add_sample(uiaction)
-wx_add_sample(validate validate.cpp validate.h)
+wx_add_sample(uiaction DEPENDS wxUSE_UIACTIONSIMULATOR)
+wx_add_sample(validate validate.cpp validate.h DEPENDS wxUSE_VALIDATORS)
 wx_add_sample(vscroll vstest.cpp)
-wx_add_sample(webview LIBRARIES webview stc adv NAME webviewsample)
+wx_add_sample(webview LIBRARIES webview stc adv NAME webviewsample DEPENDS wxUSE_WEBVIEW)
 # widgets Sample
 set(SAMPLE_WIDGETS_SRC
     activityindicator.cpp
@@ -182,7 +189,7 @@ if(APPLE)
     list(APPEND SAMPLE_WIDGETS_SRC native_wrapper.mm)
 endif()
 wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC} LIBRARIES adv)
-wx_add_sample(wizard LIBRARIES adv)
+wx_add_sample(wizard LIBRARIES adv DEPENDS wxUSE_WIZARDDLG)
 wx_add_sample(wrapsizer)
 
 wx_list_add_prefix(XRC_RC_FILES rc/
@@ -213,31 +220,34 @@ wx_add_sample(xrc
     DATA ${XRC_RC_FILES}
     LIBRARIES aui ribbon xrc html adv
     NAME xrcdemo
+    DEPENDS wxUSE_XML wxUSE_XRC
     )
 wx_add_sample(xti xti.cpp classlist.cpp codereadercallback.cpp
     classlist.h codereadercallback.h LIBRARIES xml
-    DEPENDS wxUSE_EXTENDED_RTTI)
+    DEPENDS wxUSE_XML wxUSE_EXTENDED_RTTI)
 
 if(WIN32)
     # Windows only samples
 
     # DLL Sample
-    wx_add_sample(dll DLL my_dll.cpp my_dll.h NAME my_dll FOLDER dll
-        DEFINITIONS MY_DLL_BUILDING)
-    if(NOT wxBUILD_SHARED)
-        # this test only makes sense with statically built wx, otherwise
-        # the same copy of wx would be used
-        wx_add_sample(dll wx_exe.cpp my_dll.h NAME wx_exe FOLDER dll LIBRARIES my_dll)
-    endif()
+    if(wxUSE_DYNLIBCLASS)
+        wx_add_sample(dll DLL my_dll.cpp my_dll.h NAME my_dll FOLDER dll
+            DEFINITIONS MY_DLL_BUILDING)
+        if(NOT wxBUILD_SHARED)
+            # this test only makes sense with statically built wx, otherwise
+            # the same copy of wx would be used
+            wx_add_sample(dll wx_exe.cpp my_dll.h NAME wx_exe FOLDER dll LIBRARIES my_dll)
+        endif()
 
-    wx_add_sample(dll sdk_exe.cpp my_dll.h NAME sdk_exe FOLDER dll LIBRARIES my_dll)
+        wx_add_sample(dll sdk_exe.cpp my_dll.h NAME sdk_exe FOLDER dll LIBRARIES my_dll)
+    endif()
     if(MSVC)
         wx_add_sample(flash)
     endif()
     #TODO: renable when sample is fixed
     #wx_add_sample(mfc mfctest.cpp mfctest.h resource.h stdafx.h RES mfctest.rc)
     wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc)
-    wx_add_sample(oleauto)
-    wx_add_sample(regtest RES regtest.rc)
+    wx_add_sample(oleauto DEPENDS wxUSE_OLE)
+    wx_add_sample(regtest RES regtest.rc DEPENDS wxUSE_REGKEY)
     wx_add_sample(taskbarbutton LIBRARIES adv DEPENDS wxUSE_TASKBARBUTTON)
 endif()
diff --git a/build/cmake/samples/html.cmake b/build/cmake/samples/html.cmake
index 23dbf91a03..402d0618d2 100644
--- a/build/cmake/samples/html.cmake
+++ b/build/cmake/samples/html.cmake
@@ -23,11 +23,12 @@ wx_list_add_prefix(HELP_DATA_FILES helpfiles/
     page2-b.htm
     testing.hhp
     )
-wx_add_sample(help DATA ${HELP_DATA_FILES} LIBRARIES html NAME htmlhelp)
-wx_add_sample(helpview DATA test.zip LIBRARIES html)
+wx_add_sample(help DATA ${HELP_DATA_FILES} LIBRARIES html NAME htmlhelp DEPENDS wxUSE_HELP)
+wx_add_sample(helpview DATA test.zip LIBRARIES html DEPENDS wxUSE_HELP)
 #TODO: htmlctrl sample uses outdated definitions
 #wx_add_sample(htmlctrl LIBRARIES html)
-wx_add_sample(printing DATA logo6.gif test.htm LIBRARIES html NAME htmlprinting)
+wx_add_sample(printing DATA logo6.gif test.htm LIBRARIES html NAME htmlprinting
+    DEPENDS wxUSE_PRINTING_ARCHITECTURE)
 wx_add_sample(test
     DATA
         imagemap.png pic.png pic2.bmp i18n.gif
@@ -36,7 +37,7 @@ wx_add_sample(test
     LIBRARIES net html NAME htmltest)
 wx_add_sample(virtual DATA start.htm LIBRARIES html)
 wx_add_sample(widget DATA start.htm LIBRARIES html)
-wx_add_sample(zip DATA pages.zip start.htm LIBRARIES html)
+wx_add_sample(zip DATA pages.zip start.htm LIBRARIES html DEPENDS wxUSE_FSZIP)
 
 set(wxSAMPLE_SUBDIR)
 set(wxSAMPLE_FOLDER)

From aaf58e2b495f1d4f8b6a207ec36e457e88a4beab Mon Sep 17 00:00:00 2001
From: Maarten <MaartenBent@users.noreply.github.com>
Date: Sun, 4 Feb 2018 18:51:22 +0100
Subject: [PATCH 320/916] Set Unicode definitions for third party libraries in
 CMake build

See https://github.com/wxWidgets/wxWidgets/pull/717

See #18077.
---
 build/cmake/functions.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index a3809a6259..23c68ee76d 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -407,6 +407,14 @@ function(wx_set_builtin_target_properties target_name)
                 OUTPUT_NAME_DEBUG ${target_name}${lib_unicode}d
         )
     endif()
+
+    if(wxUSE_UNICODE)
+        if(WIN32)
+            target_compile_definitions(${target_name} PUBLIC UNICODE)
+        endif()
+        target_compile_definitions(${target_name} PUBLIC _UNICODE)
+    endif()
+
     if(MSVC)
         # we're not interested in deprecation warnings about the use of
         # standard C functions in the 3rd party libraries (these warnings

From 77231f59076486f396d6baff0fad066dadbe4675 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 22:20:22 +0100
Subject: [PATCH 321/916] Make wxDataViewRendererBase::DestroyEditControl()
 private

This method is only supposed to be used by this class and not any
derived classes, so prevent it from being used accidentally.

No real changes.
---
 include/wx/dvrenderers.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index b672b88f51..0d2615b659 100644
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -241,9 +241,6 @@ protected:
     // (typically selection with dark background). For internal use only.
     virtual bool IsHighlighted() const = 0;
 
-    // Called from {Cancel,Finish}Editing() to cleanup m_editorCtrl
-    void DestroyEditControl();
-
     // Helper of PrepareForItem() also used in StartEditing(): returns the
     // value checking that its type matches our GetVariantType().
     wxVariant CheckedGetValue(const wxDataViewModel* model,
@@ -261,7 +258,10 @@ protected:
     // renderer is required
     wxDataViewCtrl* GetView() const;
 
-protected:
+private:
+    // Called from {Called,Finish}Editing() and dtor to cleanup m_editorCtrl
+    void DestroyEditControl();
+
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRendererBase);
 };
 

From 7e3d28e79f1391b965330efb43a0f290b83f3a4a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 22:31:23 +0100
Subject: [PATCH 322/916] Rename wxDataViewEvent::SetEditCanceled() and remove
 its argument

This method should be only used when the edit is really cancelled, so it
doesn't need to take a boolean argument.

It should also use the same spelling as IsEditCancelled() (and for
consistency with the rest of wxWidgets API which uses British English).

Also remove this method from the documentation, it is not part of the
public API.
---
 include/wx/dataview.h   | 2 +-
 interface/wx/dataview.h | 1 -
 src/common/datavcmn.cpp | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 79b200cc09..58b0fdafe4 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -859,7 +859,6 @@ public:
 
     // for wxEVT_DATAVIEW_ITEM_EDITING_DONE only
     bool IsEditCancelled() const { return m_editCancelled; }
-    void SetEditCanceled(bool editCancelled) { m_editCancelled = editCancelled; }
 
     // for wxEVT_DATAVIEW_COLUMN_HEADER_CLICKED only
     wxDataViewColumn *GetDataViewColumn() const { return m_column; }
@@ -907,6 +906,7 @@ public:
 #endif // WXWIN_COMPATIBILITY_3_0
 
     void SetColumn( int col ) { m_col = col; }
+    void SetEditCancelled() { m_editCancelled = true; }
 
 protected:
     wxDataViewItem      m_item;
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index cbb5ba2566..81c493efa4 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3818,7 +3818,6 @@ public:
      */
     wxDataViewItem GetItem() const;
     void SetItem( const wxDataViewItem &item );
-    void SetEditCanceled(bool editCancelled);
     void SetPosition( int x, int y );
     void SetCache(int from, int to);
     wxDataObject *GetDataObject() const;
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index df7ad9cd1f..a7d7597fff 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -798,7 +798,8 @@ bool wxDataViewRendererBase::FinishEditing()
     // Now we should send Editing Done event
     wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl, column, m_item);
     event.SetValue( value );
-    event.SetEditCanceled( !isValid );
+    if ( !isValid )
+        event.SetEditCancelled();
     dv_ctrl->GetEventHandler()->ProcessEvent( event );
 
     bool accepted = false;

From 1e3e5b72530d51d2465c8ba876869cfbb8d74b50 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 22:40:51 +0100
Subject: [PATCH 323/916] Send wxEVT_DATAVIEW_ITEM_EDITING_DONE after
 cancelling too

Previously this event was not sent at all if editing the item was
cancelled, e.g. by pressing Esc.

Do send it now from the generic implementation and update the sample to
show this event.

See #17835.
---
 docs/changes.txt              |  1 +
 include/wx/dvrenderers.h      |  3 +++
 samples/dataview/dataview.cpp |  6 ++++-
 src/common/datavcmn.cpp       | 51 +++++++++++++++++++++++++----------
 4 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 6ad30469d8..8520be4207 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -182,6 +182,7 @@ All (GUI):
 - Generate wxEVT_SEARCH on Enter under all platforms.
 - Extend wxRendererNative::DrawGauge() to work for vertical gauges too.
 - Add wxHD_BITMAP_ON_RIGHT style to wxHeaderCtrl.
+- Send wxEVT_DATAVIEW_ITEM_EDITING_DONE when editing was cancelled too.
 
 wxGTK:
 
diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index 0d2615b659..c1230cafcc 100644
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -259,6 +259,9 @@ protected:
     wxDataViewCtrl* GetView() const;
 
 private:
+    // Common part of {Cancel,Finish}Editing().
+    bool DoFinishOrCancelEditing(bool cancelled);
+
     // Called from {Called,Finish}Editing() and dtor to cleanup m_editorCtrl
     void DestroyEditControl();
 
diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 64e89e7b71..240fc74d40 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -1227,7 +1227,11 @@ void MyFrame::OnEditingStarted( wxDataViewEvent &event )
 void MyFrame::OnEditingDone( wxDataViewEvent &event )
 {
     wxString title = m_music_model->GetTitle( event.GetItem() );
-    wxLogMessage( "wxEVT_DATAVIEW_ITEM_EDITING_DONE, Item: %s", title );
+    wxLogMessage("wxEVT_DATAVIEW_ITEM_EDITING_DONE, Item: %s, new value %s",
+                 title,
+                 event.IsEditCancelled()
+                    ? wxString("unavailable because editing was cancelled")
+                    : event.GetValue().GetString());
 }
 
 void MyFrame::OnExpanded( wxDataViewEvent &event )
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index a7d7597fff..dcbc5cd101 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -766,44 +766,67 @@ void wxDataViewRendererBase::DestroyEditControl()
 
 void wxDataViewRendererBase::CancelEditing()
 {
-    if (!m_editorCtrl)
-        return;
-
-    DestroyEditControl();
+    DoFinishOrCancelEditing(true);
 }
 
 bool wxDataViewRendererBase::FinishEditing()
+{
+    return DoFinishOrCancelEditing(false);
+}
+
+bool wxDataViewRendererBase::DoFinishOrCancelEditing(bool cancelled)
 {
     if (!m_editorCtrl)
         return true;
 
-    // Try to get the value, normally we should succeed but if we fail, don't
-    // return immediately, we still need to destroy the edit control.
+    bool gotValue = false;
+
     wxVariant value;
-    const bool gotValue = GetValueFromEditorCtrl(m_editorCtrl, value);
+    if ( !cancelled )
+    {
+        if ( GetValueFromEditorCtrl(m_editorCtrl, value) )
+        {
+            // This is the normal case and we will use this value below (if it
+            // passes validation).
+            gotValue = true;
+        }
+        //else: Not really supposed to happen, but still proceed with
+        //      destroying the edit control if it does.
+    }
 
     wxDataViewColumn* const column = GetOwner();
     wxDataViewCtrl* const dv_ctrl = column->GetOwner();
 
     DestroyEditControl();
 
-    dv_ctrl->GetMainWindow()->SetFocus();
+    // If we're cancelled, it can be because focus was switched elsewhere,
+    // don't bring it back here.
+    if ( !cancelled )
+        dv_ctrl->GetMainWindow()->SetFocus();
 
-    if ( !gotValue )
-        return false;
+    if ( gotValue )
+    {
+        if ( !Validate(value) )
+        {
+            // Invalid value can't be used, so if it's the same as if we hadn't
+            // got it in the first place.
+            gotValue = false;
+        }
+    }
 
-    bool isValid = Validate(value);
     unsigned int col = GetOwner()->GetModelColumn();
 
     // Now we should send Editing Done event
     wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl, column, m_item);
-    event.SetValue( value );
-    if ( !isValid )
+    if ( gotValue )
+        event.SetValue(value);
+    else
         event.SetEditCancelled();
+
     dv_ctrl->GetEventHandler()->ProcessEvent( event );
 
     bool accepted = false;
-    if ( isValid && event.IsAllowed() )
+    if ( gotValue && event.IsAllowed() )
     {
         dv_ctrl->GetModel()->ChangeValue(value, m_item, col);
         accepted = true;

From 0972dece2785442315570278d898d15e5619a19d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Feb 2018 23:43:47 +0100
Subject: [PATCH 324/916] Catch EDITING_{STARTED,DONE} for all pages in
 dataview sample

This is useful to allow checking that the expected events are sent for
the custom editor in the second page of the sample too, in addition to
the standard ones used in the first page.
---
 samples/dataview/dataview.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 240fc74d40..1393a86fee 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -417,8 +417,8 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_DATAVIEW_SELECTION_CHANGED(ID_MUSIC_CTRL, MyFrame::OnSelectionChanged)
 
     EVT_DATAVIEW_ITEM_START_EDITING(ID_MUSIC_CTRL, MyFrame::OnStartEditing)
-    EVT_DATAVIEW_ITEM_EDITING_STARTED(ID_MUSIC_CTRL, MyFrame::OnEditingStarted)
-    EVT_DATAVIEW_ITEM_EDITING_DONE(ID_MUSIC_CTRL, MyFrame::OnEditingDone)
+    EVT_DATAVIEW_ITEM_EDITING_STARTED(wxID_ANY, MyFrame::OnEditingStarted)
+    EVT_DATAVIEW_ITEM_EDITING_DONE(wxID_ANY, MyFrame::OnEditingDone)
 
     EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderClick)
     EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(ID_MUSIC_CTRL, MyFrame::OnHeaderRightClick)
@@ -1220,15 +1220,17 @@ void MyFrame::OnStartEditing( wxDataViewEvent &event )
 
 void MyFrame::OnEditingStarted( wxDataViewEvent &event )
 {
-    wxString title = m_music_model->GetTitle( event.GetItem() );
-    wxLogMessage( "wxEVT_DATAVIEW_ITEM_EDITING_STARTED, Item: %s", title );
+    // This event doesn't, currently, carry the value, so get it ourselves.
+    wxDataViewModel* const model = event.GetModel();
+    wxVariant value;
+    model->GetValue(value, event.GetItem(), event.GetColumn());
+    wxLogMessage("wxEVT_DATAVIEW_ITEM_EDITING_STARTED, current value %s",
+                 value.GetString());
 }
 
 void MyFrame::OnEditingDone( wxDataViewEvent &event )
 {
-    wxString title = m_music_model->GetTitle( event.GetItem() );
-    wxLogMessage("wxEVT_DATAVIEW_ITEM_EDITING_DONE, Item: %s, new value %s",
-                 title,
+    wxLogMessage("wxEVT_DATAVIEW_ITEM_EDITING_DONE, new value %s",
                  event.IsEditCancelled()
                     ? wxString("unavailable because editing was cancelled")
                     : event.GetValue().GetString());

From a00b8dec8b2eac69eeb399846758bac7ff409421 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Feb 2018 00:01:52 +0100
Subject: [PATCH 325/916] Reduce code duplication in wxGTK wxDataViewRenderer
 classes

The code was more complicated than necessary, with the base class
providing both virtual GtkOnCellChanged() and GtkOnTextEdited() that
were both overridden to achieve the same thing, namely customizing how
the value entered by user is converted to wxVariant, in different
derived classes.

Make GtkOnTextEdited() non-virtual and remove GtkOnCellChanged()
completely and add a new simple GtkGetValueFromString() which is called
from GtkOnTextEdited() to do the conversion.

This removes the existing code duplication and will make it simpler to
modify this code in the future, without changing the behaviour.
---
 include/wx/gtk/dvrenderer.h  | 17 +++++++++------
 include/wx/gtk/dvrenderers.h |  6 ++----
 src/gtk/dataview.cpp         | 41 +++++++++++++-----------------------
 3 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/include/wx/gtk/dvrenderer.h b/include/wx/gtk/dvrenderer.h
index da5d540e2b..0704b89ff6 100644
--- a/include/wx/gtk/dvrenderer.h
+++ b/include/wx/gtk/dvrenderer.h
@@ -47,9 +47,10 @@ public:
 
     // called when the cell value was edited by user with the new value
     //
-    // it validates the new value and notifies the model about the change by
-    // calling GtkOnCellChanged() if it was accepted
-    virtual void GtkOnTextEdited(const char *itempath, const wxString& value);
+    // it uses GtkGetValueFromString() to parse the new value, then validates
+    // it by calling Validate() and notifies the model about the change if it
+    // passes validation
+    void GtkOnTextEdited(const char *itempath, const wxString& value);
 
     GtkCellRenderer* GetGtkHandle() { return m_renderer; }
     void GtkInitHandlers();
@@ -78,14 +79,16 @@ protected:
 
     virtual bool IsHighlighted() const wxOVERRIDE;
 
-    virtual void GtkOnCellChanged(const wxVariant& value,
-                                  const wxDataViewItem& item,
-                                  unsigned col);
-
     // Apply our effective alignment (i.e. m_alignment if specified or the
     // associated column alignment by default) to the given renderer.
     void GtkApplyAlignment(GtkCellRenderer *renderer);
 
+    // This method is used to interpret the string entered by user and by
+    // default just uses it as is, but can be overridden for classes requiring
+    // special treatment.
+    virtual wxVariant GtkGetValueFromString(const wxString& str) const;
+
+
     GtkCellRenderer    *m_renderer;
     int                 m_alignment;
 
diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h
index 9169d09761..67d81df79e 100644
--- a/include/wx/gtk/dvrenderers.h
+++ b/include/wx/gtk/dvrenderers.h
@@ -228,9 +228,7 @@ public:
     virtual void GtkPackIntoColumn(GtkTreeViewColumn *column) wxOVERRIDE;
 
 protected:
-    virtual void GtkOnCellChanged(const wxVariant& value,
-                                  const wxDataViewItem& item,
-                                  unsigned col) wxOVERRIDE;
+    virtual wxVariant GtkGetValueFromString(const wxString& str) const wxOVERRIDE;
 
 private:
     wxDataViewIconText   m_value;
@@ -281,7 +279,7 @@ public:
     virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
 
 private:
-    virtual void GtkOnTextEdited(const char *itempath, const wxString& str) wxOVERRIDE;
+    virtual wxVariant GtkGetValueFromString(const wxString& str) const;
 };
 
 
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index b677de2b69..d1f55061f6 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -2155,26 +2155,24 @@ bool wxDataViewRenderer::IsHighlighted() const
            GetOwner()->GetOwner()->IsSelected(m_itemBeingRendered);
 }
 
+wxVariant
+wxDataViewRenderer::GtkGetValueFromString(const wxString& str) const
+{
+    return str;
+}
+
 void
 wxDataViewRenderer::GtkOnTextEdited(const char *itempath, const wxString& str)
 {
-    wxVariant value(str);
+    wxVariant value(GtkGetValueFromString(str));
     if (!Validate( value ))
         return;
 
     wxDataViewItem
         item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath)));
 
-    GtkOnCellChanged(value, item, GetOwner()->GetModelColumn());
-}
-
-void
-wxDataViewRenderer::GtkOnCellChanged(const wxVariant& value,
-                                     const wxDataViewItem& item,
-                                     unsigned col)
-{
     wxDataViewModel *model = GetOwner()->GetOwner()->GetModel();
-    model->ChangeValue( value, item, col );
+    model->ChangeValue( value, item, GetOwner()->GetModelColumn() );
 }
 
 void wxDataViewRenderer::SetAttr(const wxDataViewItemAttr& WXUNUSED(attr))
@@ -2941,17 +2939,10 @@ wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayS
     m_variantType = wxS("long");
 }
 
-void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const char *itempath, const wxString& str)
+wxVariant
+wxDataViewChoiceByIndexRenderer::GtkGetValueFromString(const wxString& str) const
 {
-    wxVariant value( (long) GetChoices().Index( str ) );
-
-    if (!Validate( value ))
-        return;
-
-    wxDataViewItem
-        item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath)));
-
-    GtkOnCellChanged(value, item, GetOwner()->GetModelColumn());
+    return static_cast<long>(GetChoices().Index(str));
 }
 
 bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value )
@@ -3024,17 +3015,15 @@ bool wxDataViewIconTextRenderer::GetValue(wxVariant& value) const
     return true;
 }
 
-void
-wxDataViewIconTextRenderer::GtkOnCellChanged(const wxVariant& value,
-                                             const wxDataViewItem& item,
-                                             unsigned col)
+wxVariant
+wxDataViewIconTextRenderer::GtkGetValueFromString(const wxString& str) const
 {
     // we receive just the text part of our value as it's the only one which
     // can be edited, but we need the full wxDataViewIconText value for the
     // model
     wxVariant valueIconText;
-    valueIconText << wxDataViewIconText(value.GetString(), m_value.GetIcon());
-    wxDataViewTextRenderer::GtkOnCellChanged(valueIconText, item, col);
+    valueIconText << wxDataViewIconText(str, m_value.GetIcon());
+    return valueIconText;
 }
 
 // ---------------------------------------------------------

From 33cbefd7398ac5729c787c1a9fd21b0565a6241a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Feb 2018 01:05:16 +0100
Subject: [PATCH 326/916] Send wxEVT_DATAVIEW_ITEM_EDITING_DONE for all
 renderers in wxGTK

Previously this event was not sent for the standard renderers, such as
wxDataViewTextRenderer, at all in wxGTK because the base class
FinishEditing() class didn't do anything if m_editorCtrl was null, as it
was always the case for non-custom renderers.

Fix this by refactoring the base class code in yet another way and
extracting the part which can be reused by both the generic and GTK
implementation in a new DoHandleEditingDone() function and call it from
wxGTK code.

Finally, check "editing-canceled" property to also correctly generate
the event with IsEditCancelled() returning true when editing is canceled
by e.g. pressing Esc in a standard renderer too.

And, as a final bonus, this makes the (just introduced) slightly
artificial DoFinishOrCancelEditing() unnecessary, so it can be removed,
without reintroducing any code duplication.

See #17835.
---
 include/wx/dvrenderers.h |  9 ++++--
 src/common/datavcmn.cpp  | 69 +++++++++++++++++++---------------------
 src/gtk/dataview.cpp     | 28 ++++++++++------
 3 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index c1230cafcc..4cda6ba033 100644
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -247,6 +247,12 @@ protected:
                               const wxDataViewItem& item,
                               unsigned column) const;
 
+    // Validates the given value (if it is non-null) and sends (in any case)
+    // ITEM_EDITING_DONE event and, finally, updates the model with the value
+    // (f it is valid, of course) if the event wasn't vetoed.
+    bool DoHandleEditingDone(wxVariant* value);
+
+
     wxString                m_variantType;
     wxDataViewColumn       *m_owner;
     wxWeakRef<wxWindow>     m_editorCtrl;
@@ -259,9 +265,6 @@ protected:
     wxDataViewCtrl* GetView() const;
 
 private:
-    // Common part of {Cancel,Finish}Editing().
-    bool DoFinishOrCancelEditing(bool cancelled);
-
     // Called from {Called,Finish}Editing() and dtor to cleanup m_editorCtrl
     void DestroyEditControl();
 
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index dcbc5cd101..9043cf3fd4 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -766,15 +766,13 @@ void wxDataViewRendererBase::DestroyEditControl()
 
 void wxDataViewRendererBase::CancelEditing()
 {
-    DoFinishOrCancelEditing(true);
+    if ( m_editorCtrl )
+        DestroyEditControl();
+
+    DoHandleEditingDone(NULL);
 }
 
 bool wxDataViewRendererBase::FinishEditing()
-{
-    return DoFinishOrCancelEditing(false);
-}
-
-bool wxDataViewRendererBase::DoFinishOrCancelEditing(bool cancelled)
 {
     if (!m_editorCtrl)
         return true;
@@ -782,53 +780,52 @@ bool wxDataViewRendererBase::DoFinishOrCancelEditing(bool cancelled)
     bool gotValue = false;
 
     wxVariant value;
-    if ( !cancelled )
+    if ( GetValueFromEditorCtrl(m_editorCtrl, value) )
     {
-        if ( GetValueFromEditorCtrl(m_editorCtrl, value) )
+        // This is the normal case and we will use this value below (if it
+        // passes validation).
+        gotValue = true;
+    }
+    //else: Not really supposed to happen, but still proceed with
+    //      destroying the edit control if it does.
+
+    DestroyEditControl();
+
+    GetView()->GetMainWindow()->SetFocus();
+
+    return DoHandleEditingDone(gotValue ? &value : NULL);
+}
+
+bool
+wxDataViewRendererBase::DoHandleEditingDone(wxVariant* value)
+{
+    if ( value )
+    {
+        if ( !Validate(*value) )
         {
-            // This is the normal case and we will use this value below (if it
-            // passes validation).
-            gotValue = true;
+            // Invalid value can't be used, so if it's the same as if we hadn't
+            // got it in the first place.
+            value = NULL;
         }
-        //else: Not really supposed to happen, but still proceed with
-        //      destroying the edit control if it does.
     }
 
     wxDataViewColumn* const column = GetOwner();
     wxDataViewCtrl* const dv_ctrl = column->GetOwner();
-
-    DestroyEditControl();
-
-    // If we're cancelled, it can be because focus was switched elsewhere,
-    // don't bring it back here.
-    if ( !cancelled )
-        dv_ctrl->GetMainWindow()->SetFocus();
-
-    if ( gotValue )
-    {
-        if ( !Validate(value) )
-        {
-            // Invalid value can't be used, so if it's the same as if we hadn't
-            // got it in the first place.
-            gotValue = false;
-        }
-    }
-
-    unsigned int col = GetOwner()->GetModelColumn();
+    unsigned int col = column->GetModelColumn();
 
     // Now we should send Editing Done event
     wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl, column, m_item);
-    if ( gotValue )
-        event.SetValue(value);
+    if ( value )
+        event.SetValue(*value);
     else
         event.SetEditCancelled();
 
     dv_ctrl->GetEventHandler()->ProcessEvent( event );
 
     bool accepted = false;
-    if ( gotValue && event.IsAllowed() )
+    if ( value && event.IsAllowed() )
     {
-        dv_ctrl->GetModel()->ChangeValue(value, m_item, col);
+        dv_ctrl->GetModel()->ChangeValue(*value, m_item, col);
         accepted = true;
     }
 
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index d1f55061f6..6ed97b47b7 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1932,9 +1932,24 @@ bool wxGtkDataViewModelNotifier::Cleared()
 // ---------------------------------------------------------
 
 static void
-wxgtk_cell_editable_editing_done( GtkCellEditable *WXUNUSED(editable),
+wxgtk_cell_editable_editing_done( GtkCellEditable *editable,
                                   wxDataViewRenderer *wxrenderer )
 {
+    // "editing-cancelled" property is documented as being new since 2.20 in
+    // GtkCellEditable, but seems to have existed basically forever (since GTK+
+    // 1.3 days) in GtkCellRendererText, so try to use it in any case.
+    if ( g_object_class_find_property(G_OBJECT_GET_CLASS(editable),
+                                      "editing-canceled") )
+    {
+        gboolean wasCancelled;
+        g_object_get(editable, "editing-canceled", &wasCancelled, NULL);
+        if ( wasCancelled )
+        {
+            wxrenderer->CancelEditing();
+            return;
+        }
+    }
+
     wxrenderer->FinishEditing();
 }
 
@@ -2164,15 +2179,10 @@ wxDataViewRenderer::GtkGetValueFromString(const wxString& str) const
 void
 wxDataViewRenderer::GtkOnTextEdited(const char *itempath, const wxString& str)
 {
+    m_item = wxDataViewItem(GetView()->GTKPathToItem(wxGtkTreePath(itempath)));
+
     wxVariant value(GtkGetValueFromString(str));
-    if (!Validate( value ))
-        return;
-
-    wxDataViewItem
-        item(GetOwner()->GetOwner()->GTKPathToItem(wxGtkTreePath(itempath)));
-
-    wxDataViewModel *model = GetOwner()->GetOwner()->GetModel();
-    model->ChangeValue( value, item, GetOwner()->GetModelColumn() );
+    DoHandleEditingDone(&value);
 }
 
 void wxDataViewRenderer::SetAttr(const wxDataViewItemAttr& WXUNUSED(attr))

From 1f2173b9be49016f023a6de982c08542b10db7f3 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Sun, 4 Feb 2018 16:32:03 -0500
Subject: [PATCH 327/916] Fix custom scheme handling in wxWebView WebKit2
 implementation

The custom scheme handling implementation had been inherited from the
original WebKit1 implementation.  It attempted to intercept navigation
and resource load requests and then inject the resources.  It seems that
this method doesn't work in WebKit2, but fortunately, there is native
support in WebKit2 for custom URI schemes through the
webkit_web_context_register_uri_scheme() API.

Also extend wxGtkError to allow creating it from an existing GError
object as a side-effect of these changes.

See https://github.com/wxWidgets/wxWidgets/pull/716
---
 docs/changes.txt               |   1 +
 include/wx/gtk/private/error.h |   6 ++
 src/gtk/webview_webkit2.cpp    | 137 +++++++++++++--------------------
 3 files changed, 60 insertions(+), 84 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 6ad30469d8..9eb241556d 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -209,6 +209,7 @@ wxGTK:
 - Implement ShowPosition() for single-line wxTextCtrl.
 - Improve wx{Client,Paint,Screen,Window}DC::GetPPI() (GTK+ 3).
 - Suppress focus loss events for wxChoice and wxComboBox on opening popup.
+- Make custom URI schemes work WebKit2-based wxWebView (Scott Talbert).
 
 wxMSW:
 
diff --git a/include/wx/gtk/private/error.h b/include/wx/gtk/private/error.h
index e3b49475b7..25802dd6f3 100644
--- a/include/wx/gtk/private/error.h
+++ b/include/wx/gtk/private/error.h
@@ -21,6 +21,7 @@ class wxGtkError
 {
 public:
     wxGtkError() { m_error = NULL; }
+    explicit wxGtkError(GError* error) { m_error = error; }
     ~wxGtkError() { if ( m_error ) g_error_free(m_error); }
 
     GError** Out()
@@ -37,6 +38,11 @@ public:
         return m_error != NULL;
     }
 
+    operator GError*() const
+    {
+        return m_error;
+    }
+
     wxString GetMessage() const
     {
         return wxString::FromUTF8(m_error->message);
diff --git a/src/gtk/webview_webkit2.cpp b/src/gtk/webview_webkit2.cpp
index c65c41c3ad..cc495dea75 100644
--- a/src/gtk/webview_webkit2.cpp
+++ b/src/gtk/webview_webkit2.cpp
@@ -67,7 +67,7 @@ wxgtk_webview_webkit_load_changed(GtkWidget *,
 }
 
 static gboolean
-wxgtk_webview_webkit_navigation(WebKitWebView *web_view,
+wxgtk_webview_webkit_navigation(WebKitWebView *,
                                 WebKitPolicyDecision *decision,
                                 wxWebViewWebKit *webKitCtrl)
 {
@@ -93,16 +93,6 @@ wxgtk_webview_webkit_navigation(WebKitWebView *web_view,
         return TRUE;
     }
 
-    if(webKitCtrl->m_guard)
-    {
-        webKitCtrl->m_guard = false;
-        //We set this to make sure that we don't try to load the page again from
-        //the resource request callback
-        webKitCtrl->m_vfsurl = webkit_web_view_get_uri(web_view);
-        webkit_policy_decision_use(decision);
-        return FALSE;
-    }
-
     webKitCtrl->m_busy = true;
 
     wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING,
@@ -120,32 +110,6 @@ wxgtk_webview_webkit_navigation(WebKitWebView *web_view,
     }
     else
     {
-        wxString wxuri = uri;
-        wxSharedPtr<wxWebViewHandler> handler;
-        wxVector<wxSharedPtr<wxWebViewHandler> > handlers = webKitCtrl->GetHandlers();
-        //We are not vetoed so see if we match one of the additional handlers
-        for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = handlers.begin();
-            it != handlers.end(); ++it)
-        {
-            if(wxuri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
-            {
-                handler = (*it);
-            }
-        }
-        //If we found a handler we can then use it to load the file directly
-        //ourselves
-        if(handler)
-        {
-            webKitCtrl->m_guard = true;
-            wxFSFile* file = handler->GetFile(wxuri);
-            if(file)
-            {
-                webKitCtrl->SetPage(*file->GetStream(), wxuri);
-            }
-            //We need to throw some sort of error here if file is NULL
-            webkit_policy_decision_ignore(decision);
-            return TRUE;
-        }
         return FALSE;
     }
 }
@@ -325,49 +289,53 @@ wxgtk_webview_webkit_title_changed(GtkWidget* widget,
 }
 
 static void
-wxgtk_webview_webkit_resource_req(WebKitWebView *,
-                                  WebKitWebResource *,
-                                  WebKitURIRequest *request,
-                                  wxWebViewWebKit *webKitCtrl)
+wxgtk_webview_webkit_uri_scheme_request_cb(WebKitURISchemeRequest *request,
+                                           wxWebViewWebKit *webKitCtrl)
 {
-    wxString uri = webkit_uri_request_get_uri(request);
+    const wxString scheme = wxString::FromUTF8(webkit_uri_scheme_request_get_scheme(request));
 
     wxSharedPtr<wxWebViewHandler> handler;
     wxVector<wxSharedPtr<wxWebViewHandler> > handlers = webKitCtrl->GetHandlers();
 
-    //We are not vetoed so see if we match one of the additional handlers
     for(wxVector<wxSharedPtr<wxWebViewHandler> >::iterator it = handlers.begin();
         it != handlers.end(); ++it)
     {
-        if(uri.substr(0, (*it)->GetName().length()) == (*it)->GetName())
+        if(scheme == (*it)->GetName())
         {
             handler = (*it);
         }
     }
-    //If we found a handler we can then use it to load the file directly
-    //ourselves
+
     if(handler)
     {
-        //If it is requsting the page itself then return as we have already
-        //loaded it from the archive
-        if(webKitCtrl->m_vfsurl == uri)
-            return;
+        const wxString uri = wxString::FromUTF8(webkit_uri_scheme_request_get_uri(request));
 
         wxFSFile* file = handler->GetFile(uri);
         if(file)
         {
-            //We load the data into a data url to save it being written out again
-            size_t size = file->GetStream()->GetLength();
-            char *buffer = new char[size];
-            file->GetStream()->Read(buffer, size);
-            wxString data = wxBase64Encode(buffer, size);
-            delete[] buffer;
+            gint64 length = file->GetStream()->GetLength();
+            guint8 *data = g_new(guint8, length);
+            file->GetStream()->Read(data, length);
+            GInputStream *stream = g_memory_input_stream_new_from_data(data,
+                                                                       length,
+                                                                       g_free);
             wxString mime = file->GetMimeType();
-            wxString path = "data:" + mime + ";base64," + data;
-            //Then we can redirect the call
-            webkit_uri_request_set_uri(request, path.utf8_str());
+            webkit_uri_scheme_request_finish(request, stream, length, mime.utf8_str());
         }
-
+        else
+        {
+            wxGtkError error(g_error_new(WEBKIT_NETWORK_ERROR,
+                                         WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST,
+                                         "File not found: %s", uri.utf8_str().data()));
+            webkit_uri_scheme_request_finish_error(request, error);
+        }
+    }
+    else
+    {
+        wxGtkError error(g_error_new(WEBKIT_NETWORK_ERROR,
+                                     WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL,
+                                     "Unknown scheme: %s", scheme.utf8_str().data()));
+        webkit_uri_scheme_request_finish_error(request, error);
     }
 }
 
@@ -569,38 +537,35 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
     }
 
     SetupWebExtensionServer();
-    g_signal_connect_after(webkit_web_context_get_default(),
-                           "initialize-web-extensions",
-                           G_CALLBACK(wxgtk_initialize_web_extensions),
-                           m_dbusServer);
+    g_signal_connect(webkit_web_context_get_default(),
+                     "initialize-web-extensions",
+                     G_CALLBACK(wxgtk_initialize_web_extensions),
+                     m_dbusServer);
 
     m_web_view = WEBKIT_WEB_VIEW(webkit_web_view_new());
     GTKCreateScrolledWindowWith(GTK_WIDGET(m_web_view));
     g_object_ref(m_widget);
 
-    g_signal_connect_after(m_web_view, "decide-policy",
-                           G_CALLBACK(wxgtk_webview_webkit_decide_policy),
-                           this);
+    g_signal_connect(m_web_view, "decide-policy",
+                     G_CALLBACK(wxgtk_webview_webkit_decide_policy),
+                     this);
 
-    g_signal_connect_after(m_web_view, "load-failed",
-                           G_CALLBACK(wxgtk_webview_webkit_load_failed), this);
+    g_signal_connect(m_web_view, "load-failed",
+                     G_CALLBACK(wxgtk_webview_webkit_load_failed), this);
 
-    g_signal_connect_after(m_web_view, "notify::title",
-                           G_CALLBACK(wxgtk_webview_webkit_title_changed), this);
+    g_signal_connect(m_web_view, "notify::title",
+                     G_CALLBACK(wxgtk_webview_webkit_title_changed), this);
 
-    g_signal_connect_after(m_web_view, "resource-load-started",
-                           G_CALLBACK(wxgtk_webview_webkit_resource_req), this);
+    g_signal_connect(m_web_view, "context-menu",
+                     G_CALLBACK(wxgtk_webview_webkit_context_menu), this);
 
-    g_signal_connect_after(m_web_view, "context-menu",
-                           G_CALLBACK(wxgtk_webview_webkit_context_menu), this);
-
-    g_signal_connect_after(m_web_view, "create",
-                           G_CALLBACK(wxgtk_webview_webkit_create_webview), this);
+    g_signal_connect(m_web_view, "create",
+                     G_CALLBACK(wxgtk_webview_webkit_create_webview), this);
 
     WebKitFindController* findctrl = webkit_web_view_get_find_controller(m_web_view);
-    g_signal_connect_after(findctrl, "counted-matches",
-                           G_CALLBACK(wxgtk_webview_webkit_counted_matches),
-                           &m_findCount);
+    g_signal_connect(findctrl, "counted-matches",
+                     G_CALLBACK(wxgtk_webview_webkit_counted_matches),
+                     &m_findCount);
 
     m_parent->DoAddChild( this );
 
@@ -610,9 +575,9 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
     webkit_web_view_load_uri(m_web_view, url.utf8_str());
 
     // last to avoid getting signal too early
-    g_signal_connect_after(m_web_view, "load-changed",
-                           G_CALLBACK(wxgtk_webview_webkit_load_changed),
-                           this);
+    g_signal_connect(m_web_view, "load-changed",
+                     G_CALLBACK(wxgtk_webview_webkit_load_changed),
+                     this);
 
     return true;
 }
@@ -1279,6 +1244,10 @@ bool wxWebViewWebKit::RunScript(const wxString& javascript, wxString* output)
 void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
 {
     m_handlerList.push_back(handler);
+    WebKitWebContext* context = webkit_web_context_get_default();
+    webkit_web_context_register_uri_scheme(context, handler->GetName().utf8_str(),
+                                           (WebKitURISchemeRequestCallback)wxgtk_webview_webkit_uri_scheme_request_cb,
+                                           this, NULL);
 }
 
 void wxWebViewWebKit::EnableContextMenu(bool enable)

From 1c14c2ce9e36412666c6bf8c5d39036c808a20dc Mon Sep 17 00:00:00 2001
From: Arrigo Marchiori <ardovm@yahoo.it>
Date: Mon, 5 Feb 2018 14:29:17 +0100
Subject: [PATCH 328/916] Fix disabled owner-drawn buttons look with classic
 MSW theme

Don't grey out the buttons text when they're implicitly disabled because
the parent TLW is disabled by MSW while showing a modal dialog, this
looked bad. Only grey the buttons text when they're really disabled at
wx level.

Closes #18011.
---
 src/msw/anybutton.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp
index d896566b6f..2202432834 100644
--- a/src/msw/anybutton.cpp
+++ b/src/msw/anybutton.cpp
@@ -842,7 +842,13 @@ void DrawButtonText(HDC hdc,
 
     // To get a native look for owner-drawn button in disabled state (without
     // theming) we must use DrawState() to draw the text label.
-    if ( !wxUxThemeIsActive() && !btn->IsEnabled() )
+    //
+    // Notice that we use the enabled state at MSW, not wx, level because we
+    // don't want to grey it out when it's disabled just because its parent is
+    // disabled by MSW as it happens when showing a modal dialog, but we do
+    // want to grey it out if either it or its parent are explicitly disabled
+    // at wx level, see #18011.
+    if ( !wxUxThemeIsActive() && !::IsWindowEnabled(GetHwndOf(btn)) )
     {
         // However using DrawState() has some drawbacks:
         // 1. It generally doesn't support alignment flags (except right

From 08ea09c7fee69984c75e51ea8ee90ef075f06e90 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Feb 2018 15:10:35 +0100
Subject: [PATCH 329/916] Update various READMEs for 3.1.1 release

Update the list of changes and the dates.
---
 docs/changes.txt                |  2 +-
 docs/doxygen/mainpages/manual.h |  2 +-
 docs/publicity/announce.txt     | 24 +++++++++++-------
 docs/readme.txt                 | 43 +++++++++++++++++++--------------
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index d7b1fbbaa5..373590c364 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -64,7 +64,7 @@ Changes in behaviour which may result in build errors
   wxGraphicsContext::CreatePen() continues to compile and work as before.
 
 
-3.1.1: (not released yet)
+3.1.1: (released 2018-02-19)
 ----------------------------
 
 INCOMPATIBLE CHANGES SINCE 3.1.0:
diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h
index 2d53e72746..7f996c3d87 100644
--- a/docs/doxygen/mainpages/manual.h
+++ b/docs/doxygen/mainpages/manual.h
@@ -14,7 +14,7 @@
 @author Julian Smart, Vadim Zeitlin, Robin Dunn, Stefan Csomor,
         Bryan Petty, Francesco Montorsi, Robert Roebling et al
 
-@date February 29, 2016
+@date February 19, 2018
 
 @n
 
diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt
index 49741107e2..5434c56687 100644
--- a/docs/publicity/announce.txt
+++ b/docs/publicity/announce.txt
@@ -1,4 +1,4 @@
-February 29, 2016 -- The wxWidgets team is pleased to announce a new
+February 19, 2018 -- The wxWidgets team is pleased to announce a new
 release of our open source framework for the development of native
 cross-platform applications in C++.
 
@@ -13,22 +13,28 @@ improvements and even more bug fixes, please see the change log
 https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/changes.txt
 
 for the incomplete list of the most important ones. Here is the
-maximally condensed summary:
+maximally condensed summary of the changes compared to 3.0:
 
+- New features: support for mouse gesture events (GSoC 2017 project);
+  fractional pen widths in wxGraphicsContext; arbitrary label windows in
+  wxStaticBox; markup in wxDataViewCtrl items text; better support for high DPI
+  monitors; support for ZIP 64 files; much improved accessibility support under
+  MSW.
 - New classes: wxActivityIndicator, wxAddRemoveCtrl,
-  wxAppProgressIndicator, wxNativeWindow, wxPowerResourceBlocker.
+  wxAppProgressIndicator, wxNativeWindow, wxPowerResourceBlocker,
+  wxSecretStore.
 - And methods: wxDateTime::GetWeekBasedYear(), wxListBox::GetTopItem(),
   wxProcess::Activate(), wxTextEntry::ForceUpper(), several ones in
   wxRendererNative, wxStandardPaths::GetUserDir(), wxUIActionSimulator
-  ::Select() and many others. Also new wxEVT_MAGNIFY event.
+  ::Select() and many others.
 - Significant improvements to: wxBusyInfo, wxNotificationMessage.
-- All around better support for high DPI monitors.
-- Much newer versions of bundled 3rd party libraries (notably libpng)
-  and support for GStreamer 1.0 under Unix.
+- Latest versions of all bundled 3rd party libraries, including all the
+  security fixed and support for WebKit 2 and GStreamer 1.7 under Unix.
 - Revamped OpenGL support better suited to modern OpenGL (3.2+).
 - Further C++11 support improvements.
-- Support for latest compilers: MSVS 2015, g++ 5.3, clang 3.8.
-- A lot of bug fixes in wxGTK3 and wxOSX/Cocoa ports.
+- New CMake-based alternative build system.
+- Support for latest compilers: MSVS 2017, g++ 7, clang 6.
+- A lot of bug fixes, especially in wxGTK3 and wxOSX/Cocoa ports.
 - New experimental wxQt port.
 
 
diff --git a/docs/readme.txt b/docs/readme.txt
index 14f086ab4e..a37fadc811 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -27,12 +27,13 @@ download from:
 Changes since 3.1.0
 -------------------
 
-There have been more than 2000 commits from more than 130 contributors (70 with
+There have been more than 2800 commits from more than 160 contributors (79 with
 multiple contributions) since 3.1.0 release. New features added since then
 include:
 
-- wxWebView can now return JavaScript results to the C++ code.
-- wxSecretStore allows to securely store user passwords.
+- Support for gesture events has been added (GSoC 2017 project).
+- wxWebView can now return JavaScript results to the C++ code (GSoC 2017).
+- New wxSecretStore class for securely storing user passwords.
 
 Some of the other improvements:
 
@@ -41,14 +42,18 @@ Some of the other improvements:
 - Converting between wxString and UTF-8 encoded std::string is now
   simpler and unsafe wxString can now be disabled on the opt-in basis
   (see http://wxwidgets.blogspot.com/2017/02/safer-s.html)
+- It is possible to use any window (e.g. wxCheckBox) as wxStaticBox label now.
 - Many improvements to accessibility support under MSW.
+- wxGraphicsContext now supports pens with fractional widths.
 - Support for XDG file layout under Unix.
-- Many bug fixes to the appearances in both wxGTK3 and wxOSX, notably
-  related to borders (notable wxBORDER_NONE) and colours.
+- Many bug fixes to the behaviour (including TAB navigation) and appearances,
+  especially in wxGTK3 and wxOSX ports.
 - wxDataViewCtrl items and headers can be formatted using simple markup
-  and it is simpler to combine to put items with checkboxes into it.
+  and it is simpler to combine to put items with checkboxes into it. Many bugs
+  and inconsistencies between platforms in this control have been fixed too.
 - Several enhancements to wxStyledTextCtrl including better support for
   custom lexers and auto-completion.
+- Many improvements to the (still experimental) wxQt port.
 
 Additionally, the latest versions of compilers (e.g. MSVS 2017) and
 operating systems (macOS 10.12) are now supported and all the third
@@ -66,24 +71,26 @@ Compared to the stable 3.0.x series, this version brings too many
 improvements and even more bug fixes to list them them all. Here is the
 maximally condensed summary:
 
+- New features: support for mouse gesture events (GSoC 2017 project);
+  fractional pen widths in wxGraphicsContext; arbitrary label windows in
+  wxStaticBox; markup in wxDataViewCtrl items text; better support for high DPI
+  monitors; support for ZIP 64 files; much improved accessibility support under
+  MSW.
 - New classes: wxActivityIndicator, wxAddRemoveCtrl,
   wxAppProgressIndicator, wxNativeWindow, wxPowerResourceBlocker,
   wxSecretStore.
-- And methods: wxDateTime::GetWeekBasedYear() and GetFirstWeekDay(),
-  GetTopItem() and GetCountPerPage() in wxListBox and wxDataViewCtrl,
+- And methods: wxDateTime::GetWeekBasedYear(), wxListBox::GetTopItem(),
   wxProcess::Activate(), wxTextEntry::ForceUpper(), several ones in
-  wxRendererNative, wxStandardPaths::GetUserDir() and SetFileLayout(),
-  wxUIActionSimulator::Select(), wxFontPickerCtrl::SetMinPointSize() and
-  many others.
-- New events: wxEVT_MAGNIFY, wxEVT_STC_AUTOCOMP_COMPLETED.
+  wxRendererNative, wxStandardPaths::GetUserDir(), wxUIActionSimulator
+  ::Select() and many others.
 - Significant improvements to: wxBusyInfo, wxNotificationMessage.
-- All around better support for high DPI monitors.
-- Much newer versions of bundled 3rd party libraries (notably libpng)
-  and support for GStreamer up to 1.7 under Unix.
+- Latest versions of all bundled 3rd party libraries, including all the
+  security fixed and support for WebKit 2 and GStreamer 1.7 under Unix.
 - Revamped OpenGL support better suited to modern OpenGL (3.2+).
 - Further C++11 support improvements.
-- Support for latest compilers: MSVS 2017, g++ 7.2, clang 5.0.
-- A lot of bug fixes in wxGTK3 and wxOSX/Cocoa ports.
+- New CMake-based alternative build system.
+- Support for latest compilers: MSVS 2017, g++ 7, clang 6.
+- A lot of bug fixes, especially in wxGTK3 and wxOSX/Cocoa ports.
 - New experimental wxQt port.
 
 
@@ -203,4 +210,4 @@ If you are looking for support, you can get it from
 
 Have fun!
 
-The wxWidgets Team, February 2016
+The wxWidgets Team, February 2018

From 35d2823601a62b35b40ce0a80397b4f02fc99332 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Feb 2018 15:42:04 +0100
Subject: [PATCH 330/916] Tweak post-release script and documentation

For the release candidates, allow passing the version (e.g. "3.1.1-rc")
to post-release.sh on the command line and document this.

Also don't commit automatically, this is annoying, especially as the
script doesn't check for errors.

Finally, fix the problem with the CHM file name: it must be zipped,
presumably to avoid problems with some firewalls blocking downloading
CHM files (as there is really no advantage in compressing the already
compressed CHM file otherwise).
---
 build/tools/post-release.sh         | 11 +++++++----
 docs/contributing/how-to-release.md | 17 ++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/build/tools/post-release.sh b/build/tools/post-release.sh
index 6e7a3e6bc9..dc1ba31a8d 100755
--- a/build/tools/post-release.sh
+++ b/build/tools/post-release.sh
@@ -8,8 +8,12 @@ topdir=`dirname $0`/../..
 # Build the file list for sha1sums, from `docs/release.md`
 declare -a files=(`sed -n '/^## Download Verification/,/^## Binaries/p' $topdir/docs/release.md | sed -n -E 's/^\s*0{40}\s{2}(wx.*)/\1/p'`)
 
-# Get the release version
-ver_string=`grep '#define wxVERSION_STRING ' $topdir/include/wx/version.h | sed 's/^.*"wxWidgets \(.*\)")/\1/'`
+# Get the release version unless it's given explicitly on the command line.
+if [ -z $1 ]; then
+    ver_string=`grep '#define wxVERSION_STRING ' $topdir/include/wx/version.h | sed 's/^.*"wxWidgets \(.*\)")/\1/'`
+else
+    ver_string=$1
+fi
 
 for i in "${files[@]}"
 do
@@ -20,5 +24,4 @@ do
     sed -i -E "/^\s*[0]{40}\s{2}wx/ s/(^\s*)[0]{40}(\s{2}$i)/\1$sha1sum\2/" $topdir/docs/release.md
 done
 
-# Commit sha1sum related changes
-git commit -m "Update released files sha1sums after $ver_string release" $topdir/docs/release.md
+echo "File $topdir/docs/release.md updated after $ver_string release, don't forget to commit it."
diff --git a/docs/contributing/how-to-release.md b/docs/contributing/how-to-release.md
index 0285addaa9..ec9b392dbf 100644
--- a/docs/contributing/how-to-release.md
+++ b/docs/contributing/how-to-release.md
@@ -83,15 +83,18 @@ ensure you have the appropriate tag or commit checked out.
    contained in the copied release ZIP and not from the current working wx
    directory.
 
-4. Copy these Windows packages back to your Linux or OSX `distrib/release/x.y.z`
+4. Copy `wxMSW-x.y.z-Setup.exe` back to your Linux or OSX `distrib/release/x.y.z`
    directory so you can continue with the upload step with all packages
-   available:
+   available. Also create a ZIP file from the CHM one:
 
-    wxMSW-x.y.z-Setup.exe
-    wxWidgets-x.y.z.chm
+    zip wxWidgets-x.y.z-docs-chm.zip wxWidgets-x.y.z.chm
 
-5. Run `./build/tools/post-release.sh` to update the sha1sums in
-   `docs/release.md` and commit the changes.
+   and copy/move it to the same directory.
+
+5. Update the version in `docs/release.md` (typically just a global search and
+   replace) and run `./build/tools/post-release.sh` to update the sha1sums in
+   it, then commit the changes. Notice that when making an RC, the version must
+   be explicitly specified on this script command line.
 
 ## Uploading
 
@@ -105,7 +108,7 @@ Attach the following files to it:
     wxWidgets-x.y.z.7z
     wxWidgets-x.y.z.tar.bz2
     wxWidgets-x.y.z.zip
-    wxWidgets-x.y.z.chm
+    wxWidgets-x.y.z-docs-chm.zip
     wxWidgets-x.y.z-docs-html.tar.bz2
     wxWidgets-x.y.z-docs-html.zip
     wxWidgets-x.y.z-headers.7z

From 05a29450487448feaf8534b2be226cee799374c5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Feb 2018 15:37:35 +0100
Subject: [PATCH 331/916] Update sha1sums for 3.1.1-rc archives

Done by running "./build/tools/post-release.sh 3.1.1-rc".
---
 docs/release.md | 92 ++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/docs/release.md b/docs/release.md
index 8c5a977f94..1f00f62f1a 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -14,14 +14,14 @@ Please report bugs to the [issue tracker](https://trac.wxwidgets.org/newticket)
 
 To verify your download please use the following SHA-1 checksums:
 
-    0000000000000000000000000000000000000000  wxMSW-3.1.1-Setup.exe
-    0000000000000000000000000000000000000000  wxWidgets-3.1.1-docs-chm.zip
-    0000000000000000000000000000000000000000  wxWidgets-3.1.1-docs-html.tar.bz2
-    0000000000000000000000000000000000000000  wxWidgets-3.1.1-docs-html.zip
-    0000000000000000000000000000000000000000  wxWidgets-3.1.1-headers.7z
-    0000000000000000000000000000000000000000  wxWidgets-3.1.1.7z
-    0000000000000000000000000000000000000000  wxWidgets-3.1.1.tar.bz2
-    0000000000000000000000000000000000000000  wxWidgets-3.1.1.zip
+    d3f8a8f5bd7b5dee2176a14fce93b3767d217f00  wxMSW-3.1.1-rc-Setup.exe
+    d8de5b7075ba7674e8c0e2cd722259d48e627dc7  wxWidgets-3.1.1-rc-docs-chm.zip
+    000c818361eddd403557aacf8b63ac0210335919  wxWidgets-3.1.1-rc-docs-html.tar.bz2
+    f5ec0051a4fe620dbeee5262ba1ce30922e5d85c  wxWidgets-3.1.1-rc-docs-html.zip
+    f4d1bda81ef27fb232eb58f88730cfeafb35b477  wxWidgets-3.1.1-rc-headers.7z
+    36efadd43d9994495d71a698922113a0d8d46b73  wxWidgets-3.1.1-rc.7z
+    2968073dffa60c1ad5016d1b0d4eedb5b701efdf  wxWidgets-3.1.1-rc.tar.bz2
+    84d7e7a8347fc727801a407302e2801ee7bfc608  wxWidgets-3.1.1-rc.zip
 
 ## Binaries
 
@@ -57,41 +57,41 @@ End users may download one of `wxMSW-3.1.1_vcXXX_ReleaseDLL.7z` or `wxMSW-3.1.1_
 
 To verify your download please use the following SHA-1 checksums:
 
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc492TDM_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc492TDM_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc492TDM_x64_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc492TDM_x64_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_x64_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_x64_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc492TDM_Dev.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc492TDM_ReleaseDLL.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc492TDM_x64_Dev.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc492TDM_x64_ReleaseDLL.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_Dev.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_ReleaseDLL.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_x64_Dev.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_x64_ReleaseDLL.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_ReleasePDB.7z

From 562e7c4427d5c1233a65ba164d27b759ffe0d834 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Feb 2018 15:50:03 +0100
Subject: [PATCH 332/916] Update release notes for 3.1.1-rc

Update MinGW versions used for the binaries and provide links to the
working compilers.

Add "-rc" to some links to make them work.

Also update the binaries file names.
---
 docs/release.md | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/docs/release.md b/docs/release.md
index 1f00f62f1a..4f3a74686b 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -1,10 +1,12 @@
+*WARNING* This is a release candidate and not the final 3.1.1 release yet.
+
 Welcome to wxWidgets, a free and open source cross-platform C++ framework for writing advanced GUI applications using native controls.
 
 wxWidgets 3.1.1 is the second release in the 3.1 development branch. This release is a "development" one as it makes (very few) incompatible API changes compared to 3.0 and does not guarantee the ABI stability, unlike the 3.0.x series. It is not inherently more buggy or less stable than the "stable" releases and you're encouraged to use it. If you're already using 3.0, upgrading shouldn't require any special effort, so please try it out.
 
 Please notice that we provide a single source distribution containing files for all platforms, so you only need to download either the archive with the `.zip` (or `.7z` for much smaller size) extension for Microsoft Windows systems or the one with `.tar.bz2` extenstion for Unix ones, including Mac OS X.
 
-See [README](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/changes.txt) for details of the changes in it.
+See [README](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1-rc/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1-rc/docs/changes.txt) for details of the changes in it.
 
 ## Reporting Problems
 
@@ -27,11 +29,8 @@ To verify your download please use the following SHA-1 checksums:
 
 We provide pre-built binary files for the following compilers:
 
-* Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0, 12.0, 14.0 and 14.1
-  (corresponding to marketing product names of Microsoft Visual Studio 2008,
-   2010, 2012, 2013, 2015 and 2017 respectively).
-* MinGW-TDM versions 4.9 and 5.1 (with the default SJLJ exceptions propagation
-  method, using C++11).
+* Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0, 12.0, 14.0 and 14.1 (corresponding to marketing product names of Microsoft Visual Studio 2008, 2010, 2012, 2013, 2015 and 2017 respectively).
+* MinGW-TDM versions 5.1 and 7.2 (with the default SJLJ exceptions propagation method, using C++11). Please note that you need to use the very latest MinGW 7.2 compiler release with this version of the compiler which can be downloaded from [here for 32 bits](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/7.2.0/threads-win32/sjlj/i686-7.2.0-release-win32-sjlj-rt_v5-rev1.7z/download) and [here for 64 bits](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/7.2.0/threads-win32/seh/x86_64-7.2.0-release-win32-seh-rt_v5-rev1.7z/download), the older "rev0" release has a known bug affecting building wxWidgets in some scenarios.
 
 ### For Developers
 
@@ -45,26 +44,22 @@ End users may download one of `wxMSW-3.1.1_vcXXX_ReleaseDLL.7z` or `wxMSW-3.1.1_
 
 ### For Debugging
 
-* Microsoft Visual C++ users: Files `wxMSW-3.1.1_vcXXX_ReleasePDB.7z` contain
-  the debug symbols for the release build of the DLLs. Download them if you want
-  to debug your own applications in release build or if you want to get
-  meaningful information from mini-dumps retrieved from your users machines.
-* MinGW-TDM users: Currently the debug symbols are not available for the release
-  build of the DLLs (only the debug versions of the DLLs contains the debug
+* Microsoft Visual C++ users: Files `wxMSW-3.1.1_vcXXX_ReleasePDB.7z` contain the debug symbols for the release build of the DLLs. Download them if you want to debug your own applications in release build or if you want to get meaningful information from mini-dumps retrieved from your users machines.
+* MinGW-TDM users: Currently the debug symbols are not available for the release build of the DLLs (only the debug versions of the DLLs contains the debug
   symbols).
 
 ### Binary File Download Verification
 
 To verify your download please use the following SHA-1 checksums:
 
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc492TDM_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc492TDM_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc492TDM_x64_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc492TDM_x64_ReleaseDLL.7z*
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_Dev.7z*
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_ReleaseDLL.7z*
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_x64_Dev.7z*
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_x64_ReleaseDLL.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc720TDM_Dev.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc720TDM_ReleaseDLL.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc720TDM_x64_Dev.7z*
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc720TDM_x64_ReleaseDLL.7z*
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_Dev.7z
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_ReleaseDLL.7z
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_ReleasePDB.7z
@@ -95,3 +90,9 @@ To verify your download please use the following SHA-1 checksums:
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_Dev.7z
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_ReleaseDLL.7z
     0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_x64_ReleasePDB.7z

From 6961bcb43f6009057ec3b6ed53103a8d9b4afa67 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Feb 2018 23:21:25 +0100
Subject: [PATCH 333/916] Update 3.1.1-rc binaries SHA-1 checksums

---
 docs/release.md | 88 ++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/docs/release.md b/docs/release.md
index 4f3a74686b..dce9088767 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -52,47 +52,47 @@ End users may download one of `wxMSW-3.1.1_vcXXX_ReleaseDLL.7z` or `wxMSW-3.1.1_
 
 To verify your download please use the following SHA-1 checksums:
 
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_x64_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc510TDM_x64_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc720TDM_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc720TDM_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc720TDM_x64_Dev.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_gcc720TDM_x64_ReleaseDLL.7z*
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc90_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc100_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc110_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc120_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc140_x64_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_ReleasePDB.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_x64_Dev.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_x64_ReleaseDLL.7z
-    0000000000000000000000000000000000000000 wxMSW-3.1.1-rc_vc141_x64_ReleasePDB.7z
+    26836356a6e77091caad508d765b60899c30892e wxMSW-3.1.1-rc_gcc510TDM_Dev.7z
+    b7eb62bdb152e5539fd5e9ecc105d322fadba3ec wxMSW-3.1.1-rc_gcc510TDM_ReleaseDLL.7z
+    77c84112ffcad3b2c649d9fd3adcd4e140945b61 wxMSW-3.1.1-rc_gcc510TDM_x64_Dev.7z
+    24e775999ea19b641a11850af0547ac81fd1bc6b wxMSW-3.1.1-rc_gcc510TDM_x64_ReleaseDLL.7z
+    ead74e56b9d22e578addd52b8246eadfddbd93d1 wxMSW-3.1.1-rc_gcc720_Dev.7z
+    7c43aa6937853d1113430ce1b31a0747e89a6b47 wxMSW-3.1.1-rc_gcc720_ReleaseDLL.7z
+    298016eb7cb2a509b4dedc5a8c09eb2b98950698 wxMSW-3.1.1-rc_gcc720_x64_Dev.7z
+    741087b3fcbe809ae60563e19cf0db21b571725a wxMSW-3.1.1-rc_gcc720_x64_ReleaseDLL.7z
+    7537561f1a93ca06a37be730ca9f81506da665db wxMSW-3.1.1-rc_vc90_Dev.7z
+    3df72df959b4ae8279cb27519ea5b114003d17f6 wxMSW-3.1.1-rc_vc90_ReleaseDLL.7z
+    1c506db10f555f11ae17ba08430482d81be1c0db wxMSW-3.1.1-rc_vc90_ReleasePDB.7z
+    3b45c2680499b3e397264f0ae8f6d2617a139b8a wxMSW-3.1.1-rc_vc90_x64_Dev.7z
+    3ba14408edad9b325bc0dd0ba98197954ce2db5e wxMSW-3.1.1-rc_vc90_x64_ReleaseDLL.7z
+    e8c5f145a89a556069221886e7644c3b07d2799f wxMSW-3.1.1-rc_vc90_x64_ReleasePDB.7z
+    936f454b547ec17e3cefdf4f43c9af8738f803ca wxMSW-3.1.1-rc_vc100_Dev.7z
+    940c8c3923be2ad4a71e3de349657bb5443de918 wxMSW-3.1.1-rc_vc100_ReleaseDLL.7z
+    8a4dedfc318272b182a83f5947b5224a7f17c532 wxMSW-3.1.1-rc_vc100_ReleasePDB.7z
+    c68ccae3a29096e7f78732c65cddabeee5e226b6 wxMSW-3.1.1-rc_vc100_x64_Dev.7z
+    ea540496a5875454ff90ba3f6ea65ddcacc9a4a5 wxMSW-3.1.1-rc_vc100_x64_ReleaseDLL.7z
+    8100a2bfab8909de47fb483bb8bd78c03ddb4df5 wxMSW-3.1.1-rc_vc100_x64_ReleasePDB.7z
+    1fa4c99e48cbf0f50289d07f6ceae8a71be62a19 wxMSW-3.1.1-rc_vc110_Dev.7z
+    2e44afb8f7080fc673af2abb456cf176dad4b1a2 wxMSW-3.1.1-rc_vc110_ReleaseDLL.7z
+    730e2e1db22e3bc308284562c8ecfbfc3f6a6e9e wxMSW-3.1.1-rc_vc110_ReleasePDB.7z
+    5c2578deba24a1daf61ae08a7daa1a8662dbe8c9 wxMSW-3.1.1-rc_vc110_x64_Dev.7z
+    57da37116c3b80d4f765b85fafcb30e2cb200dab wxMSW-3.1.1-rc_vc110_x64_ReleaseDLL.7z
+    6700dbc853484d385753ad4361c16c48c4bd3e3a wxMSW-3.1.1-rc_vc110_x64_ReleasePDB.7z
+    b4dac305e230ae0c9bfcd07fee632a4aad835329 wxMSW-3.1.1-rc_vc120_Dev.7z
+    c986f27c6f88b9feb7706f4bff5f50b68b14cec2 wxMSW-3.1.1-rc_vc120_ReleaseDLL.7z
+    ca5ca15eadc0d1ca6b79824bb9704215c7945195 wxMSW-3.1.1-rc_vc120_ReleasePDB.7z
+    c9a4850228a1b42d1606d1043b9a3d0b334727a9 wxMSW-3.1.1-rc_vc120_x64_Dev.7z
+    6a02c05ab72b06e30ef9f9e355956f3957c86eb1 wxMSW-3.1.1-rc_vc120_x64_ReleaseDLL.7z
+    2c36680649bf3093536e20067d30e1242a6023d3 wxMSW-3.1.1-rc_vc120_x64_ReleasePDB.7z
+    aeede25c3de0f975c811fbce634c5aaf354195fa wxMSW-3.1.1-rc_vc140_Dev.7z
+    900203c8f300214e038fbb1ae10ba3eb1a114740 wxMSW-3.1.1-rc_vc140_ReleaseDLL.7z
+    788c9b39c0c298735313de425c4ca7986b163908 wxMSW-3.1.1-rc_vc140_ReleasePDB.7z
+    68ae8e1c42ff0105ea186c0d32cee95861a1a5a4 wxMSW-3.1.1-rc_vc140_x64_Dev.7z
+    550f3d0f52f4d21babf03b66e26145787eb9d922 wxMSW-3.1.1-rc_vc140_x64_ReleaseDLL.7z
+    5b57a82a1799ae1a05a385685ce9f729e3fed056 wxMSW-3.1.1-rc_vc140_x64_ReleasePDB.7z
+    5990f6bf1d157e2b7e8f254d2a60dfd682971790 wxMSW-3.1.1-rc_vc141_Dev.7z
+    fde6140a4348621a1b876ed6c289778d4312f2f1 wxMSW-3.1.1-rc_vc141_ReleaseDLL.7z
+    824eef674529ca75e620dac6dce45cc6a0c2328b wxMSW-3.1.1-rc_vc141_ReleasePDB.7z
+    a4b4014c1a1289d798597ebc810a01e88edf53bc wxMSW-3.1.1-rc_vc141_x64_Dev.7z
+    285afbcc27e18344654183d8b9e6beca9a9eab92 wxMSW-3.1.1-rc_vc141_x64_ReleaseDLL.7z
+    82685386d8291dd5012ef00ced5fdc45cb0d8a04 wxMSW-3.1.1-rc_vc141_x64_ReleasePDB.7z

From 76c75d87f5552d41ca67363913d1a2c598b8b141 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Feb 2018 23:29:31 +0100
Subject: [PATCH 334/916] Describe the available files better in the release
 notes

Also mention that GitHub-provided links to the source code should _not_
be used.
---
 docs/release.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/release.md b/docs/release.md
index dce9088767..2e7393c662 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -4,15 +4,16 @@ Welcome to wxWidgets, a free and open source cross-platform C++ framework for wr
 
 wxWidgets 3.1.1 is the second release in the 3.1 development branch. This release is a "development" one as it makes (very few) incompatible API changes compared to 3.0 and does not guarantee the ABI stability, unlike the 3.0.x series. It is not inherently more buggy or less stable than the "stable" releases and you're encouraged to use it. If you're already using 3.0, upgrading shouldn't require any special effort, so please try it out.
 
-Please notice that we provide a single source distribution containing files for all platforms, so you only need to download either the archive with the `.zip` (or `.7z` for much smaller size) extension for Microsoft Windows systems or the one with `.tar.bz2` extenstion for Unix ones, including Mac OS X.
+Please see [**README**](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1-rc/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1-rc/docs/changes.txt) for details of the changes in it.
 
-See [README](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1-rc/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1-rc/docs/changes.txt) for details of the changes in it.
 
-## Reporting Problems
+## Source Files and Documentation
 
-Please report bugs to the [issue tracker](https://trac.wxwidgets.org/newticket) or the [wx-users mailing list](http://groups.google.com/group/wx-users).
+If you intend to build wxWidgets from sources (which is recommended), please download `wxWidgets-3.1.1-rc` archive in either [ZIP](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.zip) or [7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.7z), for much smaller size, format for Microsoft Windows systems or the [compressed tarball](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform. Be sure to _not_ download the files available from the "Source code" links above, which are automatically generated by GitHub and don't contain the submodules sources which are necessary for building wxWidgets.
 
-## Download Verification
+In addition, we provide archives containing the documentation in either HTML or Microsoft CHM formats. Notice that the documentation is also [available online](http://docs.wxwidgets.org/3.1).
+
+Finally, Microsoft Windows users may download [Setup.exe file](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxMSW-3.1.1-rc-Setup.exe) containing both sources and documentation, however please note that this file does _not_ contain any binaries, please see below for those.
 
 To verify your download please use the following SHA-1 checksums:
 
@@ -96,3 +97,8 @@ To verify your download please use the following SHA-1 checksums:
     a4b4014c1a1289d798597ebc810a01e88edf53bc wxMSW-3.1.1-rc_vc141_x64_Dev.7z
     285afbcc27e18344654183d8b9e6beca9a9eab92 wxMSW-3.1.1-rc_vc141_x64_ReleaseDLL.7z
     82685386d8291dd5012ef00ced5fdc45cb0d8a04 wxMSW-3.1.1-rc_vc141_x64_ReleasePDB.7z
+
+
+## Reporting Problems
+
+Please report bugs to the [issue tracker](https://trac.wxwidgets.org/newticket) or the [wx-users mailing list](http://groups.google.com/group/wx-users).

From 7887be861e8d9d90f6f7fb429ab9e98b6fb46d5e Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Mon, 5 Feb 2018 21:42:31 +0100
Subject: [PATCH 335/916] CMake: Set default configuration types

Only use Debug and Release as default configuration types
---
 CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42be0430e7..a067b00356 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,14 @@
 
 cmake_minimum_required(VERSION 2.8.12)
 
+if(NOT CMAKE_CONFIGURATION_TYPES)
+    get_property(HAVE_MULTI_CONFIG_GENERATOR GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    # Set default configuration types for multi-config generators
+    if(HAVE_MULTI_CONFIG_GENERATOR)
+        set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
+    endif()
+endif()
+
 if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
     # If no deployment target has been set default to the minimum supported
     # OS X version (this has to be set before the first project() call)

From 9fd43699317a35936b8d9a275ecf710e6ac12a49 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Mon, 5 Feb 2018 21:49:40 +0100
Subject: [PATCH 336/916] CMake: Update cmake/README.md

Update minor stuff and mention upmake
---
 build/cmake/README.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build/cmake/README.md b/build/cmake/README.md
index eed238ef2d..708b78a434 100644
--- a/build/cmake/README.md
+++ b/build/cmake/README.md
@@ -7,7 +7,7 @@ documentation.
 
 CMake files organization
 ========================
-All CMake files are located in $(wx)/build/cmake additionally there is a
+All CMake files are located in _$(wx)/build/cmake_ additionally there is a
 _CMakeLists.txt_ in the root directory.
 
 Files
@@ -19,15 +19,16 @@ Files
     * Generates config files used to find wxWidgets by other build systems
     * Creates wx-config
 * files.cmake
-    * List of source files generated by _update_files.py_ from _$(wx)/build/files_
-    * This file should **never** be edited manually
+    * List of source files generated by _$(wx)build/upmake_ from _$(wx)build/files_
+    * This file should usually **never** be edited manually
+    * However if a new group of files is added it needs to be edited manually
 * functions.cmake
     * contains various wxWidgets specific functions and macros used throughout
       the CMake files
     * Every function should contain a short description of it's parameters as
       a comment before the function/macro
 * install.cmake
-    * Handles defintions for the ´install` and `uninstall` target
+    * Handles defintions for the `install` and `uninstall` target
 * init.cmake
     * Intializes various variables used during the build process and for
       generation of setup.h and configuration files
@@ -49,8 +50,6 @@ Files
     * Define toolkit specific options and detection to this file
 * uninstall.cmake.in
     * Used by _install.cmake_ when creating the `uninstall` target
-* update_files.py
-    * Creates _files.cmake_ from _$(wx)/build/files_
 
 Sub directories
 ---------------

From a957df3fc1ea6341b5bf6054aa90056f9f0c10ce Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Feb 2018 13:29:32 +0100
Subject: [PATCH 337/916] Add missing wxOVERRIDE for overridden
 GtkGetValueFromString

This fixes a (harmless) warning in clang wxGTK builds.
---
 include/wx/gtk/dvrenderers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h
index 67d81df79e..bd50a515b2 100644
--- a/include/wx/gtk/dvrenderers.h
+++ b/include/wx/gtk/dvrenderers.h
@@ -279,7 +279,7 @@ public:
     virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
 
 private:
-    virtual wxVariant GtkGetValueFromString(const wxString& str) const;
+    virtual wxVariant GtkGetValueFromString(const wxString& str) const wxOVERRIDE;
 };
 
 

From 89148ea72e52f1e20a3f39ed5fd65fd4fd85956c Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Mon, 5 Feb 2018 22:04:55 +0100
Subject: [PATCH 338/916] CMake: Improve documentation overview page

---
 docs/doxygen/overviews/cmake.md | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/docs/doxygen/overviews/cmake.md b/docs/doxygen/overviews/cmake.md
index e1b11586bb..1257ed086b 100644
--- a/docs/doxygen/overviews/cmake.md
+++ b/docs/doxygen/overviews/cmake.md
@@ -62,13 +62,29 @@ Build options                          {#cmake_options}
 The following list of build options can either be configured in the CMake UI
 or specified via the -D command line option when running the cmake command.
 
-Option Name                   | Type   | Description
------------------------------ | -----  | ------------------------------------
-wxBUILD_SHARED                | BOOL   | Build shared libraries
-wxBUILD_TESTS                 | STRING | CONSOLE_ONLY, ALL or OFF
-wxBUILD_SAMPLES               | STRING | SOME, ALL or OFF
-wxUSE_GUI                     | BOOL   | Build the UI libraries
-wxBUILD_COMPATIBILITY         | STRING | 2.8, 3.0 or 3.1 API compatibility
+Option Name               | Type   | Default | Description
+------------------------- | -----  | ------- | ----------------------------
+wxBUILD_SHARED            | BOOL   | ON      | Build shared libraries
+wxBUILD_TESTS             | STRING | OFF     | CONSOLE_ONLY, ALL or OFF
+wxBUILD_SAMPLES           | STRING | OFF     | SOME, ALL or OFF
+wxBUILD_DEMOS             | BOOL   | OFF     | Build demo applications
+wxUSE_GUI                 | BOOL   | ON      | Build the UI libraries
+wxBUILD_COMPATIBILITY     | STRING | 3.0     | 2.8, 3.0 or 3.1 API compatibility
+wxBUILD_PRECOMP           | BOOL   | ON      | Use precompiled headers
+wxBUILD_MONOLITHIC        | BOOL   | OFF     | Build a single library
+
+A complete list of options and advanced options can be found when using the
+CMake GUI.
+
+Recommendations                       {#cmake_recommendations}
+=======================
+While CMake in wxWidgets aims to support most generators available
+in CMake the following generators are recommended:
+* Windows: Visual Studio (any supported version)
+* macOS: Xcode
+* Linux: Ninja or Makefiles
+
+CMake 3.10 or newer is recommended. The minimum version required is 2.8.12.
 
 Using CMake with your applications     {#cmake_apps}
 ==================================

From 0a94c1890f83532ce5b6801c019ff7d25b9f11ad Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Tue, 6 Feb 2018 10:24:48 +0100
Subject: [PATCH 339/916] CMake: Fixes/Tweaks for macOS building with C++ 11

Make sure the deployment target is set to 10.9 when using C++11
Also ensure building C++11 on macOS for non Xcode builds
---
 CMakeLists.txt              |  7 ++++++-
 build/cmake/functions.cmake | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a067b00356..21ae14c342 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,12 @@ endif()
 if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
     # If no deployment target has been set default to the minimum supported
     # OS X version (this has to be set before the first project() call)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7 CACHE STRING "OS X Deployment Target")
+    if(CMAKE_CXX_STANDARD EQUAL 11 OR CMAKE_CXX_STANDARD EQUAL 14)
+        set(OSX_DEFAULT_DEPLOYMENT_TARGET 10.9)
+    else()
+        set(OSX_DEFAULT_DEPLOYMENT_TARGET 10.7)
+    endif()
+    set(CMAKE_OSX_DEPLOYMENT_TARGET ${OSX_DEFAULT_DEPLOYMENT_TARGET} CACHE STRING "OS X Deployment Target")
 endif()
 
 project(wxWidgets)
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 23c68ee76d..6cf1faf00d 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -74,7 +74,13 @@ function(wx_set_common_target_properties target_name)
         # TODO: implement for older CMake versions ?
         set_target_properties(${target_name} PROPERTIES CXX_STANDARD ${wxBUILD_CXX_STANDARD})
         if(wxBUILD_CXX_STANDARD EQUAL 11 OR wxBUILD_CXX_STANDARD EQUAL 14)
-            set_target_properties(${target_name} PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY libc++)
+            if (APPLE)
+                if(CMAKE_GENERATOR EQUAL "Xcode")
+                    set_target_properties(${target_name} PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY libc++)
+                else()
+                    target_compile_options(${target_name} PUBLIC "-stdlib=libc++")
+                endif()
+            endif()
             #TODO: define for other generators than Xcode
         endif()
     endif()
@@ -304,7 +310,7 @@ endfunction()
 # Enable cotire for target if precompiled headers are enabled
 macro(wx_target_enable_precomp target_name)
     if(wxBUILD_PRECOMP)
-        if(CMAKE_GENERATOR STREQUAL "Xcode" AND ${target_name} STREQUAL "wxscintilla")
+        if(APPLE AND ${target_name} STREQUAL "wxscintilla")
             # TODO: workaround/fix cotire issue with wxscintilla when using Xcode
         else()
             set_target_properties(${target_name} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)

From 8881953bea199c4921d581e3ebccfd8fd02c144a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Feb 2018 15:26:51 +0100
Subject: [PATCH 340/916] Add support for --with-cxx=17 configure option

Use the latest version of ax_cxx_compile_stdcxx.m4 from the autoconf
archive for C++17 support and handle "17" as the option value in our
configure.

See https://github.com/wxWidgets/wxWidgets/pull/721
---
 build/aclocal/ax_cxx_compile_stdcxx.m4 |  500 ++++-
 configure                              | 2689 +++++++++++++++++++++++-
 configure.in                           |   10 +-
 3 files changed, 3104 insertions(+), 95 deletions(-)

diff --git a/build/aclocal/ax_cxx_compile_stdcxx.m4 b/build/aclocal/ax_cxx_compile_stdcxx.m4
index 079e17d2a6..5032bba809 100644
--- a/build/aclocal/ax_cxx_compile_stdcxx.m4
+++ b/build/aclocal/ax_cxx_compile_stdcxx.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -9,9 +9,9 @@
 # DESCRIPTION
 #
 #   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXXFLAGS to
-#   enable support.  VERSION may be '11' (for the C++11 standard) or '14'
-#   (for the C++14 standard).
+#   version of the C++ standard.  If necessary, add switches to CXX and
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
 #
 #   The second argument, if specified, indicates whether you insist on an
 #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
@@ -33,21 +33,23 @@
 #   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
 #   Copyright (c) 2015 Paul Norman <penorman@mac.com>
 #   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#   Copyright (c) 2016 Krzesimir Nowak <qdlacz@gmail.com>
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.  This file is offered as-is, without any
 #   warranty.
 
-#serial 1
+#serial 7
 
 dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
 dnl  (serial version number 13).
 
+AX_REQUIRE_DEFINED([AC_MSG_WARN])
 AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [],
-        [$1], [14], [],
-        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
+  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
+        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
+        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
         [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
   m4_if([$2], [], [],
         [$2], [ext], [],
@@ -70,18 +72,22 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
 
   m4_if([$2], [noext], [], [dnl
   if test x$ac_success = xno; then
-    for switch in -std=gnu++$1 -std=gnu++0x; do
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      switch="-std=gnu++${alternative}"
       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
       AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
                      $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
          AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
           [eval $cachevar=yes],
           [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
+         CXX="$ac_save_CXX"])
       if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
         ac_success=yes
         break
       fi
@@ -93,19 +99,27 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
     dnl HP's aCC needs +std=c++11 according to:
     dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
     dnl Cray's crayCC needs "-h std=c++11"
-    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXXFLAGS="$ac_save_CXXFLAGS"])
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                       $cachevar,
+          [ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+            [eval $cachevar=yes],
+            [eval $cachevar=no])
+           CXX="$ac_save_CXX"])
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
         break
       fi
     done
@@ -115,18 +129,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
     if test x$ac_success = xno; then
       AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
     fi
-  else
-    if test x$ac_success = xno; then
-      HAVE_CXX$1=0
-      AC_MSG_NOTICE([No compiler with C++$1 support was found])
-    else
-      HAVE_CXX$1=1
-      AC_DEFINE(HAVE_CXX$1,1,
-                [define if the compiler supports basic C++$1 syntax])
-    fi
-
-    AC_SUBST(HAVE_CXX$1)
   fi
+  if test x$ac_success = xno; then
+    HAVE_CXX$1=0
+    AC_MSG_NOTICE([No compiler with C++$1 support was found])
+  else
+    HAVE_CXX$1=1
+    AC_DEFINE(HAVE_CXX$1,1,
+              [define if the compiler supports basic C++$1 syntax])
+  fi
+  AC_SUBST(HAVE_CXX$1)
+  m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])])
 ])
 
 
@@ -144,6 +157,11 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
 )
 
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+)
 
 dnl  Tests for new features in C++11
 
@@ -514,7 +532,7 @@ namespace cxx14
 
   }
 
-  namespace test_digit_seperators
+  namespace test_digit_separators
   {
 
     constexpr auto ten_million = 100'000'000;
@@ -556,3 +574,409 @@ namespace cxx14
 #endif  // __cplusplus >= 201402L
 
 ]])
+
+
+dnl  Tests for new features in C++17
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
+
+// If the compiler admits that it is not ready for C++17, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus <= 201402L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#if defined(__clang__)
+  #define REALLY_CLANG
+#else
+  #if defined(__GNUC__)
+    #define REALLY_GCC
+  #endif
+#endif
+
+#include <initializer_list>
+#include <utility>
+#include <type_traits>
+
+namespace cxx17
+{
+
+#if !defined(REALLY_CLANG)
+  namespace test_constexpr_lambdas
+  {
+
+    // TODO: test it with clang++ from git
+
+    constexpr int foo = [](){return 42;}();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test::nested_namespace::definitions
+  {
+
+  }
+
+  namespace test_fold_expression
+  {
+
+    template<typename... Args>
+    int multiply(Args... args)
+    {
+      return (args * ... * 1);
+    }
+
+    template<typename... Args>
+    bool all(Args... args)
+    {
+      return (args && ...);
+    }
+
+  }
+
+  namespace test_extended_static_assert
+  {
+
+    static_assert (true);
+
+  }
+
+  namespace test_auto_brace_init_list
+  {
+
+    auto foo = {5};
+    auto bar {5};
+
+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
+    static_assert(std::is_same<int, decltype(bar)>::value);
+  }
+
+  namespace test_typename_in_template_template_parameter
+  {
+
+    template<template<typename> typename X> struct D;
+
+  }
+
+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
+  {
+
+    int f1()
+    {
+      return 42;
+    }
+
+    [[nodiscard]] int f2()
+    {
+      [[maybe_unused]] auto unused = f1();
+
+      switch (f1())
+      {
+      case 17:
+        f1();
+        [[fallthrough]];
+      case 42:
+        f1();
+      }
+      return f1();
+    }
+
+  }
+
+  namespace test_extended_aggregate_initialization
+  {
+
+    struct base1
+    {
+      int b1, b2 = 42;
+    };
+
+    struct base2
+    {
+      base2() {
+        b3 = 42;
+      }
+      int b3;
+    };
+
+    struct derived : base1, base2
+    {
+        int d;
+    };
+
+    derived d1 {{1, 2}, {}, 4};  // full initialization
+    derived d2 {{}, {}, 4};      // value-initialized bases
+
+  }
+
+  namespace test_general_range_based_for_loop
+  {
+
+    struct iter
+    {
+      int i;
+
+      int& operator* ()
+      {
+        return i;
+      }
+
+      const int& operator* () const
+      {
+        return i;
+      }
+
+      iter& operator++()
+      {
+        ++i;
+        return *this;
+      }
+    };
+
+    struct sentinel
+    {
+      int i;
+    };
+
+    bool operator== (const iter& i, const sentinel& s)
+    {
+      return i.i == s.i;
+    }
+
+    bool operator!= (const iter& i, const sentinel& s)
+    {
+      return !(i == s);
+    }
+
+    struct range
+    {
+      iter begin() const
+      {
+        return {0};
+      }
+
+      sentinel end() const
+      {
+        return {5};
+      }
+    };
+
+    void f()
+    {
+      range r {};
+
+      for (auto i : r)
+      {
+        [[maybe_unused]] auto v = i;
+      }
+    }
+
+  }
+
+  namespace test_lambda_capture_asterisk_this_by_value
+  {
+
+    struct t
+    {
+      int i;
+      int foo()
+      {
+        return [*this]()
+        {
+          return i;
+        }();
+      }
+    };
+
+  }
+
+  namespace test_enum_class_construction
+  {
+
+    enum class byte : unsigned char
+    {};
+
+    byte foo {42};
+
+  }
+
+  namespace test_constexpr_if
+  {
+
+    template <bool cond>
+    int f ()
+    {
+      if constexpr(cond)
+      {
+        return 13;
+      }
+      else
+      {
+        return 42;
+      }
+    }
+
+  }
+
+  namespace test_selection_statement_with_initializer
+  {
+
+    int f()
+    {
+      return 13;
+    }
+
+    int f2()
+    {
+      if (auto i = f(); i > 0)
+      {
+        return 3;
+      }
+
+      switch (auto i = f(); i + 4)
+      {
+      case 17:
+        return 2;
+
+      default:
+        return 1;
+      }
+    }
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_template_argument_deduction_for_class_templates
+  {
+
+    // TODO: test it with clang++ from git
+
+    template <typename T1, typename T2>
+    struct pair
+    {
+      pair (T1 p1, T2 p2)
+        : m1 {p1},
+          m2 {p2}
+      {}
+
+      T1 m1;
+      T2 m2;
+    };
+
+    void f()
+    {
+      [[maybe_unused]] auto p = pair{13, 42u};
+    }
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_non_type_auto_template_parameters
+  {
+
+    template <auto n>
+    struct B
+    {};
+
+    B<5> b1;
+    B<'a'> b2;
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_structured_bindings
+  {
+
+    // TODO: test it with clang++ from git
+
+    int arr[2] = { 1, 2 };
+    std::pair<int, int> pr = { 1, 2 };
+
+    auto f1() -> int(&)[2]
+    {
+      return arr;
+    }
+
+    auto f2() -> std::pair<int, int>&
+    {
+      return pr;
+    }
+
+    struct S
+    {
+      int x1 : 2;
+      volatile double y1;
+    };
+
+    S f3()
+    {
+      return {};
+    }
+
+    auto [ x1, y1 ] = f1();
+    auto& [ xr1, yr1 ] = f1();
+    auto [ x2, y2 ] = f2();
+    auto& [ xr2, yr2 ] = f2();
+    const auto [ x3, y3 ] = f3();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+#if !defined(REALLY_CLANG)
+  namespace test_exception_spec_type_system
+  {
+
+    // TODO: test it with clang++ from git
+
+    struct Good {};
+    struct Bad {};
+
+    void g1() noexcept;
+    void g2();
+
+    template<typename T>
+    Bad
+    f(T*, T*);
+
+    template<typename T1, typename T2>
+    Good
+    f(T1*, T2*);
+
+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_inline_variables
+  {
+
+    template<class T> void f(T)
+    {}
+
+    template<class T> inline T g(T)
+    {
+      return T{};
+    }
+
+    template<> inline void f<>(int)
+    {}
+
+    template<> int g<>(int)
+    {
+      return 5;
+    }
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus <= 201402L
+
+]])
diff --git a/configure b/configure
index c6fca28adc..96aa141762 100755
--- a/configure
+++ b/configure
@@ -996,6 +996,7 @@ GTK_CFLAGS
 subdirs
 PKG_CONFIG
 AR
+HAVE_CXX17
 HAVE_CXX14
 HAVE_CXX11
 ac_ct_CXX
@@ -2344,7 +2345,7 @@ Optional Packages:
   --with-expat            enable XML support using expat parser
   --with-macosx-sdk=PATH  use an OS X SDK at PATH
   --with-macosx-version-min=VER   build binaries which require at least this OS X version
-  --with-cxx=11|14        use the given C++11
+  --with-cxx=11|14|17     use the given C++ dialect
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
   --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
   --with-x                use the X Window System
@@ -15078,7 +15079,7 @@ fi
 if test -n "$wxWITH_CXX"; then
             case "$wxWITH_CXX" in
         11)
-                  ax_cxx_compile_cxx11_required=false
+              ax_cxx_compile_alternatives="11 0x"    ax_cxx_compile_cxx11_required=false
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -15393,15 +15394,16 @@ $as_echo "$ax_cv_cxx_compile_cxx11" >&6; }
   fi
 
     if test x$ac_success = xno; then
-    for switch in -std=gnu++11 -std=gnu++0x; do
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      switch="-std=gnu++${alternative}"
       cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
 $as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
 if eval \${$cachevar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
+  ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15697,13 +15699,16 @@ else
   eval $cachevar=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         CXXFLAGS="$ac_save_CXXFLAGS"
+         CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
       if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
         ac_success=yes
         break
       fi
@@ -15711,16 +15716,17 @@ $as_echo "$ac_res" >&6; }
   fi
 
     if test x$ac_success = xno; then
-                for switch in -std=c++11 -std=c++0x +std=c++11 "-h std=c++11"; do
-      cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+                for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
 $as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
 if eval \${$cachevar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -16015,14 +16021,21 @@ else
   eval $cachevar=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         CXXFLAGS="$ac_save_CXXFLAGS"
+           CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
         break
       fi
     done
@@ -16037,21 +16050,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     if test x$ac_success = xno; then
       as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5
     fi
-  else
-    if test x$ac_success = xno; then
-      HAVE_CXX11=0
-      { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX11=0
+    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
 $as_echo "$as_me: No compiler with C++11 support was found" >&6;}
-    else
-      HAVE_CXX11=1
+  else
+    HAVE_CXX11=1
 
 $as_echo "#define HAVE_CXX11 1" >>confdefs.h
 
-    fi
-
-
   fi
 
+
+
             if test -n "$wxWITH_CXX_IS_OPTIONAL"; then
                 if test "$HAVE_CXX11" != 1; then
                     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -16063,7 +16075,7 @@ See \`config.log' for more details" "$LINENO" 5; }
             ;;
 
         14)
-                                          ax_cxx_compile_cxx14_required=true
+                                      ax_cxx_compile_alternatives="14 1y"    ax_cxx_compile_cxx14_required=true
   ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16440,7 +16452,7 @@ namespace cxx14
 
   }
 
-  namespace test_digit_seperators
+  namespace test_digit_separators
   {
 
     constexpr auto ten_million = 100'000'000;
@@ -16498,15 +16510,16 @@ $as_echo "$ax_cv_cxx_compile_cxx14" >&6; }
   fi
 
     if test x$ac_success = xno; then
-    for switch in -std=gnu++14 -std=gnu++0x; do
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      switch="-std=gnu++${alternative}"
       cachevar=`$as_echo "ax_cv_cxx_compile_cxx14_$switch" | $as_tr_sh`
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5
 $as_echo_n "checking whether $CXX supports C++14 features with $switch... " >&6; }
 if eval \${$cachevar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
+  ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16872,7 +16885,7 @@ namespace cxx14
 
   }
 
-  namespace test_digit_seperators
+  namespace test_digit_separators
   {
 
     constexpr auto ten_million = 100'000'000;
@@ -16922,13 +16935,16 @@ else
   eval $cachevar=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         CXXFLAGS="$ac_save_CXXFLAGS"
+         CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
       if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
         ac_success=yes
         break
       fi
@@ -16936,16 +16952,17 @@ $as_echo "$ac_res" >&6; }
   fi
 
     if test x$ac_success = xno; then
-                for switch in -std=c++14 -std=c++0x +std=c++14 "-h std=c++14"; do
-      cachevar=`$as_echo "ax_cv_cxx_compile_cxx14_$switch" | $as_tr_sh`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5
+                for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=`$as_echo "ax_cv_cxx_compile_cxx14_$switch" | $as_tr_sh`
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++14 features with $switch" >&5
 $as_echo_n "checking whether $CXX supports C++14 features with $switch... " >&6; }
 if eval \${$cachevar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_save_CXXFLAGS="$CXXFLAGS"
-         CXXFLAGS="$CXXFLAGS $switch"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -17310,7 +17327,7 @@ namespace cxx14
 
   }
 
-  namespace test_digit_seperators
+  namespace test_digit_separators
   {
 
     constexpr auto ten_million = 100'000'000;
@@ -17360,14 +17377,21 @@ else
   eval $cachevar=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-         CXXFLAGS="$ac_save_CXXFLAGS"
+           CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-      if eval test x\$$cachevar = xyes; then
-        CXXFLAGS="$CXXFLAGS $switch"
-        ac_success=yes
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
         break
       fi
     done
@@ -17382,28 +17406,2583 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     if test x$ac_success = xno; then
       as_fn_error $? "*** A compiler with support for C++14 language features is required." "$LINENO" 5
     fi
-  else
-    if test x$ac_success = xno; then
-      HAVE_CXX14=0
-      { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++14 support was found" >&5
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX14=0
+    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++14 support was found" >&5
 $as_echo "$as_me: No compiler with C++14 support was found" >&6;}
-    else
-      HAVE_CXX14=1
+  else
+    HAVE_CXX14=1
 
 $as_echo "#define HAVE_CXX14 1" >>confdefs.h
 
-    fi
-
-
   fi
 
 
 
+
+
                         HAVE_CXX11=1
             ;;
 
+        17)
+                          ax_cxx_compile_alternatives="17 1z"    ax_cxx_compile_cxx17_required=true
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+  ac_success=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features by default" >&5
+$as_echo_n "checking whether $CXX supports C++17 features by default... " >&6; }
+if ${ax_cv_cxx_compile_cxx17+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+
+
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_separators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+
+
+
+// If the compiler admits that it is not ready for C++17, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus <= 201402L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#if defined(__clang__)
+  #define REALLY_CLANG
+#else
+  #if defined(__GNUC__)
+    #define REALLY_GCC
+  #endif
+#endif
+
+#include <initializer_list>
+#include <utility>
+#include <type_traits>
+
+namespace cxx17
+{
+
+#if !defined(REALLY_CLANG)
+  namespace test_constexpr_lambdas
+  {
+
+    // TODO: test it with clang++ from git
+
+    constexpr int foo = [](){return 42;}();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test::nested_namespace::definitions
+  {
+
+  }
+
+  namespace test_fold_expression
+  {
+
+    template<typename... Args>
+    int multiply(Args... args)
+    {
+      return (args * ... * 1);
+    }
+
+    template<typename... Args>
+    bool all(Args... args)
+    {
+      return (args && ...);
+    }
+
+  }
+
+  namespace test_extended_static_assert
+  {
+
+    static_assert (true);
+
+  }
+
+  namespace test_auto_brace_init_list
+  {
+
+    auto foo = {5};
+    auto bar {5};
+
+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
+    static_assert(std::is_same<int, decltype(bar)>::value);
+  }
+
+  namespace test_typename_in_template_template_parameter
+  {
+
+    template<template<typename> typename X> struct D;
+
+  }
+
+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
+  {
+
+    int f1()
+    {
+      return 42;
+    }
+
+    [[nodiscard]] int f2()
+    {
+      [[maybe_unused]] auto unused = f1();
+
+      switch (f1())
+      {
+      case 17:
+        f1();
+        [[fallthrough]];
+      case 42:
+        f1();
+      }
+      return f1();
+    }
+
+  }
+
+  namespace test_extended_aggregate_initialization
+  {
+
+    struct base1
+    {
+      int b1, b2 = 42;
+    };
+
+    struct base2
+    {
+      base2() {
+        b3 = 42;
+      }
+      int b3;
+    };
+
+    struct derived : base1, base2
+    {
+        int d;
+    };
+
+    derived d1 {{1, 2}, {}, 4};  // full initialization
+    derived d2 {{}, {}, 4};      // value-initialized bases
+
+  }
+
+  namespace test_general_range_based_for_loop
+  {
+
+    struct iter
+    {
+      int i;
+
+      int& operator* ()
+      {
+        return i;
+      }
+
+      const int& operator* () const
+      {
+        return i;
+      }
+
+      iter& operator++()
+      {
+        ++i;
+        return *this;
+      }
+    };
+
+    struct sentinel
+    {
+      int i;
+    };
+
+    bool operator== (const iter& i, const sentinel& s)
+    {
+      return i.i == s.i;
+    }
+
+    bool operator!= (const iter& i, const sentinel& s)
+    {
+      return !(i == s);
+    }
+
+    struct range
+    {
+      iter begin() const
+      {
+        return {0};
+      }
+
+      sentinel end() const
+      {
+        return {5};
+      }
+    };
+
+    void f()
+    {
+      range r {};
+
+      for (auto i : r)
+      {
+        [[maybe_unused]] auto v = i;
+      }
+    }
+
+  }
+
+  namespace test_lambda_capture_asterisk_this_by_value
+  {
+
+    struct t
+    {
+      int i;
+      int foo()
+      {
+        return [*this]()
+        {
+          return i;
+        }();
+      }
+    };
+
+  }
+
+  namespace test_enum_class_construction
+  {
+
+    enum class byte : unsigned char
+    {};
+
+    byte foo {42};
+
+  }
+
+  namespace test_constexpr_if
+  {
+
+    template <bool cond>
+    int f ()
+    {
+      if constexpr(cond)
+      {
+        return 13;
+      }
+      else
+      {
+        return 42;
+      }
+    }
+
+  }
+
+  namespace test_selection_statement_with_initializer
+  {
+
+    int f()
+    {
+      return 13;
+    }
+
+    int f2()
+    {
+      if (auto i = f(); i > 0)
+      {
+        return 3;
+      }
+
+      switch (auto i = f(); i + 4)
+      {
+      case 17:
+        return 2;
+
+      default:
+        return 1;
+      }
+    }
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_template_argument_deduction_for_class_templates
+  {
+
+    // TODO: test it with clang++ from git
+
+    template <typename T1, typename T2>
+    struct pair
+    {
+      pair (T1 p1, T2 p2)
+        : m1 {p1},
+          m2 {p2}
+      {}
+
+      T1 m1;
+      T2 m2;
+    };
+
+    void f()
+    {
+      [[maybe_unused]] auto p = pair{13, 42u};
+    }
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_non_type_auto_template_parameters
+  {
+
+    template <auto n>
+    struct B
+    {};
+
+    B<5> b1;
+    B<'a'> b2;
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_structured_bindings
+  {
+
+    // TODO: test it with clang++ from git
+
+    int arr[2] = { 1, 2 };
+    std::pair<int, int> pr = { 1, 2 };
+
+    auto f1() -> int(&)[2]
+    {
+      return arr;
+    }
+
+    auto f2() -> std::pair<int, int>&
+    {
+      return pr;
+    }
+
+    struct S
+    {
+      int x1 : 2;
+      volatile double y1;
+    };
+
+    S f3()
+    {
+      return {};
+    }
+
+    auto [ x1, y1 ] = f1();
+    auto& [ xr1, yr1 ] = f1();
+    auto [ x2, y2 ] = f2();
+    auto& [ xr2, yr2 ] = f2();
+    const auto [ x3, y3 ] = f3();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+#if !defined(REALLY_CLANG)
+  namespace test_exception_spec_type_system
+  {
+
+    // TODO: test it with clang++ from git
+
+    struct Good {};
+    struct Bad {};
+
+    void g1() noexcept;
+    void g2();
+
+    template<typename T>
+    Bad
+    f(T*, T*);
+
+    template<typename T1, typename T2>
+    Good
+    f(T1*, T2*);
+
+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_inline_variables
+  {
+
+    template<class T> void f(T)
+    {}
+
+    template<class T> inline T g(T)
+    {
+      return T{};
+    }
+
+    template<> inline void f<>(int)
+    {}
+
+    template<> int g<>(int)
+    {
+      return 5;
+    }
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus <= 201402L
+
+
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ax_cv_cxx_compile_cxx17=yes
+else
+  ax_cv_cxx_compile_cxx17=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx17" >&5
+$as_echo "$ax_cv_cxx_compile_cxx17" >&6; }
+  if test x$ax_cv_cxx_compile_cxx17 = xyes; then
+    ac_success=yes
+  fi
+
+    if test x$ac_success = xno; then
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      switch="-std=gnu++${alternative}"
+      cachevar=`$as_echo "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
+$as_echo_n "checking whether $CXX supports C++17 features with $switch... " >&6; }
+if eval \${$cachevar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+
+
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_separators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+
+
+
+// If the compiler admits that it is not ready for C++17, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus <= 201402L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#if defined(__clang__)
+  #define REALLY_CLANG
+#else
+  #if defined(__GNUC__)
+    #define REALLY_GCC
+  #endif
+#endif
+
+#include <initializer_list>
+#include <utility>
+#include <type_traits>
+
+namespace cxx17
+{
+
+#if !defined(REALLY_CLANG)
+  namespace test_constexpr_lambdas
+  {
+
+    // TODO: test it with clang++ from git
+
+    constexpr int foo = [](){return 42;}();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test::nested_namespace::definitions
+  {
+
+  }
+
+  namespace test_fold_expression
+  {
+
+    template<typename... Args>
+    int multiply(Args... args)
+    {
+      return (args * ... * 1);
+    }
+
+    template<typename... Args>
+    bool all(Args... args)
+    {
+      return (args && ...);
+    }
+
+  }
+
+  namespace test_extended_static_assert
+  {
+
+    static_assert (true);
+
+  }
+
+  namespace test_auto_brace_init_list
+  {
+
+    auto foo = {5};
+    auto bar {5};
+
+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
+    static_assert(std::is_same<int, decltype(bar)>::value);
+  }
+
+  namespace test_typename_in_template_template_parameter
+  {
+
+    template<template<typename> typename X> struct D;
+
+  }
+
+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
+  {
+
+    int f1()
+    {
+      return 42;
+    }
+
+    [[nodiscard]] int f2()
+    {
+      [[maybe_unused]] auto unused = f1();
+
+      switch (f1())
+      {
+      case 17:
+        f1();
+        [[fallthrough]];
+      case 42:
+        f1();
+      }
+      return f1();
+    }
+
+  }
+
+  namespace test_extended_aggregate_initialization
+  {
+
+    struct base1
+    {
+      int b1, b2 = 42;
+    };
+
+    struct base2
+    {
+      base2() {
+        b3 = 42;
+      }
+      int b3;
+    };
+
+    struct derived : base1, base2
+    {
+        int d;
+    };
+
+    derived d1 {{1, 2}, {}, 4};  // full initialization
+    derived d2 {{}, {}, 4};      // value-initialized bases
+
+  }
+
+  namespace test_general_range_based_for_loop
+  {
+
+    struct iter
+    {
+      int i;
+
+      int& operator* ()
+      {
+        return i;
+      }
+
+      const int& operator* () const
+      {
+        return i;
+      }
+
+      iter& operator++()
+      {
+        ++i;
+        return *this;
+      }
+    };
+
+    struct sentinel
+    {
+      int i;
+    };
+
+    bool operator== (const iter& i, const sentinel& s)
+    {
+      return i.i == s.i;
+    }
+
+    bool operator!= (const iter& i, const sentinel& s)
+    {
+      return !(i == s);
+    }
+
+    struct range
+    {
+      iter begin() const
+      {
+        return {0};
+      }
+
+      sentinel end() const
+      {
+        return {5};
+      }
+    };
+
+    void f()
+    {
+      range r {};
+
+      for (auto i : r)
+      {
+        [[maybe_unused]] auto v = i;
+      }
+    }
+
+  }
+
+  namespace test_lambda_capture_asterisk_this_by_value
+  {
+
+    struct t
+    {
+      int i;
+      int foo()
+      {
+        return [*this]()
+        {
+          return i;
+        }();
+      }
+    };
+
+  }
+
+  namespace test_enum_class_construction
+  {
+
+    enum class byte : unsigned char
+    {};
+
+    byte foo {42};
+
+  }
+
+  namespace test_constexpr_if
+  {
+
+    template <bool cond>
+    int f ()
+    {
+      if constexpr(cond)
+      {
+        return 13;
+      }
+      else
+      {
+        return 42;
+      }
+    }
+
+  }
+
+  namespace test_selection_statement_with_initializer
+  {
+
+    int f()
+    {
+      return 13;
+    }
+
+    int f2()
+    {
+      if (auto i = f(); i > 0)
+      {
+        return 3;
+      }
+
+      switch (auto i = f(); i + 4)
+      {
+      case 17:
+        return 2;
+
+      default:
+        return 1;
+      }
+    }
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_template_argument_deduction_for_class_templates
+  {
+
+    // TODO: test it with clang++ from git
+
+    template <typename T1, typename T2>
+    struct pair
+    {
+      pair (T1 p1, T2 p2)
+        : m1 {p1},
+          m2 {p2}
+      {}
+
+      T1 m1;
+      T2 m2;
+    };
+
+    void f()
+    {
+      [[maybe_unused]] auto p = pair{13, 42u};
+    }
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_non_type_auto_template_parameters
+  {
+
+    template <auto n>
+    struct B
+    {};
+
+    B<5> b1;
+    B<'a'> b2;
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_structured_bindings
+  {
+
+    // TODO: test it with clang++ from git
+
+    int arr[2] = { 1, 2 };
+    std::pair<int, int> pr = { 1, 2 };
+
+    auto f1() -> int(&)[2]
+    {
+      return arr;
+    }
+
+    auto f2() -> std::pair<int, int>&
+    {
+      return pr;
+    }
+
+    struct S
+    {
+      int x1 : 2;
+      volatile double y1;
+    };
+
+    S f3()
+    {
+      return {};
+    }
+
+    auto [ x1, y1 ] = f1();
+    auto& [ xr1, yr1 ] = f1();
+    auto [ x2, y2 ] = f2();
+    auto& [ xr2, yr2 ] = f2();
+    const auto [ x3, y3 ] = f3();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+#if !defined(REALLY_CLANG)
+  namespace test_exception_spec_type_system
+  {
+
+    // TODO: test it with clang++ from git
+
+    struct Good {};
+    struct Bad {};
+
+    void g1() noexcept;
+    void g2();
+
+    template<typename T>
+    Bad
+    f(T*, T*);
+
+    template<typename T1, typename T2>
+    Good
+    f(T1*, T2*);
+
+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_inline_variables
+  {
+
+    template<class T> void f(T)
+    {}
+
+    template<class T> inline T g(T)
+    {
+      return T{};
+    }
+
+    template<> inline void f<>(int)
+    {}
+
+    template<> int g<>(int)
+    {
+      return 5;
+    }
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus <= 201402L
+
+
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval $cachevar=yes
+else
+  eval $cachevar=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+         CXX="$ac_save_CXX"
+fi
+eval ac_res=\$$cachevar
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi
+
+    if test x$ac_success = xno; then
+                for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=`$as_echo "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
+$as_echo_n "checking whether $CXX supports C++17 features with $switch... " >&6; }
+if eval \${$cachevar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+
+
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_separators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+
+
+
+// If the compiler admits that it is not ready for C++17, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus <= 201402L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#if defined(__clang__)
+  #define REALLY_CLANG
+#else
+  #if defined(__GNUC__)
+    #define REALLY_GCC
+  #endif
+#endif
+
+#include <initializer_list>
+#include <utility>
+#include <type_traits>
+
+namespace cxx17
+{
+
+#if !defined(REALLY_CLANG)
+  namespace test_constexpr_lambdas
+  {
+
+    // TODO: test it with clang++ from git
+
+    constexpr int foo = [](){return 42;}();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test::nested_namespace::definitions
+  {
+
+  }
+
+  namespace test_fold_expression
+  {
+
+    template<typename... Args>
+    int multiply(Args... args)
+    {
+      return (args * ... * 1);
+    }
+
+    template<typename... Args>
+    bool all(Args... args)
+    {
+      return (args && ...);
+    }
+
+  }
+
+  namespace test_extended_static_assert
+  {
+
+    static_assert (true);
+
+  }
+
+  namespace test_auto_brace_init_list
+  {
+
+    auto foo = {5};
+    auto bar {5};
+
+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
+    static_assert(std::is_same<int, decltype(bar)>::value);
+  }
+
+  namespace test_typename_in_template_template_parameter
+  {
+
+    template<template<typename> typename X> struct D;
+
+  }
+
+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
+  {
+
+    int f1()
+    {
+      return 42;
+    }
+
+    [[nodiscard]] int f2()
+    {
+      [[maybe_unused]] auto unused = f1();
+
+      switch (f1())
+      {
+      case 17:
+        f1();
+        [[fallthrough]];
+      case 42:
+        f1();
+      }
+      return f1();
+    }
+
+  }
+
+  namespace test_extended_aggregate_initialization
+  {
+
+    struct base1
+    {
+      int b1, b2 = 42;
+    };
+
+    struct base2
+    {
+      base2() {
+        b3 = 42;
+      }
+      int b3;
+    };
+
+    struct derived : base1, base2
+    {
+        int d;
+    };
+
+    derived d1 {{1, 2}, {}, 4};  // full initialization
+    derived d2 {{}, {}, 4};      // value-initialized bases
+
+  }
+
+  namespace test_general_range_based_for_loop
+  {
+
+    struct iter
+    {
+      int i;
+
+      int& operator* ()
+      {
+        return i;
+      }
+
+      const int& operator* () const
+      {
+        return i;
+      }
+
+      iter& operator++()
+      {
+        ++i;
+        return *this;
+      }
+    };
+
+    struct sentinel
+    {
+      int i;
+    };
+
+    bool operator== (const iter& i, const sentinel& s)
+    {
+      return i.i == s.i;
+    }
+
+    bool operator!= (const iter& i, const sentinel& s)
+    {
+      return !(i == s);
+    }
+
+    struct range
+    {
+      iter begin() const
+      {
+        return {0};
+      }
+
+      sentinel end() const
+      {
+        return {5};
+      }
+    };
+
+    void f()
+    {
+      range r {};
+
+      for (auto i : r)
+      {
+        [[maybe_unused]] auto v = i;
+      }
+    }
+
+  }
+
+  namespace test_lambda_capture_asterisk_this_by_value
+  {
+
+    struct t
+    {
+      int i;
+      int foo()
+      {
+        return [*this]()
+        {
+          return i;
+        }();
+      }
+    };
+
+  }
+
+  namespace test_enum_class_construction
+  {
+
+    enum class byte : unsigned char
+    {};
+
+    byte foo {42};
+
+  }
+
+  namespace test_constexpr_if
+  {
+
+    template <bool cond>
+    int f ()
+    {
+      if constexpr(cond)
+      {
+        return 13;
+      }
+      else
+      {
+        return 42;
+      }
+    }
+
+  }
+
+  namespace test_selection_statement_with_initializer
+  {
+
+    int f()
+    {
+      return 13;
+    }
+
+    int f2()
+    {
+      if (auto i = f(); i > 0)
+      {
+        return 3;
+      }
+
+      switch (auto i = f(); i + 4)
+      {
+      case 17:
+        return 2;
+
+      default:
+        return 1;
+      }
+    }
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_template_argument_deduction_for_class_templates
+  {
+
+    // TODO: test it with clang++ from git
+
+    template <typename T1, typename T2>
+    struct pair
+    {
+      pair (T1 p1, T2 p2)
+        : m1 {p1},
+          m2 {p2}
+      {}
+
+      T1 m1;
+      T2 m2;
+    };
+
+    void f()
+    {
+      [[maybe_unused]] auto p = pair{13, 42u};
+    }
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_non_type_auto_template_parameters
+  {
+
+    template <auto n>
+    struct B
+    {};
+
+    B<5> b1;
+    B<'a'> b2;
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_structured_bindings
+  {
+
+    // TODO: test it with clang++ from git
+
+    int arr[2] = { 1, 2 };
+    std::pair<int, int> pr = { 1, 2 };
+
+    auto f1() -> int(&)[2]
+    {
+      return arr;
+    }
+
+    auto f2() -> std::pair<int, int>&
+    {
+      return pr;
+    }
+
+    struct S
+    {
+      int x1 : 2;
+      volatile double y1;
+    };
+
+    S f3()
+    {
+      return {};
+    }
+
+    auto [ x1, y1 ] = f1();
+    auto& [ xr1, yr1 ] = f1();
+    auto [ x2, y2 ] = f2();
+    auto& [ xr2, yr2 ] = f2();
+    const auto [ x3, y3 ] = f3();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+#if !defined(REALLY_CLANG)
+  namespace test_exception_spec_type_system
+  {
+
+    // TODO: test it with clang++ from git
+
+    struct Good {};
+    struct Bad {};
+
+    void g1() noexcept;
+    void g2();
+
+    template<typename T>
+    Bad
+    f(T*, T*);
+
+    template<typename T1, typename T2>
+    Good
+    f(T1*, T2*);
+
+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_inline_variables
+  {
+
+    template<class T> void f(T)
+    {}
+
+    template<class T> inline T g(T)
+    {
+      return T{};
+    }
+
+    template<> inline void f<>(int)
+    {}
+
+    template<> int g<>(int)
+    {
+      return 5;
+    }
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus <= 201402L
+
+
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval $cachevar=yes
+else
+  eval $cachevar=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+           CXX="$ac_save_CXX"
+fi
+eval ac_res=\$$cachevar
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
+        break
+      fi
+    done
+  fi
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  if test x$ax_cxx_compile_cxx17_required = xtrue; then
+    if test x$ac_success = xno; then
+      as_fn_error $? "*** A compiler with support for C++17 language features is required." "$LINENO" 5
+    fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX17=0
+    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5
+$as_echo "$as_me: No compiler with C++17 support was found" >&6;}
+  else
+    HAVE_CXX17=1
+
+$as_echo "#define HAVE_CXX17 1" >>confdefs.h
+
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5
+$as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;}
+
+            HAVE_CXX11=1
+            ;;
+
         *)
-            as_fn_error $? "Invalid --with-cxx=\"$wxWITH_CXX\" option value, only 11 or 14 supported" "$LINENO" 5
+            as_fn_error $? "Invalid --with-cxx=\"$wxWITH_CXX\" option value, only 11, 14 or 17 supported" "$LINENO" 5
     esac
 
     if test "$HAVE_CXX11" = "1" ; then
diff --git a/configure.in b/configure.in
index 2cd338023b..340f2b30bb 100644
--- a/configure.in
+++ b/configure.in
@@ -633,7 +633,7 @@ dnl ---------------------------------------------------------------------------
 
 WX_ARG_DISABLE(shared,     [  --disable-shared        create static library instead of shared], wxUSE_SHARED)
 AC_ARG_ENABLE(cxx11,       [  --enable-cxx11          use C++11 compiler if available], [wxWITH_CXX=11 wxWITH_CXX_IS_OPTIONAL=1])
-AC_ARG_WITH(cxx,           [  --with-cxx=11|14        use the given C++11], [wxWITH_CXX="$withval"])
+AC_ARG_WITH(cxx,           [  --with-cxx=11|14|17     use the given C++ dialect], [wxWITH_CXX="$withval"])
 WX_ARG_ENABLE(stl,         [  --enable-stl            use standard C++ classes for everything], wxUSE_STL)
 if test "$wxUSE_STL" = "yes"; then
     DEFAULT_wxUSE_STD_CONTAINERS=yes
@@ -1101,8 +1101,14 @@ if test -n "$wxWITH_CXX"; then
             HAVE_CXX11=1
             ;;
 
+        17)
+            dnl This is similar to 14 above.
+            AX_CXX_COMPILE_STDCXX(17)
+            HAVE_CXX11=1
+            ;;
+
         *)
-            AC_MSG_ERROR([Invalid --with-cxx="$wxWITH_CXX" option value, only 11 or 14 supported])
+            AC_MSG_ERROR([Invalid --with-cxx="$wxWITH_CXX" option value, only 11, 14 or 17 supported])
     esac
 
     if test "$HAVE_CXX11" = "1" ; then

From 0fe9d7c3bbd5c10665d41719d59129110895fb06 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Mon, 5 Feb 2018 10:02:48 -0800
Subject: [PATCH 341/916] Revert e41a1b1cbb "Menubar accelerators are now
 preserved"

It overwrites any existing accelerator table, and menubar accelerators
seem to work fine without it. See #18053
---
 src/gtk/frame.cpp | 67 -----------------------------------------------
 1 file changed, 67 deletions(-)

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 862a424e41..f902f70fea 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -111,78 +111,11 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
         *height = 0;
 }
 
-#if wxUSE_MENUS && wxUSE_ACCEL
-// Helper for wxCreateAcceleratorTableForMenuBar
-static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu)
-{
-    size_t i;
-    for (i = 0; i < menu->GetMenuItems().GetCount(); i++)
-    {
-        wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData();
-        if (item->GetSubMenu())
-        {
-            wxAddAccelerators(accelEntries, item->GetSubMenu());
-        }
-        else if (!item->GetItemLabel().IsEmpty())
-        {
-            wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(item->GetItemLabel());
-            if (entry)
-            {
-                entry->Set(entry->GetFlags(), entry->GetKeyCode(), item->GetId());
-                accelEntries.Append((wxObject*) entry);
-            }
-        }
-    }
-}
-
-// Create an accelerator table consisting of all the accelerators
-// from the menubar in the given menus
-static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar)
-{
-    wxList accelEntries;
-
-    size_t i;
-    for (i = 0; i < menuBar->GetMenuCount(); i++)
-    {
-        wxAddAccelerators(accelEntries, menuBar->GetMenu(i));
-    }
-
-    size_t n = accelEntries.GetCount();
-
-    if (n == 0)
-        return wxAcceleratorTable();
-
-    wxAcceleratorEntry* entries = new wxAcceleratorEntry[n];
-
-    for (i = 0; i < accelEntries.GetCount(); i++)
-    {
-        wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData();
-        entries[i] = (*entry);
-        delete entry;
-
-    }
-
-    wxAcceleratorTable table(n, entries);
-    delete[] entries;
-
-    return table;
-}
-#endif // wxUSE_MENUS && wxUSE_ACCEL
-
 bool wxFrame::ShowFullScreen(bool show, long style)
 {
     if (!wxFrameBase::ShowFullScreen(show, style))
         return false;
 
-#if wxUSE_MENUS && wxUSE_ACCEL
-    if (show && GetMenuBar())
-    {
-        wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar()));
-        if (table.IsOk())
-            SetAcceleratorTable(table);
-    }
-#endif // wxUSE_MENUS && wxUSE_ACCEL
-
     wxWindow* const bar[] = {
 #if wxUSE_MENUS
         m_frameMenuBar,

From 9c29b6de48e7775ee88024d46949f4ea5d01ce6b Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Thu, 8 Feb 2018 10:05:21 +0200
Subject: [PATCH 342/916] Fix building tests with wxUSE_STL=1 and
 wxUSE_UNSAFE_WXSTRING_CONV=0

---
 tests/strings/stdstrings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/strings/stdstrings.cpp b/tests/strings/stdstrings.cpp
index 1446a8c040..e9682b5761 100644
--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -593,7 +593,7 @@ void StdStringTestCase::StdConversion()
     // notice that implicit wxString -> std::string conversion is only
     // available in wxUSE_STL case, because it conflicts with conversion to
     // const char*/wchar_t*
-#if wxUSE_STL
+#if wxUSE_STL && wxUSE_UNSAFE_WXSTRING_CONV
     std::string s5 = s4;
 #else
     std::string s5 = s4.ToStdString();

From 7ce0a0a774679d9745e8528da8449b31f9cde9ac Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Thu, 8 Feb 2018 10:59:39 +0100
Subject: [PATCH 343/916] CMake: Additional fixes/tweaks for C++11 on macOS

The changes in 0a94c1890f83532ce5b6801c019ff7d25b9f11ad where an
incomplete solution.
The apple compiler automatically choses libc++ if the deployment target
is >= 10.9. Lower deployment targets need explicit compiler options
to use libc++.
---
 CMakeLists.txt              |  7 +------
 build/cmake/functions.cmake | 20 +++++++++++---------
 build/cmake/setup.cmake     |  8 ++++++++
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21ae14c342..a067b00356 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,12 +20,7 @@ endif()
 if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
     # If no deployment target has been set default to the minimum supported
     # OS X version (this has to be set before the first project() call)
-    if(CMAKE_CXX_STANDARD EQUAL 11 OR CMAKE_CXX_STANDARD EQUAL 14)
-        set(OSX_DEFAULT_DEPLOYMENT_TARGET 10.9)
-    else()
-        set(OSX_DEFAULT_DEPLOYMENT_TARGET 10.7)
-    endif()
-    set(CMAKE_OSX_DEPLOYMENT_TARGET ${OSX_DEFAULT_DEPLOYMENT_TARGET} CACHE STRING "OS X Deployment Target")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7 CACHE STRING "OS X Deployment Target")
 endif()
 
 project(wxWidgets)
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 6cf1faf00d..9af05bd939 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -73,15 +73,17 @@ function(wx_set_common_target_properties target_name)
     if(DEFINED wxBUILD_CXX_STANDARD AND NOT wxBUILD_CXX_STANDARD STREQUAL COMPILER_DEFAULT)
         # TODO: implement for older CMake versions ?
         set_target_properties(${target_name} PROPERTIES CXX_STANDARD ${wxBUILD_CXX_STANDARD})
-        if(wxBUILD_CXX_STANDARD EQUAL 11 OR wxBUILD_CXX_STANDARD EQUAL 14)
-            if (APPLE)
-                if(CMAKE_GENERATOR EQUAL "Xcode")
-                    set_target_properties(${target_name} PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY libc++)
-                else()
-                    target_compile_options(${target_name} PUBLIC "-stdlib=libc++")
-                endif()
+        if(
+            APPLE AND
+            CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND
+            (wxBUILD_CXX_STANDARD EQUAL 11 OR wxBUILD_CXX_STANDARD EQUAL 14)
+          )
+            if(CMAKE_GENERATOR STREQUAL "Xcode")
+                set_target_properties(${target_name} PROPERTIES XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY libc++)
+            else()
+                target_compile_options(${target_name} PUBLIC "-stdlib=libc++")
+                target_link_libraries(${target_name} PRIVATE "-stdlib=libc++")
             endif()
-            #TODO: define for other generators than Xcode
         endif()
     endif()
     set_target_properties(${target_name} PROPERTIES
@@ -363,7 +365,7 @@ macro(wx_exe_link_libraries name)
     if(wxBUILD_MONOLITHIC)
         target_link_libraries(${name} PUBLIC mono)
     else()
-        target_link_libraries(${name};${ARGN})
+        target_link_libraries(${name};PRIVATE;${ARGN})
     endif()
 endmacro()
 
diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index 2dd2de9262..700d41e0f5 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -23,6 +23,14 @@ include(CheckTypeSize)
 include(CMakePushCheckState)
 include(TestBigEndian)
 
+if(
+    APPLE AND
+    CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.9 AND
+    (CMAKE_CXX_STANDARD EQUAL 11 OR CMAKE_CXX_STANDARD EQUAL 14)
+  )
+    set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-stdlib=libc++")
+endif()
+
 # Add a definition to setup.h and append it to a list of defines for
 # for compile checks
 macro(wx_setup_definition def)

From 4ec4a41b1ba78feb779259e1b71601cefd7f8cfc Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Thu, 8 Feb 2018 11:01:47 +0100
Subject: [PATCH 344/916] Remove additional macOS flags for cmake build in
 Travis CI

These flags where added as a workaround in
bdcf21a5bdae38ed58ae21819dcd6f07d475c188 and should no longer be required
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 66d6216a07..790f5aca76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ matrix:
           env: wxCONFIGURE_FLAGS="--enable-cxx11" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" wxSKIP_SAMPLES=1
         - os: osx
           compiler: clang
-          env: wxTOOLSET=cmake wxCMAKE_GENERATOR=Xcode wxCMAKE_DEFINES="-DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-stdlib=libc++"
+          env: wxTOOLSET=cmake wxCMAKE_GENERATOR=Xcode wxCMAKE_DEFINES="-DCMAKE_CXX_STANDARD=11"
 
 branches:
     only:

From 8f575f03982b3f9c7b536f178639328ad2e9a02d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 7 Feb 2018 21:05:30 +0100
Subject: [PATCH 345/916] Make the warning about GitHub archives even more
 prominent

The existing warning came too late to be effective, so put it in front
to (hopefully) really ensure that people avoid getting the wrong files.
---
 docs/release.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/release.md b/docs/release.md
index 2e7393c662..5f43994e41 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -9,7 +9,9 @@ Please see [**README**](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3
 
 ## Source Files and Documentation
 
-If you intend to build wxWidgets from sources (which is recommended), please download `wxWidgets-3.1.1-rc` archive in either [ZIP](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.zip) or [7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.7z), for much smaller size, format for Microsoft Windows systems or the [compressed tarball](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform. Be sure to _not_ download the files available from the "Source code" links above, which are automatically generated by GitHub and don't contain the submodules sources which are necessary for building wxWidgets.
+If you intend to build wxWidgets from sources (which is recommended), please do **NOT** download the files using the "Source code" links just above, which are automatically generated by GitHub and don't contain the submodules sources which are necessary for building wxWidgets.
+
+Instead, download one of [wxWidgets-3.1.1-rc.zip](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.zip) or [wxWidgets-3.1.1-rc.7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.7z), for much smaller size, for Microsoft Windows systems or [wxWidgets-3.1.1-rc.tar.bz2](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform.
 
 In addition, we provide archives containing the documentation in either HTML or Microsoft CHM formats. Notice that the documentation is also [available online](http://docs.wxwidgets.org/3.1).
 

From 9a3b1457317bdc82de819c8d6ec5b67958b5b3f6 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Thu, 8 Feb 2018 20:36:48 +0100
Subject: [PATCH 346/916] CMake: Use wx_exe_link_libraries() to link sample
 libs

Fixes a recent regression and it should be used to enable monolithic build
---
 build/cmake/samples/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index 40fbf44dd6..36032772fb 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -123,7 +123,7 @@ endif()
 wx_add_sample(sound RES sound.rc DATA 9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav LIBRARIES adv DEPENDS wxUSE_SOUND)
 wx_add_sample(splash DATA splash.png press.mpg LIBRARIES adv DEPENDS wxUSE_SPLASH)
 if(TARGET splash AND wxUSE_MEDIACTRL)
-    target_link_libraries(splash media)
+    wx_exe_link_libraries(splash media)
 endif()
 wx_add_sample(splitter DEPENDS wxUSE_SPLITTER)
 wx_add_sample(statbar DEPENDS wxUSE_STATUSBAR)

From 623a9123a1deaae4865c53bd8598e8dc4590e9b6 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Thu, 8 Feb 2018 21:13:44 +0100
Subject: [PATCH 347/916] CMake: Enable multi-processor compilation for MSVC

Add option wxBUILD_MSVC_MULTIPROC which defaults to ON
to add /MP the MSVC compiler options.
---
 build/cmake/init.cmake    | 5 +++++
 build/cmake/options.cmake | 1 +
 2 files changed, 6 insertions(+)

diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index bb17e3fd85..06256b1b1d 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -22,6 +22,11 @@ if(DEFINED wxBUILD_USE_STATIC_RUNTIME AND wxBUILD_USE_STATIC_RUNTIME)
     endforeach()
 endif()
 
+if(wxBUILD_MSVC_MULTIPROC)
+    wx_string_append(CMAKE_C_FLAGS " /MP")
+    wx_string_append(CMAKE_CXX_FLAGS " /MP")
+endif()
+
 if(wxBUILD_COMPATIBILITY VERSION_LESS 3.0)
     set(WXWIN_COMPATIBILITY_2_8 ON)
 endif()
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index 5d1d9a606e..b01db3261f 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -25,6 +25,7 @@ mark_as_advanced(wxBUILD_CUSTOM_SETUP_HEADER_PATH)
 
 if(MSVC)
     wx_option(wxBUILD_USE_STATIC_RUNTIME "Link using the static runtime library" OFF)
+    wx_option(wxBUILD_MSVC_MULTIPROC "Enable multi-processor compilation for MSVC")
 else()
     # Other compilers support setting the C++ standard, present it an option to the user
     if(DEFINED CMAKE_CXX_STANDARD)

From 32fe8b4b43ae4ae3531b4d6ebb371d262879d879 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 10 Feb 2018 08:49:25 -0800
Subject: [PATCH 348/916] build fixes for wxUSE_UNICODE==0

---
 src/gtk/assertdlg_gtk.cpp | 4 ++--
 src/gtk/button.cpp        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp
index 12cc36109f..f71bba371c 100644
--- a/src/gtk/assertdlg_gtk.cpp
+++ b/src/gtk/assertdlg_gtk.cpp
@@ -177,8 +177,8 @@ static void gtk_assert_dialog_save_backtrace_callback(GtkWidget*, GtkAssertDialo
 
     dialog = gtk_file_chooser_dialog_new ("Save assert info to file", GTK_WINDOW(dlg),
                                           GTK_FILE_CHOOSER_ACTION_SAVE,
-                                          static_cast<const char*>(wxGTK_CONV(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_CANCEL)))), GTK_RESPONSE_CANCEL,
-                                          static_cast<const char*>(wxGTK_CONV(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_SAVE)))), GTK_RESPONSE_ACCEPT,
+                                          static_cast<const char*>(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_CANCEL)).utf8_str()), GTK_RESPONSE_CANCEL,
+                                          static_cast<const char*>(wxConvertMnemonicsToGTK(wxGetStockLabel(wxID_SAVE)).utf8_str()), GTK_RESPONSE_ACCEPT,
                                           NULL);
 
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 6121109932..96e1fb2605 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -183,7 +183,7 @@ wxSize wxButtonBase::GetDefaultSize()
         GtkWidget *box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
 #if defined(__WXGTK3__) && GTK_CHECK_VERSION(3,10,0)
         wxString labelGTK = GTKConvertMnemonics(wxGetStockLabel(wxID_CANCEL));
-        GtkWidget *btn = gtk_button_new_with_mnemonic(wxGTK_CONV(labelGTK));
+        GtkWidget *btn = gtk_button_new_with_mnemonic(labelGTK.utf8_str());
 #else
         GtkWidget *btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 #endif // GTK >= 3.10 / < 3.10

From c6a750c7b832924820a10b4af242c50106d97ebf Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 31 Jan 2017 20:09:41 -0800
Subject: [PATCH 349/916] Add missing wxImageHandler::SetType

---
 interface/wx/image.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/interface/wx/image.h b/interface/wx/image.h
index eb5fabb4da..0b3c85b315 100644
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -321,6 +321,14 @@ public:
     */
     void SetName(const wxString& name);
 
+    /**
+       Sets the bitmap type for the handler.
+
+       @param mimetype
+           The bitmap type.
+    */
+    void SetType(wxBitmapType type);
+
     /**
         Retrieve the version information about the image library used by this
         handler.

From ce9dc25b5ed66d1d1d7cd1b44f76a74a45734cc4 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 2 Feb 2017 09:54:12 -0800
Subject: [PATCH 350/916] SetSelection returns an int, not a size_t

---
 interface/wx/aui/auibook.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/wx/aui/auibook.h b/interface/wx/aui/auibook.h
index 50db1b0d02..0f168ba8b8 100644
--- a/interface/wx/aui/auibook.h
+++ b/interface/wx/aui/auibook.h
@@ -361,7 +361,7 @@ public:
     /**
         Sets the page selection.  Calling this method will generate a page change event.
     */
-    size_t SetSelection(size_t new_page);
+    int SetSelection(size_t new_page);
 
     /**
         Sets the tab height. By default, the tab control height is calculated

From a6c864ae7892bc8777b3e373ca43d1187135d78f Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 27 Apr 2017 09:28:22 -0700
Subject: [PATCH 351/916] Add a missing constant and enum

---
 interface/wx/grid.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 6df1a21d05..d4d38c9513 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -5,6 +5,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+
+/// Magic constant which tells (to some functions) to automatically calculate
+/// the appropriate size
+#define wxGRID_AUTOSIZE (-1)
+
+/// Many wxGrid methods work either with columns or rows, this enum is used for
+/// the parameter indicating which one should it be
+enum wxGridDirection
+{
+    wxGRID_COLUMN,
+    wxGRID_ROW
+};
+
+
+
 /**
     @class wxGridCellRenderer
 

From 6cdf29760d06134bb5a377d95d4ac8b4d90f80f3 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 9 Feb 2018 14:33:48 -0800
Subject: [PATCH 352/916] Fix conflict in macro and class name

---
 include/wx/event.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/event.h b/include/wx/event.h
index c9d95501d8..ae14ebb8a3 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -4204,7 +4204,7 @@ typedef void (wxEvtHandler::*wxPressAndTapEventFunction)(wxPressAndTapEvent&);
     wxEVENT_HANDLER_CAST(wxTwoFingerTapEventFunction, func)
 #define wxLongPressEventHandler(func) \
     wxEVENT_HANDLER_CAST(wxLongPressEventFunction, func)
-#define wxPressAndTapEvent(func) \
+#define wxPressAndTapEventHandler(func) \
     wxEVENT_HANDLER_CAST(wxPressAndTapEventFunction, func)
 
 #endif // wxUSE_GUI

From c27f1536ba48541f8950828e434f1b67f6db9856 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 9 Feb 2018 14:34:22 -0800
Subject: [PATCH 353/916] Fix InheritsForegroundColour method name

---
 include/wx/window.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/window.h b/include/wx/window.h
index 8046223a4a..b2375b2db5 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1151,7 +1151,7 @@ public:
     {
         return m_hasFgCol;
     }
-    bool InheritsForgroundColour() const
+    bool InheritsForegroundColour() const
     {
         return m_inheritFgCol;
     }

From 5e01658cdc4a57bc974dfe0c23fe3c082e5b6efc Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 9 Feb 2018 14:40:41 -0800
Subject: [PATCH 354/916] Lots more fixes for incorrect or missing interfaces
 items.

---
 interface/wx/aui/floatpane.h              |  33 +
 interface/wx/dataview.h                   |  30 +-
 interface/wx/event.h                      |  11 +-
 interface/wx/graphics.h                   |   2 -
 interface/wx/grid.h                       |   8 +-
 interface/wx/pen.h                        |   2 -
 interface/wx/propgrid/advprops.h          | 351 ++++++++++
 interface/wx/propgrid/editors.h           |  38 +-
 interface/wx/propgrid/property.h          |  24 +-
 interface/wx/propgrid/propgridpagestate.h |  18 +-
 interface/wx/propgrid/props.h             | 812 ++++++++++++++++++++++
 interface/wx/richtext/richtextbuffer.h    |   2 +-
 interface/wx/toolbar.h                    |  13 +
 interface/wx/window.h                     |   4 +-
 14 files changed, 1275 insertions(+), 73 deletions(-)
 create mode 100644 interface/wx/aui/floatpane.h
 create mode 100644 interface/wx/propgrid/advprops.h
 create mode 100644 interface/wx/propgrid/props.h

diff --git a/interface/wx/aui/floatpane.h b/interface/wx/aui/floatpane.h
new file mode 100644
index 0000000000..6bad7019fa
--- /dev/null
+++ b/interface/wx/aui/floatpane.h
@@ -0,0 +1,33 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/aui/floatpane.h
+// Purpose:     wxaui: wx advanced user interface - docking window manager
+// Author:      Benjamin I. Williams
+// Modified by:
+// Created:     2005-05-17
+// Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
+// Licence:     wxWindows Library Licence, Version 3.1
+///////////////////////////////////////////////////////////////////////////////
+
+
+class wxAuiFloatingFrame : public wxFrame
+{
+public:
+    wxAuiFloatingFrame(wxWindow* parent,
+                   wxAuiManager* ownerMgr,
+                   const wxAuiPaneInfo& pane,
+                   wxWindowID id = wxID_ANY,
+                   long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
+                                wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT |
+                                wxCLIP_CHILDREN
+                   );
+    virtual ~wxAuiFloatingFrame();
+    void SetPaneWindow(const wxAuiPaneInfo& pane);
+    wxAuiManager* GetOwnerManager() const;
+
+protected:
+    virtual void OnMoveStart();
+    virtual void OnMoving(const wxRect& windowRect, wxDirection dir);
+    virtual void OnMoveFinished();
+};
+
+
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 81c493efa4..c2214852c7 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3667,11 +3667,32 @@ class wxDataViewEvent : public wxNotifyEvent
 {
 public:
     /**
-        Constructor. Typically used by wxWidgets internals only.
+       Default ctor, normally shouldn't be used and mostly exists only for
+       backwards compatibility.
     */
-    wxDataViewEvent(wxEventType commandType = wxEVT_NULL,
-                    int winid = 0);
+    wxDataViewEvent();
 
+    /**
+       Constructor for the events affecting columns (and possibly also items).
+    */
+    wxDataViewEvent(wxEventType evtType,
+                    wxDataViewCtrl* dvc,
+                    wxDataViewColumn* column,
+                    const wxDataViewItem& item = wxDataViewItem());
+
+    /**
+       Constructor for the events affecting only the items.
+    */
+    wxDataViewEvent(wxEventType evtType,
+                    wxDataViewCtrl* dvc,
+                    const wxDataViewItem& item);
+
+    /**
+       Copy constructor.
+    */
+    wxDataViewEvent(const wxDataViewEvent& event);
+
+    
     /**
         Returns the position of the column in the control or -1
         if no column field was set by the event emitter.
@@ -3808,7 +3829,6 @@ public:
     int GetCacheTo() const;
 
 
-
     /**
         Returns the item affected by the event.
 
@@ -3817,6 +3837,7 @@ public:
         indicating that the drop is about to happen outside of the item area.
      */
     wxDataViewItem GetItem() const;
+
     void SetItem( const wxDataViewItem &item );
     void SetPosition( int x, int y );
     void SetCache(int from, int to);
@@ -3826,6 +3847,7 @@ public:
     void SetDataBuffer( void* buf );
     int GetDragFlags() const;
     void SetDropEffect( wxDragResult effect );
+    void SetEditCancelled();
 
 };
 
diff --git a/interface/wx/event.h b/interface/wx/event.h
index 60e6f98475..7272ace498 100644
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -3721,7 +3721,7 @@ public:
 
     @since 3.1.1
 */
-class wxPanGestureEvent : class wxGestureEvent
+class wxPanGestureEvent : public wxGestureEvent
 {
 public:
     /**
@@ -3773,7 +3773,7 @@ public:
     /**
         Sets the zoom Factor.
     */
-    double SetZoomFactor() const;
+    void SetZoomFactor(double zoomFactor);
 };
 
 
@@ -4930,6 +4930,7 @@ wxEventType wxEVT_SET_FOCUS;
 wxEventType wxEVT_KILL_FOCUS;
 wxEventType wxEVT_CHILD_FOCUS;
 wxEventType wxEVT_MOUSEWHEEL;
+wxEventType wxEVT_MAGNIFY;
 wxEventType wxEVT_AUX1_DOWN;
 wxEventType wxEVT_AUX1_UP;
 wxEventType wxEVT_AUX1_DCLICK;
@@ -4963,6 +4964,12 @@ wxEventType wxEVT_SCROLLWIN_PAGEUP;
 wxEventType wxEVT_SCROLLWIN_PAGEDOWN;
 wxEventType wxEVT_SCROLLWIN_THUMBTRACK;
 wxEventType wxEVT_SCROLLWIN_THUMBRELEASE;
+wxEventType wxEVT_GESTURE_PAN;
+wxEventType wxEVT_GESTURE_ZOOM;
+wxEventType wxEVT_GESTURE_ROTATE;
+wxEventType wxEVT_TWO_FINGER_TAP;
+wxEventType wxEVT_LONG_PRESS;
+wxEventType wxEVT_PRESS_AND_TAP;
 wxEventType wxEVT_SIZE;
 wxEventType wxEVT_MOVE;
 wxEventType wxEVT_CLOSE_WINDOW;
diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h
index 84ab4dd929..792821e61d 100644
--- a/interface/wx/graphics.h
+++ b/interface/wx/graphics.h
@@ -1573,8 +1573,6 @@ public:
 
     wxGraphicsPenInfo& Style(wxPenStyle style);
 
-    wxGraphicsPenInfo& Style(wxPenStyle style);
-
     wxGraphicsPenInfo& Stipple(const wxBitmap& stipple);
 
     wxGraphicsPenInfo& Dashes(int nb_dashes, const wxDash *dash);
diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index d4d38c9513..2426c89714 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -84,8 +84,8 @@ public:
 
         @since 3.1.0
     */
-    virtual wxSize GetBestHeight(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
-                               int row, int col, int width);
+    virtual int GetBestHeight(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
+                              int row, int col, int width);
 
     /**
         Get the preferred width of the cell at the given height.
@@ -94,8 +94,8 @@ public:
 
         @since 3.1.0
     */
-    virtual wxSize GetBestWidth(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
-                               int row, int col, int height);
+    virtual int GetBestWidth(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
+                             int row, int col, int height);
 
 protected:
     /**
diff --git a/interface/wx/pen.h b/interface/wx/pen.h
index 04000e478f..13f7e65ce6 100644
--- a/interface/wx/pen.h
+++ b/interface/wx/pen.h
@@ -130,8 +130,6 @@ public:
 
     wxPenInfo& Style(wxPenStyle style);
 
-    wxPenInfo& Style(wxPenStyle style);
-
     wxPenInfo& Stipple(const wxBitmap& stipple);
 
     wxPenInfo& Dashes(int nb_dashes, const wxDash *dash);
diff --git a/interface/wx/propgrid/advprops.h b/interface/wx/propgrid/advprops.h
new file mode 100644
index 0000000000..0e6a9bcc25
--- /dev/null
+++ b/interface/wx/propgrid/advprops.h
@@ -0,0 +1,351 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        advprops.h
+// Purpose:     interfaces of wxPropertyGrid Advanced Properties (font,
+//              colour, etc.)
+// Author:      wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+
+// Web colour is currently unsupported
+#define wxPG_COLOUR_WEB_BASE        0x10000
+
+
+#define wxPG_COLOUR_CUSTOM      0xFFFFFF
+#define wxPG_COLOUR_UNSPECIFIED (wxPG_COLOUR_CUSTOM+1)
+
+/** @class wxColourPropertyValue
+
+    Because text, background and other colours tend to differ between
+    platforms, wxSystemColourProperty must be able to select between system
+    colour and, when necessary, to pick a custom one. wxSystemColourProperty
+    value makes this possible.
+*/
+class wxColourPropertyValue : public wxObject
+{
+public:
+    /** An integer value relating to the colour, and which exact
+        meaning depends on the property with which it is used.
+
+        For wxSystemColourProperty:
+
+        Any of wxSYS_COLOUR_XXX, or any web-colour ( use wxPG_TO_WEB_COLOUR
+        macro - (currently unsupported) ), or wxPG_COLOUR_CUSTOM.
+
+        For custom colour properties without values array specified:
+
+        index or wxPG_COLOUR_CUSTOM
+
+        For custom colour properties <b>with</b> values array specified:
+
+        m_arrValues[index] or wxPG_COLOUR_CUSTOM
+    */
+    wxUint32    m_type;
+
+    /** Resulting colour. Should be correct regardless of type. */
+    wxColour    m_colour;
+
+    wxColourPropertyValue();
+    wxColourPropertyValue( const wxColourPropertyValue& v );
+    wxColourPropertyValue( const wxColour& colour );
+    wxColourPropertyValue( wxUint32 type );
+    wxColourPropertyValue( wxUint32 type, const wxColour& colour );
+
+    virtual ~wxColourPropertyValue();
+
+    void Init( wxUint32 type, const wxColour& colour );
+
+    void operator=(const wxColourPropertyValue& cpv);
+};
+
+
+
+/** @class wxFontProperty
+    @ingroup classes
+    Property representing wxFont.
+*/
+class wxFontProperty : public wxPGProperty
+{
+public:
+
+    wxFontProperty(const wxString& label = wxPG_LABEL,
+                   const wxString& name = wxPG_LABEL,
+                   const wxFont& value = wxFont());
+    virtual ~wxFontProperty();
+    virtual void OnSetValue();
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool OnEvent( wxPropertyGrid* propgrid,
+                          wxWindow* primary, wxEvent& event );
+    virtual wxVariant ChildChanged( wxVariant& thisValue,
+                                    int childIndex,
+                                    wxVariant& childValue ) const;
+    virtual void RefreshChildren();
+};
+
+
+
+
+/** If set, then match from list is searched for a custom colour. */
+#define wxPG_PROP_TRANSLATE_CUSTOM      wxPG_PROP_CLASS_SPECIFIC_1
+
+
+/** @class wxSystemColourProperty
+    @ingroup classes
+    Has dropdown list of wxWidgets system colours. Value used is
+    of wxColourPropertyValue type.
+*/
+class wxSystemColourProperty : public wxEnumProperty
+{
+public:
+
+    wxSystemColourProperty( const wxString& label = wxPG_LABEL,
+                            const wxString& name = wxPG_LABEL,
+                            const wxColourPropertyValue&
+                                value = wxColourPropertyValue() );
+    virtual ~wxSystemColourProperty();
+
+    virtual void OnSetValue();
+    virtual bool IntToValue(wxVariant& variant,
+                            int number,
+                            int argFlags = 0) const;
+
+    /**
+        Override in derived class to customize how colours are printed as
+        strings.
+    */
+    virtual wxString ColourToString( const wxColour& col, int index,
+                                     int argFlags = 0 ) const;
+
+    /** Returns index of entry that triggers colour picker dialog
+        (default is last).
+    */
+    virtual int GetCustomColourIndex() const;
+
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual bool OnEvent( wxPropertyGrid* propgrid,
+                          wxWindow* primary, wxEvent& event );
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+    virtual wxSize OnMeasureImage( int item ) const;
+    virtual void OnCustomPaint( wxDC& dc,
+                                const wxRect& rect, wxPGPaintData& paintdata );
+
+    // Helper function to show the colour dialog
+    bool QueryColourFromUser( wxVariant& variant ) const;
+
+    /** Default is to use wxSystemSettings::GetColour(index). Override to use
+        custom colour tables etc.
+    */
+    virtual wxColour GetColour( int index ) const;
+
+    wxColourPropertyValue GetVal( const wxVariant* pVariant = NULL ) const;
+
+protected:
+
+    // Special constructors to be used by derived classes.
+    wxSystemColourProperty( const wxString& label, const wxString& name,
+        const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,
+        const wxColourPropertyValue& value );
+
+    wxSystemColourProperty( const wxString& label, const wxString& name,
+        const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,
+        const wxColour& value );
+
+    void Init( int type, const wxColour& colour );
+
+    // Utility functions for internal use
+    virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
+    wxVariant TranslateVal( wxColourPropertyValue& v ) const;
+    wxVariant TranslateVal( int type, const wxColour& colour ) const;
+
+    // Translates colour to a int value, return wxNOT_FOUND if no match.
+    int ColToInd( const wxColour& colour ) const;
+};
+
+
+
+class wxColourProperty : public wxSystemColourProperty
+{
+public:
+    wxColourProperty( const wxString& label = wxPG_LABEL,
+                      const wxString& name = wxPG_LABEL,
+                      const wxColour& value = *wxWHITE );
+    virtual ~wxColourProperty();
+
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual wxColour GetColour( int index ) const;
+
+protected:
+    virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
+};
+
+
+
+/** @class wxCursorProperty
+    @ingroup classes
+    Property representing wxCursor.
+*/
+class wxCursorProperty : public wxEnumProperty
+{
+public:
+    wxCursorProperty( const wxString& label= wxPG_LABEL,
+                      const wxString& name= wxPG_LABEL,
+                      int value = 0 );
+    virtual ~wxCursorProperty();
+
+    virtual wxSize OnMeasureImage( int item ) const;
+    virtual void OnCustomPaint( wxDC& dc,
+                                const wxRect& rect, wxPGPaintData& paintdata );
+};
+
+
+const wxString& wxPGGetDefaultImageWildcard();
+
+/** @class wxImageFileProperty
+    @ingroup classes
+    Property representing image file(name).
+*/
+class wxImageFileProperty : public wxFileProperty
+{
+public:
+
+    wxImageFileProperty( const wxString& label= wxPG_LABEL,
+                         const wxString& name = wxPG_LABEL,
+                         const wxString& value = wxEmptyString);
+    virtual ~wxImageFileProperty();
+
+    virtual void OnSetValue();
+
+    virtual wxSize OnMeasureImage( int item ) const;
+    virtual void OnCustomPaint( wxDC& dc,
+                                const wxRect& rect, wxPGPaintData& paintdata );
+
+protected:
+    wxBitmap*   m_pBitmap; // final thumbnail area
+    wxImage*    m_pImage; // intermediate thumbnail area
+};
+
+
+
+/** @class wxMultiChoiceProperty
+    @ingroup classes
+    Property that manages a value resulting from wxMultiChoiceDialog. Value is
+    array of strings. You can get value as array of choice values/indices by
+    calling wxMultiChoiceProperty::GetValueAsArrayInt().
+
+    <b>Supported special attributes:</b>
+    - "UserStringMode": If > 0, allow user to manually enter strings that are
+      not in the list of choices. If this value is 1, user strings are
+      preferably placed in front of valid choices. If value is 2, then those
+      strings will placed behind valid choices.
+*/
+class wxMultiChoiceProperty : public wxPGProperty
+{
+public:
+
+    wxMultiChoiceProperty( const wxString& label,
+                           const wxString& name,
+                           const wxArrayString& strings,
+                           const wxArrayString& value );
+    wxMultiChoiceProperty( const wxString& label,
+                           const wxString& name,
+                           const wxPGChoices& choices,
+                           const wxArrayString& value = wxArrayString() );
+
+    wxMultiChoiceProperty( const wxString& label = wxPG_LABEL,
+                           const wxString& name = wxPG_LABEL,
+                           const wxArrayString& value = wxArrayString() );
+
+    virtual ~wxMultiChoiceProperty();
+
+    virtual void OnSetValue();
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue(wxVariant& variant,
+                               const wxString& text,
+                               int argFlags = 0) const;
+    virtual bool OnEvent( wxPropertyGrid* propgrid,
+                          wxWindow* primary, wxEvent& event );
+
+    wxArrayInt GetValueAsArrayInt() const;
+
+protected:
+
+    void GenerateValueAsString( wxVariant& value, wxString* target ) const;
+
+    // Returns translation of values into string indices.
+    wxArrayInt GetValueAsIndices() const;
+
+    wxArrayString       m_valueAsStrings;  // Value as array of strings
+
+    // Cache displayed text since generating it is relatively complicated.
+    wxString            m_display;
+};
+
+
+
+/** @class wxDateProperty
+    @ingroup classes
+    Property representing wxDateTime.
+
+    <b>Supported special attributes:</b>
+    - "DateFormat": Determines displayed date format.
+    - "PickerStyle": Determines window style used with wxDatePickerCtrl.
+       Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE
+       enables additional support for unspecified property value.
+*/
+class wxDateProperty : public wxPGProperty
+{
+public:
+
+    wxDateProperty( const wxString& label = wxPG_LABEL,
+                    const wxString& name = wxPG_LABEL,
+                    const wxDateTime& value = wxDateTime() );
+    virtual ~wxDateProperty();
+
+    virtual void OnSetValue();
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue(wxVariant& variant,
+                               const wxString& text,
+                               int argFlags = 0) const;
+
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+
+    void SetFormat( const wxString& format );
+    const wxString& GetFormat() const;
+
+    void SetDateValue( const wxDateTime& dt );
+    wxDateTime GetDateValue() const;
+
+    long GetDatePickerStyle() const;
+
+protected:
+    wxString        m_format;
+    long            m_dpStyle;  // DatePicker style
+
+    static wxString ms_defaultDateFormat;
+    static wxString DetermineDefaultDateFormat( bool showCentury );
+};
+
+
+
+class wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
+{
+public:
+    virtual ~wxPGSpinCtrlEditor();
+
+    wxString GetName() const;
+    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
+                                          wxPGProperty* property,
+                                          const wxPoint& pos,
+                                          const wxSize& size) const;
+    virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
+        wxWindow* wnd, wxEvent& event ) const;
+};
+
+
+extern wxPGEditor* wxPGEditor_SpinCtrl;
+extern wxPGEditor* wxPGEditor_DatePickerCtrl;
diff --git a/interface/wx/propgrid/editors.h b/interface/wx/propgrid/editors.h
index 32d8f83748..6fe9c15544 100644
--- a/interface/wx/propgrid/editors.h
+++ b/interface/wx/propgrid/editors.h
@@ -578,35 +578,9 @@ public:
     wxSize GetPrimarySize() const;
 };
 
-/** @class wxPGEditorDialogAdapter
-
-    Derive a class from this to adapt an existing editor dialog or function to
-    be used when editor button of a property is pushed.
-
-    You only need to derive class and implement DoShowDialog() to create and
-    show the dialog, and finally submit the value returned by the dialog
-    via SetValue().
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class wxPGEditorDialogAdapter : public wxObject
-{
-public:
-    wxPGEditorDialogAdapter();
-
-    virtual ~wxPGEditorDialogAdapter();
-
-    bool ShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property );
-
-    virtual bool DoShowDialog( wxPropertyGrid* propGrid,
-                               wxPGProperty* property ) = 0;
-
-    void SetValue( wxVariant value );
-
-    /**
-        This method is typically only used if deriving class from existing
-        adapter with value conversion purposes.
-    */
-    wxVariant& GetValue();
-};
+extern wxPGEditor* wxPGEditor_TextCtrl;
+extern wxPGEditor* wxPGEditor_Choice;
+extern wxPGEditor* wxPGEditor_ComboBox;
+extern wxPGEditor* wxPGEditor_TextCtrlAndButton;
+extern wxPGEditor* wxPGEditor_CheckBox;
+extern wxPGEditor* wxPGEditor_ChoiceAndButton;
diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 8f56e84036..e12ad51e3f 100644
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -2190,7 +2190,7 @@ public:
 
     /** Paints property category selection rectangle.
     */
-    virtual void DrawCaptionSelectionRect(wxWindow *win, wxDC& dc,
+    virtual void DrawCaptionSelectionRect(wxDC& dc,
                                           int x, int y, int w, int h) const;
 
     /** Utility to draw vertically centered text.
@@ -2706,28 +2706,6 @@ protected:
 
 // -----------------------------------------------------------------------
 
-/** @class wxPGChoiceEntry
-
-    Data of a single wxPGChoices choice.
-*/
-class wxPGChoiceEntry : public wxPGCell
-{
-public:
-    wxPGChoiceEntry();
-    wxPGChoiceEntry(const wxPGChoiceEntry& other);
-    wxPGChoiceEntry( const wxString& label,
-                     int value = wxPG_INVALID_VALUE );
-
-    virtual ~wxPGChoiceEntry();
-
-    void SetValue( int value );
-    int GetValue() const;
-
-    wxPGChoiceEntry& operator=( const wxPGChoiceEntry& other );
-};
-
-// -----------------------------------------------------------------------
-
 /** @class wxPGRootProperty
 
     Root parent property.
diff --git a/interface/wx/propgrid/propgridpagestate.h b/interface/wx/propgrid/propgridpagestate.h
index 328af6c0c6..1a392b7659 100644
--- a/interface/wx/propgrid/propgridpagestate.h
+++ b/interface/wx/propgrid/propgridpagestate.h
@@ -225,7 +225,14 @@ public:
 class wxPropertyGridIterator : public wxPropertyGridIteratorBase
 {
 public:
-};
+    wxPropertyGridIterator();
+    wxPropertyGridIterator( wxPropertyGridPageState* state,
+                            int flags = wxPG_ITERATE_DEFAULT, 
+                            wxPGProperty* property = NULL, int dir = 1 );
+    wxPropertyGridIterator( wxPropertyGridPageState* state,
+                            int flags, int startPos, int dir = 0 );
+    wxPropertyGridIterator( const wxPropertyGridIterator& it );
+    ~wxPropertyGridIterator();};
 
 /**
     Const version of wxPropertyGridIterator.
@@ -242,6 +249,15 @@ public:
         Additional assignment operator.
     */
     const wxPropertyGridConstIterator& operator=( const wxPropertyGridIterator& it );
+
+    wxPropertyGridConstIterator();
+    wxPropertyGridConstIterator( const wxPropertyGridPageState* state,
+                                 int flags = wxPG_ITERATE_DEFAULT, 
+                                 const wxPGProperty* property = NULL, int dir = 1 );
+    wxPropertyGridConstIterator( wxPropertyGridPageState* state,
+                                 int flags, int startPos, int dir = 0 );
+    wxPropertyGridConstIterator( const wxPropertyGridConstIterator& it );
+    ~wxPropertyGridConstIterator();
 };
 
 /** @}
diff --git a/interface/wx/propgrid/props.h b/interface/wx/propgrid/props.h
new file mode 100644
index 0000000000..564916c829
--- /dev/null
+++ b/interface/wx/propgrid/props.h
@@ -0,0 +1,812 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        props.h
+// Purpose:     interface of some wxPGProperty subclasses
+// Author:      wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+/** @class wxPGInDialogValidator
+    @ingroup classes
+    Creates and manages a temporary wxTextCtrl for validation purposes.
+    Uses wxPropertyGrid's current editor, if available.
+*/
+class wxPGInDialogValidator
+{
+public:
+    wxPGInDialogValidator();
+    ~wxPGInDialogValidator();
+
+    bool DoValidate( wxPropertyGrid* propGrid,
+                     wxValidator* validator,
+                     const wxString& value );
+};
+
+
+// -----------------------------------------------------------------------
+// Property classes
+// -----------------------------------------------------------------------
+
+#define wxPG_PROP_PASSWORD  wxPG_PROP_CLASS_SPECIFIC_2
+
+/** @class wxStringProperty
+    @ingroup classes
+    Basic property with string value.
+
+    <b>Supported special attributes:</b>
+    - "Password": set to 1 in order to enable wxTE_PASSWORD on the editor.
+
+    @remarks
+    - If value "<composed>" is set, then actual value is formed (or composed)
+      from values of child properties.
+*/
+class wxStringProperty : public wxPGProperty
+{
+public:
+    wxStringProperty( const wxString& label = wxPG_LABEL,
+                      const wxString& name = wxPG_LABEL,
+                      const wxString& value = wxEmptyString );
+    virtual ~wxStringProperty();
+
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+
+    /** This is updated so "<composed>" special value can be handled.
+    */
+    virtual void OnSetValue();
+};
+
+
+/** Constants used with NumericValidation<>().
+*/
+enum wxPGNumericValidationConstants
+{
+    /** Instead of modifying the value, show an error message.
+    */
+    wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE      = 0,
+
+    /** Modify value, but stick with the limitations.
+    */
+    wxPG_PROPERTY_VALIDATION_SATURATE           = 1,
+
+    /** Modify value, wrap around on overflow.
+    */
+    wxPG_PROPERTY_VALIDATION_WRAP               = 2
+};
+
+
+
+/**
+    A more comprehensive numeric validator class.
+*/
+class wxNumericPropertyValidator : public wxTextValidator
+{
+public:
+    enum NumericType
+    {
+        Signed = 0,
+        Unsigned,
+        Float
+    };
+
+    wxNumericPropertyValidator( NumericType numericType, int base = 10 );
+    virtual ~wxNumericPropertyValidator() { }
+    virtual bool Validate(wxWindow* parent);
+};
+
+
+
+/** @class wxIntProperty
+    @ingroup classes
+    Basic property with integer value.
+
+    Seamlessly supports 64-bit integer (wxLongLong) on overflow.
+
+    <b>Example how to use seamless 64-bit integer support</b>
+
+      Getting value:
+
+      @code
+          wxLongLong_t value = pg->GetPropertyValueAsLongLong();
+      @endcode
+
+         or
+
+      @code
+          wxLongLong_t value;
+          wxVariant variant = property->GetValue();
+          if ( variant.GetType() == "wxLongLong" )
+              value = wxLongLongFromVariant(variant);
+          else
+              value = variant.GetLong();
+      @endcode
+
+      Setting value:
+
+       @code
+          pg->SetPropertyValue(longLongVal);
+      @endcode
+
+         or
+
+      @code
+          property->SetValue(WXVARIANT(longLongVal));
+      @endcode
+
+
+    <b>Supported special attributes:</b>
+    - "Min", "Max": Specify acceptable value range.
+*/
+class wxIntProperty : public wxPGProperty
+{
+public:
+    wxIntProperty( const wxString& label = wxPG_LABEL,
+                   const wxString& name = wxPG_LABEL,
+                   long value = 0 );
+    virtual ~wxIntProperty();
+
+    wxIntProperty( const wxString& label,
+                   const wxString& name,
+                   const wxLongLong& value );
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual bool ValidateValue( wxVariant& value,
+                                wxPGValidationInfo& validationInfo ) const;
+    virtual bool IntToValue( wxVariant& variant,
+                             int number,
+                             int argFlags = 0 ) const;
+    static wxValidator* GetClassValidator();
+    virtual wxValidator* DoGetValidator() const;
+
+    /** Validation helper.
+    */
+    static bool DoValidation( const wxPGProperty* property,
+                              wxLongLong_t& value,
+                              wxPGValidationInfo* pValidationInfo,
+                              int mode =
+                                wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
+};
+
+
+/** @class wxUIntProperty
+    @ingroup classes
+    Basic property with unsigned integer value.
+    Seamlessly supports 64-bit integer (wxULongLong) on overflow.
+
+    <b>Supported special attributes:</b>
+    - "Min", "Max": Specify acceptable value range.
+    - "Base": Define base. Valid constants are wxPG_BASE_OCT, wxPG_BASE_DEC,
+    wxPG_BASE_HEX and wxPG_BASE_HEXL (lowercase characters). Arbitrary bases
+    are <b>not</b> supported.
+    - "Prefix": Possible values are wxPG_PREFIX_NONE, wxPG_PREFIX_0x, and
+    wxPG_PREFIX_DOLLAR_SIGN. Only wxPG_PREFIX_NONE works with Decimal and Octal
+    numbers.
+
+    @remarks
+    - For example how to use seamless 64-bit integer support, see wxIntProperty
+    documentation (just use wxULongLong instead of wxLongLong).
+*/
+class wxUIntProperty : public wxPGProperty
+{
+public:
+    wxUIntProperty( const wxString& label = wxPG_LABEL,
+                    const wxString& name = wxPG_LABEL,
+                    unsigned long value = 0 );
+    virtual ~wxUIntProperty();
+    wxUIntProperty( const wxString& label,
+                    const wxString& name,
+                    const wxULongLong& value );
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+    virtual bool ValidateValue( wxVariant& value,
+                                wxPGValidationInfo& validationInfo ) const;
+    virtual wxValidator* DoGetValidator () const;
+    virtual bool IntToValue( wxVariant& variant,
+                             int number,
+                             int argFlags = 0 ) const;
+protected:
+    wxByte      m_base;
+    wxByte      m_realBase; // translated to 8,16,etc.
+    wxByte      m_prefix;
+};
+
+
+/** @class wxFloatProperty
+    @ingroup classes
+    Basic property with double-precision floating point value.
+
+    <b>Supported special attributes:</b>
+    - "Precision": Sets the (max) precision used when floating point value is
+    rendered as text. The default -1 means infinite precision.
+*/
+class wxFloatProperty : public wxPGProperty
+{
+public:
+    wxFloatProperty( const wxString& label = wxPG_LABEL,
+                     const wxString& name = wxPG_LABEL,
+                     double value = 0.0 );
+    virtual ~wxFloatProperty();
+
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+    virtual wxVariant DoGetAttribute( const wxString& name ) const;
+    virtual bool ValidateValue( wxVariant& value,
+                                wxPGValidationInfo& validationInfo ) const;
+
+    /** Validation helper.
+    */
+    static bool DoValidation( const wxPGProperty* property,
+                              double& value,
+                              wxPGValidationInfo* pValidationInfo,
+                              int mode =
+                                 wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
+    static wxValidator* GetClassValidator();
+    virtual wxValidator* DoGetValidator () const;
+
+protected:
+    int m_precision;
+};
+
+
+
+/** @class wxBoolProperty
+    @ingroup classes
+    Basic property with boolean value.
+
+    <b>Supported special attributes:</b>
+    - "UseCheckbox": Set to 1 to use check box editor instead of combo box.
+    - "UseDClickCycling": Set to 1 to cycle combo box instead showing the list.
+*/
+class wxBoolProperty : public wxPGProperty
+{
+public:
+    wxBoolProperty( const wxString& label = wxPG_LABEL,
+                    const wxString& name = wxPG_LABEL,
+                    bool value = false );
+    virtual ~wxBoolProperty();
+
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual bool IntToValue( wxVariant& variant,
+                             int number, int argFlags = 0 ) const;
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+};
+
+
+
+// If set, then selection of choices is static and should not be
+// changed (i.e. returns NULL in GetPropertyChoices).
+#define wxPG_PROP_STATIC_CHOICES    wxPG_PROP_CLASS_SPECIFIC_1
+
+/** @class wxEnumProperty
+    @ingroup classes
+    You can derive custom properties with choices from this class. See
+    wxBaseEnumProperty for remarks.
+
+    @remarks
+    - Updating private index is important. You can do this either by calling
+    SetIndex() in IntToValue, and then letting wxBaseEnumProperty::OnSetValue
+    be called (by not implementing it, or by calling super class function in
+    it) -OR- you can just call SetIndex in OnSetValue.
+*/
+class wxEnumProperty : public wxPGProperty
+{
+public:
+    wxEnumProperty( const wxString& label = wxPG_LABEL,
+                    const wxString& name = wxPG_LABEL,
+                    const wxChar* const* labels = NULL,
+                    const long* values = NULL,
+                    int value = 0 );
+    
+    wxEnumProperty( const wxString& label,
+                    const wxString& name,
+                    wxPGChoices& choices,
+                    int value = 0 );
+
+    // Special constructor for caching choices (used by derived class)
+    wxEnumProperty( const wxString& label,
+                    const wxString& name,
+                    const wxChar* const* labels,
+                    const long* values,
+                    wxPGChoices* choicesCache,
+                    int value = 0 );
+
+    wxEnumProperty( const wxString& label,
+                    const wxString& name,
+                    const wxArrayString& labels,
+                    const wxArrayInt& values = wxArrayInt(),
+                    int value = 0 );
+
+    virtual ~wxEnumProperty();
+
+    size_t GetItemCount() const;
+
+    virtual void OnSetValue();
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual bool ValidateValue( wxVariant& value,
+                                wxPGValidationInfo& validationInfo ) const;
+
+    // If wxPG_FULL_VALUE is not set in flags, then the value is interpreted
+    // as index to choices list. Otherwise, it is actual value.
+    virtual bool IntToValue( wxVariant& variant,
+                             int number,
+                             int argFlags = 0 ) const;
+
+    //
+    // Additional virtuals
+
+    // This must be overridden to have non-index based value
+    virtual int GetIndexForValue( int value ) const;
+
+    // GetChoiceSelection needs to overridden since m_index is
+    // the true index, and various property classes derived from
+    // this take advantage of it.
+    virtual int GetChoiceSelection() const;
+
+    virtual void OnValidationFailure( wxVariant& pendingValue );
+
+protected:
+
+    int GetIndex() const;
+    void SetIndex( int index );
+
+    bool ValueFromString_( wxVariant& value,
+                           const wxString& text,
+                           int argFlags ) const;
+    bool ValueFromInt_( wxVariant& value, int intVal, int argFlags ) const;
+
+    static void ResetNextIndex();
+
+};
+
+
+
+/** @class wxEditEnumProperty
+    @ingroup classes
+    wxEnumProperty with wxString value and writable combo box editor.
+
+    @remarks
+    Uses int value, similar to wxEnumProperty, unless text entered by user is
+    is not in choices (in which case string value is used).
+*/
+class wxEditEnumProperty : public wxEnumProperty
+{
+public:
+
+    wxEditEnumProperty( const wxString& label,
+                        const wxString& name,
+                        const wxChar* const* labels,
+                        const long* values,
+                        const wxString& value );
+
+    wxEditEnumProperty( const wxString& label = wxPG_LABEL,
+                        const wxString& name = wxPG_LABEL,
+                        const wxArrayString& labels = wxArrayString(),
+                        const wxArrayInt& values = wxArrayInt(),
+                        const wxString& value = wxEmptyString );
+
+    wxEditEnumProperty( const wxString& label,
+                        const wxString& name,
+                        wxPGChoices& choices,
+                        const wxString& value = wxEmptyString );
+
+    // Special constructor for caching choices (used by derived class)
+    wxEditEnumProperty( const wxString& label,
+                        const wxString& name,
+                        const wxChar* const* labels,
+                        const long* values,
+                        wxPGChoices* choicesCache,
+                        const wxString& value );
+
+    virtual ~wxEditEnumProperty();
+
+};
+
+
+
+/** @class wxFlagsProperty
+    @ingroup classes
+    Represents a bit set that fits in a long integer. wxBoolProperty
+    sub-properties are created for editing individual bits. Textctrl is created
+    to manually edit the flags as a text; a continuous sequence of spaces,
+    commas and semicolons is considered as a flag id separator.
+    <b>Note:</b> When changing "choices" (ie. flag labels) of wxFlagsProperty,
+    you will need to use SetPropertyChoices - otherwise they will not get
+    updated properly.
+*/
+class wxFlagsProperty : public wxPGProperty
+{
+public:
+
+    wxFlagsProperty( const wxString& label,
+                     const wxString& name,
+                     const wxChar* const* labels,
+                     const long* values = NULL,
+                     long value = 0 );
+
+    wxFlagsProperty( const wxString& label,
+                     const wxString& name,
+                     wxPGChoices& choices,
+                     long value = 0 );
+
+    wxFlagsProperty( const wxString& label = wxPG_LABEL,
+                     const wxString& name = wxPG_LABEL,
+                     const wxArrayString& labels = wxArrayString(),
+                     const wxArrayInt& values = wxArrayInt(),
+                     int value = 0 );
+
+    virtual ~wxFlagsProperty ();
+
+    virtual void OnSetValue();
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int flags ) const;
+    virtual wxVariant ChildChanged( wxVariant& thisValue,
+                                    int childIndex,
+                                    wxVariant& childValue ) const;
+    virtual void RefreshChildren();
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+
+    // GetChoiceSelection needs to overridden since m_choices is
+    // used and value is integer, but it is not index.
+    virtual int GetChoiceSelection() const;
+
+    // helpers
+    size_t GetItemCount() const;
+    const wxString& GetLabel( size_t ind ) const;
+
+protected:
+    // Used to detect if choices have been changed
+    wxPGChoicesData*        m_oldChoicesData;
+
+    // Needed to properly mark changed sub-properties
+    long                    m_oldValue;
+
+    // Converts string id to a relevant bit.
+    long IdToBit( const wxString& id ) const;
+
+    // Creates children and sets value.
+    void Init();
+};
+
+
+
+/** @class wxPGFileDialogAdapter
+    @ingroup classes
+*/
+class wxPGFileDialogAdapter : public wxPGEditorDialogAdapter
+{
+public:
+    virtual bool DoShowDialog( wxPropertyGrid* propGrid,
+                               wxPGProperty* property );
+};
+
+
+
+// Indicates first bit useable by derived properties.
+#define wxPG_PROP_SHOW_FULL_FILENAME  wxPG_PROP_CLASS_SPECIFIC_1
+
+/** @class wxFileProperty
+    @ingroup classes
+    Like wxLongStringProperty, but the button triggers file selector instead.
+
+    <b>Supported special attributes:</b>
+    - "Wildcard": Sets wildcard (see wxFileDialog for format details), "All
+    files..." is default.
+    - "ShowFullPath": Default 1. When 0, only the file name is shown (i.e. drive
+      and directory are hidden).
+    - "ShowRelativePath": If set, then the filename is shown relative to the
+    given path string.
+    - "InitialPath": Sets the initial path of where to look for files.
+    - "DialogTitle": Sets a specific title for the dir dialog.
+*/
+class wxFileProperty : public wxPGProperty
+{
+public:
+
+    wxFileProperty( const wxString& label = wxPG_LABEL,
+                    const wxString& name = wxPG_LABEL,
+                    const wxString& value = wxEmptyString );
+    virtual ~wxFileProperty ();
+
+    virtual void OnSetValue();
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual wxPGEditorDialogAdapter* GetEditorDialog() const;
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+
+    static wxValidator* GetClassValidator();
+    virtual wxValidator* DoGetValidator() const;
+
+    /**
+        Returns filename to file represented by current value.
+    */
+    wxFileName GetFileName() const;
+
+protected:
+    wxString    m_wildcard;
+    wxString    m_basePath; // If set, then show path relative to it
+    wxString    m_initialPath; // If set, start the file dialog here
+    wxString    m_dlgTitle; // If set, used as title for file dialog
+    int         m_indFilter; // index to the selected filter
+};
+
+
+
+#define wxPG_PROP_NO_ESCAPE     wxPG_PROP_CLASS_SPECIFIC_1
+
+/** @class wxPGLongStringDialogAdapter
+    @ingroup classes
+*/
+class wxPGLongStringDialogAdapter : public wxPGEditorDialogAdapter
+{
+public:
+    virtual bool DoShowDialog( wxPropertyGrid* propGrid,
+                               wxPGProperty* property );
+};
+
+
+/** @class wxLongStringProperty
+    @ingroup classes
+    Like wxStringProperty, but has a button that triggers a small text
+    editor dialog.
+*/
+class wxLongStringProperty : public wxPGProperty
+{
+public:
+
+    wxLongStringProperty( const wxString& label = wxPG_LABEL,
+                          const wxString& name = wxPG_LABEL,
+                          const wxString& value = wxEmptyString );
+    virtual ~wxLongStringProperty();
+
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual bool OnEvent( wxPropertyGrid* propgrid,
+                          wxWindow* primary, wxEvent& event );
+
+    // Shows string editor dialog. Value to be edited should be read from
+    // value, and if dialog is not cancelled, it should be stored back and true
+    // should be returned if that was the case.
+    virtual bool OnButtonClick( wxPropertyGrid* propgrid, wxString& value );
+
+    static bool DisplayEditorDialog( wxPGProperty* prop,
+                                     wxPropertyGrid* propGrid,
+                                     wxString& value );
+};
+
+
+
+
+/** @class wxDirProperty
+    @ingroup classes
+    Like wxLongStringProperty, but the button triggers dir selector instead.
+
+    <b>Supported special attributes:</b>
+    - "DialogMessage": Sets specific message in the dir selector.
+*/
+class wxDirProperty : public wxLongStringProperty
+{
+public:
+    wxDirProperty( const wxString& name = wxPG_LABEL,
+                   const wxString& label = wxPG_LABEL,
+                   const wxString& value = wxEmptyString );
+    virtual ~wxDirProperty();
+
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+    virtual wxValidator* DoGetValidator() const;
+
+    virtual bool OnButtonClick ( wxPropertyGrid* propGrid, wxString& value );
+
+protected:
+    wxString    m_dlgMessage;
+};
+
+
+// wxBoolProperty specific flags
+#define wxPG_PROP_USE_CHECKBOX      wxPG_PROP_CLASS_SPECIFIC_1
+// DCC = Double Click Cycles
+#define wxPG_PROP_USE_DCC           wxPG_PROP_CLASS_SPECIFIC_2
+
+
+
+/** @class wxArrayStringProperty
+    @ingroup classes
+    Property that manages a list of strings.
+*/
+class wxArrayStringProperty : public wxPGProperty
+{
+public:
+    wxArrayStringProperty( const wxString& label = wxPG_LABEL,
+                           const wxString& name = wxPG_LABEL,
+                           const wxArrayString& value = wxArrayString() );
+    virtual ~wxArrayStringProperty();
+
+    virtual void OnSetValue();
+    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
+    virtual bool StringToValue( wxVariant& variant,
+                                const wxString& text,
+                                int argFlags = 0 ) const;
+    virtual bool OnEvent( wxPropertyGrid* propgrid,
+                          wxWindow* primary, wxEvent& event );
+    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
+
+    // Implement in derived class for custom array-to-string conversion.
+    virtual void ConvertArrayToString(const wxArrayString& arr,
+                                      wxString* pString,
+                                      const wxUniChar& delimiter) const;
+
+    // Shows string editor dialog. Value to be edited should be read from
+    // value, and if dialog is not cancelled, it should be stored back and true
+    // should be returned if that was the case.
+    virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value );
+
+    // Helper.
+    virtual bool OnButtonClick( wxPropertyGrid* propgrid,
+                                wxWindow* primary,
+                                const wxChar* cbt );
+
+    // Creates wxPGArrayEditorDialog for string editing. Called in OnButtonClick.
+    virtual wxPGArrayEditorDialog* CreateEditorDialog();
+
+    enum ConversionFlags
+    {
+        Escape          = 0x01,
+        QuoteStrings    = 0x02
+    };
+
+    /**
+        Generates contents for string dst based on the contents of
+        wxArrayString src.
+    */
+    static void ArrayStringToString( wxString& dst, const wxArrayString& src,
+                                     wxUniChar delimiter, int flags );
+
+protected:
+    // Previously this was to be implemented in derived class for array-to-
+    // string conversion. Now you should implement ConvertValueToString()
+    // instead.
+    virtual void GenerateValueAsString();
+
+    wxString        m_display; // Cache for displayed text.
+    wxUniChar       m_delimiter;
+};
+
+
+// -----------------------------------------------------------------------
+// wxPGArrayEditorDialog
+// -----------------------------------------------------------------------
+
+#define wxAEDIALOG_STYLE \
+    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxOK | wxCANCEL | wxCENTRE)
+
+class wxPGArrayEditorDialog : public wxDialog
+{
+public:
+    wxPGArrayEditorDialog();
+    virtual ~wxPGArrayEditorDialog();
+
+    void Init();
+
+    wxPGArrayEditorDialog( wxWindow *parent,
+                         const wxString& message,
+                         const wxString& caption,
+                         long style = wxAEDIALOG_STYLE,
+                         const wxPoint& pos = wxDefaultPosition,
+                         const wxSize& sz = wxDefaultSize );
+
+    bool Create( wxWindow *parent,
+                 const wxString& message,
+                 const wxString& caption,
+                 long style = wxAEDIALOG_STYLE,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& sz = wxDefaultSize );
+
+    void EnableCustomNewAction();
+    
+    /** Set value modified by dialog.
+    */
+    virtual void SetDialogValue( const wxVariant& value );
+
+    /** Return value modified by dialog.
+    */
+    virtual wxVariant GetDialogValue() const;
+
+    /** Override to return wxValidator to be used with the wxTextCtrl
+        in dialog. Note that the validator is used in the standard
+        wx way, ie. it immediately prevents user from entering invalid
+        input.
+
+        @remarks
+        Dialog frees the validator.
+    */
+    virtual wxValidator* GetTextCtrlValidator() const;
+
+    // Returns true if array was actually modified
+    bool IsModified() const;
+
+    // wxEditableListBox utilities
+    int GetSelection() const;
+
+protected:
+    wxEditableListBox*  m_elb;
+
+    // These are used for focus repair
+    wxWindow*           m_elbSubPanel;
+    wxWindow*           m_lastFocused;
+
+    // A new item, edited by user, is pending at this index.
+    // It will be committed once list ctrl item editing is done.
+    int             m_itemPendingAtIndex;
+
+    bool            m_modified;
+    bool            m_hasCustomNewAction;
+
+    // These must be overridden - must return true on success.
+    virtual wxString ArrayGet( size_t index ) = 0;
+    virtual size_t ArrayGetCount() = 0;
+    virtual bool ArrayInsert( const wxString& str, int index ) = 0;
+    virtual bool ArraySet( size_t index, const wxString& str ) = 0;
+    virtual void ArrayRemoveAt( int index ) = 0;
+    virtual void ArraySwap( size_t first, size_t second ) = 0;
+
+    virtual bool OnCustomNewAction(wxString* resString);
+};
+
+
+// -----------------------------------------------------------------------
+// wxPGArrayStringEditorDialog
+// -----------------------------------------------------------------------
+
+class wxPGArrayStringEditorDialog : public wxPGArrayEditorDialog
+{
+public:
+    wxPGArrayStringEditorDialog();
+    virtual ~wxPGArrayStringEditorDialog() { }
+
+    void Init();
+
+    virtual void SetDialogValue( const wxVariant& value );
+    virtual wxVariant GetDialogValue() const;
+
+    void SetCustomButton( const wxString& custBtText,
+                          wxArrayStringProperty* pcc );
+
+    virtual bool OnCustomNewAction(wxString* resString);
+
+protected:
+    wxArrayString   m_array;
+
+    wxArrayStringProperty*     m_pCallingClass;
+
+    virtual wxString ArrayGet( size_t index );
+    virtual size_t ArrayGetCount();
+    virtual bool ArrayInsert( const wxString& str, int index );
+    virtual bool ArraySet( size_t index, const wxString& str );
+    virtual void ArrayRemoveAt( int index );
+    virtual void ArraySwap( size_t first, size_t second );
+};
+
diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h
index 833b8400f8..b86c9bd32f 100644
--- a/interface/wx/richtext/richtextbuffer.h
+++ b/interface/wx/richtext/richtextbuffer.h
@@ -4886,7 +4886,7 @@ public:
     /**
         Do the loading and scaling
     */
-    virtual bool LoadAndScaleImageCache(wxImage& image, const wxSize& sz, bool delayLoading, bool& changed);
+    virtual bool LoadAndScaleImageCache(wxImage& image, const wxSize& sz, wxRichTextDrawingContext& context, bool& changed);
 
     /**
         Gets the image state.
diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index da12c697a0..e3a58f53e8 100644
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -106,6 +106,7 @@ public:
     bool IsStretchableSpace() const;
     int GetStyle() const;
     wxItemKind GetKind() const;
+    void MakeStretchable();
 
     bool IsEnabled() const;
     bool IsToggled() const;
@@ -122,9 +123,21 @@ public:
 
     wxObject *GetClientData() const;
 
+    virtual bool Enable(bool enable);
+    virtual bool Toggle(bool toggle);
+    virtual bool SetToggle(bool toggle);
+    virtual bool SetShortHelp(const wxString& help);
+    virtual bool SetLongHelp(const wxString& help);
+    void Toggle();
+    virtual void SetNormalBitmap(const wxBitmap& bmp);
+    virtual void SetDisabledBitmap(const wxBitmap& bmp);
+    virtual void SetLabel(const wxString& label);
+    void SetClientData(wxObject *clientData);
+    
     virtual void Detach();
     virtual void Attach(wxToolBarBase *tbar);
 
+    virtual void SetDropdownMenu(wxMenu *menu);
     wxMenu *GetDropdownMenu() const;
 };
 
diff --git a/interface/wx/window.h b/interface/wx/window.h
index 1ddd6c345e..6cdd4974c8 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -1044,7 +1044,7 @@ public:
     static wxPoint FromDIP(const wxPoint& pt, const wxWindow* w);
 
     /// @overload
-    static wxSize FromDIP(int d, const wxWindow* w);
+    static int FromDIP(int d, const wxWindow* w);
 
 
     /**
@@ -1111,7 +1111,7 @@ public:
     static wxPoint ToDIP(const wxPoint& pt, const wxWindow* w);
 
     /// @overload
-    static wxSize ToDIP(int d, const wxWindow* w);
+    static int ToDIP(int d, const wxWindow* w);
 
     /**
         This functions returns the best acceptable minimal size for the window.

From bd1e13df4288911391f22c47a7ecb05cb5058877 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sat, 10 Feb 2018 15:13:01 -0800
Subject: [PATCH 355/916] Minor cleanup and changes from Code Review comments.

---
 interface/wx/aui/floatpane.h |  3 ---
 interface/wx/dataview.h      |  2 --
 interface/wx/grid.h          |  9 ---------
 interface/wx/toolbar.h       | 24 ++++++++++++------------
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/interface/wx/aui/floatpane.h b/interface/wx/aui/floatpane.h
index 6bad7019fa..04a04a649b 100644
--- a/interface/wx/aui/floatpane.h
+++ b/interface/wx/aui/floatpane.h
@@ -2,7 +2,6 @@
 // Name:        wx/aui/floatpane.h
 // Purpose:     wxaui: wx advanced user interface - docking window manager
 // Author:      Benjamin I. Williams
-// Modified by:
 // Created:     2005-05-17
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
@@ -29,5 +28,3 @@ protected:
     virtual void OnMoving(const wxRect& windowRect, wxDirection dir);
     virtual void OnMoveFinished();
 };
-
-
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index c2214852c7..9ef314b359 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3847,8 +3847,6 @@ public:
     void SetDataBuffer( void* buf );
     int GetDragFlags() const;
     void SetDropEffect( wxDragResult effect );
-    void SetEditCancelled();
-
 };
 
 
diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 2426c89714..39820c5716 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -10,15 +10,6 @@
 /// the appropriate size
 #define wxGRID_AUTOSIZE (-1)
 
-/// Many wxGrid methods work either with columns or rows, this enum is used for
-/// the parameter indicating which one should it be
-enum wxGridDirection
-{
-    wxGRID_COLUMN,
-    wxGRID_ROW
-};
-
-
 
 /**
     @class wxGridCellRenderer
diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index e3a58f53e8..783531ab65 100644
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -123,21 +123,21 @@ public:
 
     wxObject *GetClientData() const;
 
-    virtual bool Enable(bool enable);
-    virtual bool Toggle(bool toggle);
-    virtual bool SetToggle(bool toggle);
-    virtual bool SetShortHelp(const wxString& help);
-    virtual bool SetLongHelp(const wxString& help);
+    bool Enable(bool enable);
+    bool Toggle(bool toggle);
+    bool SetToggle(bool toggle);
+    bool SetShortHelp(const wxString& help);
+    bool SetLongHelp(const wxString& help);
     void Toggle();
-    virtual void SetNormalBitmap(const wxBitmap& bmp);
-    virtual void SetDisabledBitmap(const wxBitmap& bmp);
-    virtual void SetLabel(const wxString& label);
+    void SetNormalBitmap(const wxBitmap& bmp);
+    void SetDisabledBitmap(const wxBitmap& bmp);
+    void SetLabel(const wxString& label);
     void SetClientData(wxObject *clientData);
-    
-    virtual void Detach();
-    virtual void Attach(wxToolBarBase *tbar);
 
-    virtual void SetDropdownMenu(wxMenu *menu);
+    void Detach();
+    void Attach(wxToolBarBase *tbar);
+
+    void SetDropdownMenu(wxMenu *menu);
     wxMenu *GetDropdownMenu() const;
 };
 

From a33ce89fec11b48cf4b9e10b8a1c4520bbcccbdc Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 11 Feb 2018 22:16:48 -0800
Subject: [PATCH 356/916] Avoid always consuming mouse wheel event in
 wxComboCtrl.

Allow further processing when key up/down is not handled.
See #18073
---
 src/common/combocmn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 3dc6901f82..283b0f687c 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1994,7 +1994,9 @@ void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
             kevent.m_keyCode = event.GetWheelRotation() > 0
                                ? WXK_UP
                                : WXK_DOWN;
-            GetEventHandler()->ProcessEvent(kevent);
+
+            if (!GetEventHandler()->ProcessEvent(kevent))
+                event.Skip();
         }
         else
         {

From bfa7035bdcefaae2a493958ba0bf4c2378c1215c Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri@schoolwerth.com>
Date: Tue, 13 Feb 2018 22:49:36 +0100
Subject: [PATCH 357/916] Fix Xcode compilation

When using Xcode to compile wxCocoa a system's expat.h gets included
instead of wx', and in the case of wxiOS libexpat is not present and
thus expat.h is not found. Fix by correcting the path to expat.h .

Regression since 824134d42751e08d2a1a01b67854db4707e62abe .
---
 build/osx/wx.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/osx/wx.xcconfig b/build/osx/wx.xcconfig
index 313f1b9669..42339d528b 100644
--- a/build/osx/wx.xcconfig
+++ b/build/osx/wx.xcconfig
@@ -11,7 +11,7 @@ OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden
 GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/regex"
-USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"
+USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/zlib" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/expat/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"
 ALWAYS_SEARCH_USER_PATHS = NO
 WX_PREPROCESSOR_DEFINITIONS = WXBUILDING $(WXPLATFORM) __WX__ _FILE_OFFSET_BITS=64 _LARGE_FILES MACOS_CLASSIC __WXMAC_XCODE__=1 SCI_LEXER NO_CXX11_REGEX WX_PRECOMP=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1
 GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS)

From 2fb26ae296baf03c4c4488a6cb5e5851483bc23f Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri@schoolwerth.com>
Date: Tue, 13 Feb 2018 23:47:07 +0100
Subject: [PATCH 358/916] Regenerate Xcode projects

Update the Xcode projects to use current libjpeg and libpng sources.

Regression since a8e7d0ee12becacb2c8754f12069b9f005640fca (for libpng)
and cc8657e4363a4670994f2907755d1f7b43d586e9 (libjpeg).
---
 build/osx/wxcocoa.xcodeproj/project.pbxproj  | 296 +++++++++----------
 build/osx/wxiphone.xcodeproj/project.pbxproj | 160 +++++-----
 2 files changed, 222 insertions(+), 234 deletions(-)

diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj
index 5d65812d93..2954b26491 100644
--- a/build/osx/wxcocoa.xcodeproj/project.pbxproj
+++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj
@@ -379,9 +379,6 @@
 		1A4F9F18BBEB3515AC7C7CC6 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; };
 		1A4F9F18BBEB3515AC7C7CC7 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; };
 		1A4F9F18BBEB3515AC7C7CC8 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; };
-		1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; };
-		1A7FA35BDE4F35C685AB51A6 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; };
-		1A7FA35BDE4F35C685AB51A7 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; };
 		1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; };
 		1AB50C98FF473B33A3CA4D3A /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; };
 		1AB50C98FF473B33A3CA4D3B /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; };
@@ -1118,6 +1115,9 @@
 		5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
 		5C5D0983160A36189A770743 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
 		5C5D0983160A36189A770744 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
+		5D3AD309AF39385EBF7D9DF8 /* jaricom.c in Sources */ = {isa = PBXBuildFile; fileRef = 573D0D15EE9E3E629D61EA65 /* jaricom.c */; };
+		5D3AD309AF39385EBF7D9DF9 /* jaricom.c in Sources */ = {isa = PBXBuildFile; fileRef = 573D0D15EE9E3E629D61EA65 /* jaricom.c */; };
+		5D3AD309AF39385EBF7D9DFA /* jaricom.c in Sources */ = {isa = PBXBuildFile; fileRef = 573D0D15EE9E3E629D61EA65 /* jaricom.c */; };
 		5DA146A9F7653F53BF5299E8 /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; };
 		5DA146A9F7653F53BF5299E9 /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; };
 		5DA146A9F7653F53BF5299EA /* spinbutt.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */; };
@@ -1480,6 +1480,9 @@
 		7E6C627A325F32FFB2EF9B9E /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; };
 		7E6C627A325F32FFB2EF9B9F /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; };
 		7E6C627A325F32FFB2EF9BA0 /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; };
+		7EB83F6375BF3E73ABE56C40 /* jcarith.c in Sources */ = {isa = PBXBuildFile; fileRef = AA234ACC79743DA797601AA6 /* jcarith.c */; };
+		7EB83F6375BF3E73ABE56C41 /* jcarith.c in Sources */ = {isa = PBXBuildFile; fileRef = AA234ACC79743DA797601AA6 /* jcarith.c */; };
+		7EB83F6375BF3E73ABE56C42 /* jcarith.c in Sources */ = {isa = PBXBuildFile; fileRef = AA234ACC79743DA797601AA6 /* jcarith.c */; };
 		7ECC6EE6D5273F75BB6B7B74 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; };
 		7ECC6EE6D5273F75BB6B7B75 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; };
 		7ECC6EE6D5273F75BB6B7B76 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; };
@@ -1502,6 +1505,9 @@
 		80665EEAE8613DF8A93A7985 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; };
 		80665EEAE8613DF8A93A7986 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; };
 		80665EEAE8613DF8A93A7987 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; };
+		8093A858CA9E3E9EA2D2185F /* jdarith.c in Sources */ = {isa = PBXBuildFile; fileRef = FA9DD56E399533A5BE7AAD16 /* jdarith.c */; };
+		8093A858CA9E3E9EA2D21860 /* jdarith.c in Sources */ = {isa = PBXBuildFile; fileRef = FA9DD56E399533A5BE7AAD16 /* jdarith.c */; };
+		8093A858CA9E3E9EA2D21861 /* jdarith.c in Sources */ = {isa = PBXBuildFile; fileRef = FA9DD56E399533A5BE7AAD16 /* jdarith.c */; };
 		815AE3FED68330F4933AA16F /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = C94DC3402FAE3C4FA776DEEA /* window.mm */; };
 		815AE3FED68330F4933AA170 /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = C94DC3402FAE3C4FA776DEEA /* window.mm */; };
 		815AE3FED68330F4933AA171 /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = C94DC3402FAE3C4FA776DEEA /* window.mm */; };
@@ -1818,9 +1824,6 @@
 		A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; };
 		A1AF8FF873D6383996995ED0 /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; };
 		A1AF8FF873D6383996995ED1 /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; };
-		A212431902B8343CA6D229D3 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; };
-		A212431902B8343CA6D229D4 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; };
-		A212431902B8343CA6D229D5 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; };
 		A2473402D8B83628B1F66749 /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; };
 		A2473402D8B83628B1F6674A /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; };
 		A2473402D8B83628B1F6674B /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; };
@@ -2304,9 +2307,6 @@
 		D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; };
 		D088E7DDE38C31DC9C9B3418 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; };
 		D088E7DDE38C31DC9C9B3419 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; };
-		D0DA11B814AF30A18585122F /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; };
-		D0DA11B814AF30A185851230 /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; };
-		D0DA11B814AF30A185851231 /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; };
 		D13596A4E3CD31DE810061A1 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; };
 		D13596A4E3CD31DE810061A2 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; };
 		D13596A4E3CD31DE810061A3 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; };
@@ -4162,6 +4162,7 @@
 		5612DBC4125B379DA2B28825 /* buttonbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = buttonbar.cpp; path = ../../src/ribbon/buttonbar.cpp; sourceTree = "<group>"; };
 		56653FACC7D13804A70556AD /* sckfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckfile.cpp; path = ../../src/common/sckfile.cpp; sourceTree = "<group>"; };
 		570D603125ED3A14848FA2E2 /* gaugecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gaugecmn.cpp; path = ../../src/common/gaugecmn.cpp; sourceTree = "<group>"; };
+		573D0D15EE9E3E629D61EA65 /* jaricom.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jaricom.c; path = ../../src/jpeg/jaricom.c; sourceTree = "<group>"; };
 		57C06D5DB5F733A4A235B206 /* combobox.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = combobox.mm; path = ../../src/osx/cocoa/combobox.mm; sourceTree = "<group>"; };
 		57E4784E521339BEB971D81D /* LexAVS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVS.cxx; path = ../../src/stc/scintilla/lexers/LexAVS.cxx; sourceTree = "<group>"; };
 		57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listbk.cpp; path = ../../src/xrc/xh_listbk.cpp; sourceTree = "<group>"; };
@@ -4225,7 +4226,6 @@
 		63867276260C3F4A980E83D8 /* rgncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rgncmn.cpp; path = ../../src/common/rgncmn.cpp; sourceTree = "<group>"; };
 		63F15C5B895F38028FE5D0A5 /* debugrpt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = debugrpt.cpp; path = ../../src/common/debugrpt.cpp; sourceTree = "<group>"; };
 		640783FBACA43206B782C77B /* evtloopcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloopcmn.cpp; path = ../../src/common/evtloopcmn.cpp; sourceTree = "<group>"; };
-		646743F6FDFE3ACFA1A79B40 /* jidctred.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctred.c; path = ../../src/jpeg/jidctred.c; sourceTree = "<group>"; };
 		64B25B87203E3464BCDD277D /* tif_read.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_read.c; path = ../../src/tiff/libtiff/tif_read.c; sourceTree = "<group>"; };
 		64DA16CF41C834D7B7642024 /* prntdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prntdlgg.cpp; path = ../../src/generic/prntdlgg.cpp; sourceTree = "<group>"; };
 		65C47DFD6E243724A83603F3 /* libwx_osx_cocoa.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwx_osx_cocoa.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -4475,6 +4475,7 @@
 		A9C7F740A55E39FD890B3C7F /* editors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = editors.cpp; path = ../../src/propgrid/editors.cpp; sourceTree = "<group>"; };
 		A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontpickercmn.cpp; path = ../../src/common/fontpickercmn.cpp; sourceTree = "<group>"; };
 		A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbarcmn.cpp; path = ../../src/common/scrolbarcmn.cpp; sourceTree = "<group>"; };
+		AA234ACC79743DA797601AA6 /* jcarith.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcarith.c; path = ../../src/jpeg/jcarith.c; sourceTree = "<group>"; };
 		AA6C6739C3BD3EFA9CF71102 /* jcinit.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcinit.c; path = ../../src/jpeg/jcinit.c; sourceTree = "<group>"; };
 		AA90128E29A03CCCA30F4D35 /* vlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vlbox.cpp; path = ../../src/generic/vlbox.cpp; sourceTree = "<group>"; };
 		AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_filter.cpp; path = ../../src/common/fs_filter.cpp; sourceTree = "<group>"; };
@@ -4695,7 +4696,6 @@
 		E145FC31ED523B4AA5080A61 /* RESearch.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RESearch.cxx; path = ../../src/stc/scintilla/src/RESearch.cxx; sourceTree = "<group>"; };
 		E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrlcmn.cpp; path = ../../src/common/listctrlcmn.cpp; sourceTree = "<group>"; };
 		E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbrma.cpp; path = ../../src/osx/carbon/statbrma.cpp; sourceTree = "<group>"; };
-		E38569D873B6394F9E5B821C /* jcphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcphuff.c; path = ../../src/jpeg/jcphuff.c; sourceTree = "<group>"; };
 		E433B890264339BA8DB97B1D /* regcomp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regcomp.c; path = ../../src/regex/regcomp.c; sourceTree = "<group>"; };
 		E4E16323A43E36DC8024EDF1 /* textctrl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = textctrl.mm; path = ../../src/osx/cocoa/textctrl.mm; sourceTree = "<group>"; };
 		E5357E76650035639844D15B /* stringimpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringimpl.cpp; path = ../../src/common/stringimpl.cpp; sourceTree = "<group>"; };
@@ -4707,7 +4707,6 @@
 		E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMarkdown.cxx; path = ../../src/stc/scintilla/lexers/LexMarkdown.cxx; sourceTree = "<group>"; };
 		E79B2D1F630036129B9677A7 /* tif_dir.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dir.c; path = ../../src/tiff/libtiff/tif_dir.c; sourceTree = "<group>"; };
 		E8072CA67D19346ABF4D465F /* slidercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slidercmn.cpp; path = ../../src/common/slidercmn.cpp; sourceTree = "<group>"; };
-		E85E680C62B63D4EBAB2E784 /* jdphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdphuff.c; path = ../../src/jpeg/jdphuff.c; sourceTree = "<group>"; };
 		E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CellBuffer.cxx; path = ../../src/stc/scintilla/src/CellBuffer.cxx; sourceTree = "<group>"; };
 		E862A0A422483954B755053E /* wxcocoa_mlgui.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = wxcocoa_mlgui.xcconfig; sourceTree = "<group>"; };
 		E89AC104BF4F33A083F8B382 /* jccoefct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccoefct.c; path = ../../src/jpeg/jccoefct.c; sourceTree = "<group>"; };
@@ -4772,6 +4771,7 @@
 		F951601E73683F27AD8CA99D /* MarginView.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MarginView.cxx; path = ../../src/stc/scintilla/src/MarginView.cxx; sourceTree = "<group>"; };
 		FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcanvas_osx.cpp; path = ../../src/osx/glcanvas_osx.cpp; sourceTree = "<group>"; };
 		FA7029BB5751398AA02D8C24 /* imagtga.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagtga.cpp; path = ../../src/common/imagtga.cpp; sourceTree = "<group>"; };
+		FA9DD56E399533A5BE7AAD16 /* jdarith.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdarith.c; path = ../../src/jpeg/jdarith.c; sourceTree = "<group>"; };
 		FADE850169F7347F83FE1499 /* xh_statbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_statbar.cpp; path = ../../src/xrc/xh_statbar.cpp; sourceTree = "<group>"; };
 		FB355C2107A835E5B8F15C29 /* libwxzlib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libwxzlib.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		FB46BC22F6B23909A938C561 /* regex.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regex.cpp; path = ../../src/common/regex.cpp; sourceTree = "<group>"; };
@@ -5889,52 +5889,52 @@
 		7650A73F7FC9305EA62DAE86 /* libjpeg */ = {
 			isa = PBXGroup;
 			children = (
-				8EB76F786D7F3FF286948D22 /* jcomapi.c */,
-				5BEC6B3CAFB532CBB9F95D74 /* jutils.c */,
-				108517BCD39230E7A89BC943 /* jerror.c */,
-				14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */,
-				374E341C8703367686DEDE93 /* jmemnobs.c */,
+				573D0D15EE9E3E629D61EA65 /* jaricom.c */,
 				6EDDEEEC981133E8BA6A3998 /* jcapimin.c */,
 				F83172EE2DAE352FB969D4F2 /* jcapistd.c */,
-				725574EF98C4301989181CBF /* jctrans.c */,
-				2F41EDEB298538CC86FF6DC1 /* jcparam.c */,
-				59B19927E27F39ACB1D2BDA3 /* jdatadst.c */,
-				AA6C6739C3BD3EFA9CF71102 /* jcinit.c */,
-				3E3043D7BE9C33B59E900CCE /* jcmaster.c */,
-				664736BDE465350C9C4750E9 /* jcmarker.c */,
-				810EB7316DF3344197C78EC0 /* jcmainct.c */,
-				7FE0455EBDC63D82B2D88587 /* jcprepct.c */,
+				AA234ACC79743DA797601AA6 /* jcarith.c */,
 				E89AC104BF4F33A083F8B382 /* jccoefct.c */,
 				8EFF4707641D3F20AB602ED6 /* jccolor.c */,
-				53D06E47477B3E32BB6B915E /* jcsample.c */,
-				DC0FFDC7A6163F2DA73B84EB /* jchuff.c */,
-				E38569D873B6394F9E5B821C /* jcphuff.c */,
 				6DBF3053414F3C448312165A /* jcdctmgr.c */,
-				029486D6A2EC3DE0902A6A24 /* jfdctfst.c */,
-				93D07403FCA530D7A9FD2917 /* jfdctflt.c */,
-				90EC2A5B80EE3031BA4087B9 /* jfdctint.c */,
+				DC0FFDC7A6163F2DA73B84EB /* jchuff.c */,
+				AA6C6739C3BD3EFA9CF71102 /* jcinit.c */,
+				810EB7316DF3344197C78EC0 /* jcmainct.c */,
+				664736BDE465350C9C4750E9 /* jcmarker.c */,
+				3E3043D7BE9C33B59E900CCE /* jcmaster.c */,
+				8EB76F786D7F3FF286948D22 /* jcomapi.c */,
+				2F41EDEB298538CC86FF6DC1 /* jcparam.c */,
+				7FE0455EBDC63D82B2D88587 /* jcprepct.c */,
+				53D06E47477B3E32BB6B915E /* jcsample.c */,
+				725574EF98C4301989181CBF /* jctrans.c */,
 				86884BC843F6337EABF744BB /* jdapimin.c */,
 				1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */,
-				4549845C0751356A907C23E0 /* jdtrans.c */,
+				FA9DD56E399533A5BE7AAD16 /* jdarith.c */,
+				59B19927E27F39ACB1D2BDA3 /* jdatadst.c */,
 				DECAF5DD80383A2CA76EB383 /* jdatasrc.c */,
-				ED19EF377E653F71B1876259 /* jdmaster.c */,
-				CCF7564A2B733F759AA8496B /* jdinput.c */,
-				20E4A10BCD773C84AEC481A1 /* jdmarker.c */,
-				72869747E68E37998CB0A07E /* jdhuff.c */,
-				E85E680C62B63D4EBAB2E784 /* jdphuff.c */,
-				B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */,
 				F1A6F3936A0D31CBB58082BA /* jdcoefct.c */,
-				375FF97B202F3C359402D13E /* jdpostct.c */,
-				A5BBC1E494D33D028CA547FF /* jddctmgr.c */,
-				A0DCC5EF59143640BE13AD73 /* jidctfst.c */,
-				3C131F7BF8A83960ACB26242 /* jidctflt.c */,
-				1DAF0931E4AD3E6581D7FDBC /* jidctint.c */,
-				646743F6FDFE3ACFA1A79B40 /* jidctred.c */,
-				5FFCF47A161B3E08B19BFE14 /* jdsample.c */,
 				68B81FBDA49D3C1991B6356A /* jdcolor.c */,
+				A5BBC1E494D33D028CA547FF /* jddctmgr.c */,
+				72869747E68E37998CB0A07E /* jdhuff.c */,
+				CCF7564A2B733F759AA8496B /* jdinput.c */,
+				B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */,
+				20E4A10BCD773C84AEC481A1 /* jdmarker.c */,
+				ED19EF377E653F71B1876259 /* jdmaster.c */,
+				0890779C662C35889A8C6C2E /* jdmerge.c */,
+				375FF97B202F3C359402D13E /* jdpostct.c */,
+				5FFCF47A161B3E08B19BFE14 /* jdsample.c */,
+				4549845C0751356A907C23E0 /* jdtrans.c */,
+				108517BCD39230E7A89BC943 /* jerror.c */,
+				93D07403FCA530D7A9FD2917 /* jfdctflt.c */,
+				029486D6A2EC3DE0902A6A24 /* jfdctfst.c */,
+				90EC2A5B80EE3031BA4087B9 /* jfdctint.c */,
+				3C131F7BF8A83960ACB26242 /* jidctflt.c */,
+				A0DCC5EF59143640BE13AD73 /* jidctfst.c */,
+				1DAF0931E4AD3E6581D7FDBC /* jidctint.c */,
+				14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */,
+				374E341C8703367686DEDE93 /* jmemnobs.c */,
 				4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */,
 				02D9332D5C5632E981936E29 /* jquant2.c */,
-				0890779C662C35889A8C6C2E /* jdmerge.c */,
+				5BEC6B3CAFB532CBB9F95D74 /* jutils.c */,
 			);
 			name = libjpeg;
 			sourceTree = "<group>";
@@ -8742,52 +8742,52 @@
 				7A79D9AC608E3B8287229175 /* tif_warning.c in Sources */,
 				F2F2963D8ECC32D39FDBF102 /* tif_write.c in Sources */,
 				6E2C2E8AA1713ADE9C33837A /* tif_zip.c in Sources */,
-				FCE5B139CBE73FCB804EF7DE /* jcomapi.c in Sources */,
-				311840186794346AAAA42092 /* jutils.c in Sources */,
-				DE26572475EE336B8EEA5D93 /* jerror.c in Sources */,
-				18A318847EAC37F2B915F082 /* jmemmgr.c in Sources */,
-				A7692B4D8658347BA16EEB84 /* jmemnobs.c in Sources */,
+				5D3AD309AF39385EBF7D9DF9 /* jaricom.c in Sources */,
 				894D43C8F224394FB3171F27 /* jcapimin.c in Sources */,
 				743BB23211B336A6A0F26E58 /* jcapistd.c in Sources */,
-				CCE4ECA9CE883B008065C6FC /* jctrans.c in Sources */,
-				ACD644CFA85A3B70A3E3B119 /* jcparam.c in Sources */,
-				76A83A293C9F33BCB7DFDE27 /* jdatadst.c in Sources */,
-				86003C8EB906304F9025F789 /* jcinit.c in Sources */,
-				C6DF6F29407B34F29ED1B66E /* jcmaster.c in Sources */,
-				DB73248401573A5996D8E68E /* jcmarker.c in Sources */,
-				98DF13E96160304EBB905E74 /* jcmainct.c in Sources */,
-				32486A808EBC3E088598D51D /* jcprepct.c in Sources */,
+				7EB83F6375BF3E73ABE56C41 /* jcarith.c in Sources */,
 				CA5BD8ABDBA13641BBE7CD67 /* jccoefct.c in Sources */,
 				11DD420E32FB3EFB9DA0AB5C /* jccolor.c in Sources */,
-				50D7E093424138C88BB50D28 /* jcsample.c in Sources */,
-				BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */,
-				A212431902B8343CA6D229D4 /* jcphuff.c in Sources */,
 				BFA6983551B4310DA7C8A405 /* jcdctmgr.c in Sources */,
-				9B3F9D04FB533D99B58BD51A /* jfdctfst.c in Sources */,
-				0948599C4FD53611A09B52AC /* jfdctflt.c in Sources */,
-				CEC6430AEB6E3200BFA75D08 /* jfdctint.c in Sources */,
+				BDB7B2AD26CB356B8BEAAECE /* jchuff.c in Sources */,
+				86003C8EB906304F9025F789 /* jcinit.c in Sources */,
+				98DF13E96160304EBB905E74 /* jcmainct.c in Sources */,
+				DB73248401573A5996D8E68E /* jcmarker.c in Sources */,
+				C6DF6F29407B34F29ED1B66E /* jcmaster.c in Sources */,
+				FCE5B139CBE73FCB804EF7DE /* jcomapi.c in Sources */,
+				ACD644CFA85A3B70A3E3B119 /* jcparam.c in Sources */,
+				32486A808EBC3E088598D51D /* jcprepct.c in Sources */,
+				50D7E093424138C88BB50D28 /* jcsample.c in Sources */,
+				CCE4ECA9CE883B008065C6FC /* jctrans.c in Sources */,
 				8B9C9FCB954F3596A4CED9A6 /* jdapimin.c in Sources */,
 				67EBCE5FA5FF36349ADF0917 /* jdapistd.c in Sources */,
-				11818B68C5263EB68D708846 /* jdtrans.c in Sources */,
+				8093A858CA9E3E9EA2D21860 /* jdarith.c in Sources */,
+				76A83A293C9F33BCB7DFDE27 /* jdatadst.c in Sources */,
 				4CB3626391CE34D4B1F71AA1 /* jdatasrc.c in Sources */,
-				CEBAAB0C77983358A601BFFF /* jdmaster.c in Sources */,
-				14EF556997B0350F931EBE8F /* jdinput.c in Sources */,
-				61C3F7D495FB3E8BA402E4F9 /* jdmarker.c in Sources */,
-				28ADE8D385A53445A5451F24 /* jdhuff.c in Sources */,
-				D0DA11B814AF30A185851230 /* jdphuff.c in Sources */,
-				9FD99E06F6613A1A958FAF6C /* jdmainct.c in Sources */,
 				B5470121BB4B35DE9C4836DB /* jdcoefct.c in Sources */,
-				E7D02E64384F37BC8939A2C5 /* jdpostct.c in Sources */,
-				13854E7822783719A2530793 /* jddctmgr.c in Sources */,
-				48A1F28E04603A68A1E70319 /* jidctfst.c in Sources */,
-				B01C4EF49CF9390DA93A3503 /* jidctflt.c in Sources */,
-				C43A9650A9DC3372AB8F5F79 /* jidctint.c in Sources */,
-				1A7FA35BDE4F35C685AB51A6 /* jidctred.c in Sources */,
-				D997FFC948B73FDA892DB532 /* jdsample.c in Sources */,
 				D9F02AFDA07D3857A905527D /* jdcolor.c in Sources */,
+				13854E7822783719A2530793 /* jddctmgr.c in Sources */,
+				28ADE8D385A53445A5451F24 /* jdhuff.c in Sources */,
+				14EF556997B0350F931EBE8F /* jdinput.c in Sources */,
+				9FD99E06F6613A1A958FAF6C /* jdmainct.c in Sources */,
+				61C3F7D495FB3E8BA402E4F9 /* jdmarker.c in Sources */,
+				CEBAAB0C77983358A601BFFF /* jdmaster.c in Sources */,
+				1E4832B42B95308299B767BA /* jdmerge.c in Sources */,
+				E7D02E64384F37BC8939A2C5 /* jdpostct.c in Sources */,
+				D997FFC948B73FDA892DB532 /* jdsample.c in Sources */,
+				11818B68C5263EB68D708846 /* jdtrans.c in Sources */,
+				DE26572475EE336B8EEA5D93 /* jerror.c in Sources */,
+				0948599C4FD53611A09B52AC /* jfdctflt.c in Sources */,
+				9B3F9D04FB533D99B58BD51A /* jfdctfst.c in Sources */,
+				CEC6430AEB6E3200BFA75D08 /* jfdctint.c in Sources */,
+				B01C4EF49CF9390DA93A3503 /* jidctflt.c in Sources */,
+				48A1F28E04603A68A1E70319 /* jidctfst.c in Sources */,
+				C43A9650A9DC3372AB8F5F79 /* jidctint.c in Sources */,
+				18A318847EAC37F2B915F082 /* jmemmgr.c in Sources */,
+				A7692B4D8658347BA16EEB84 /* jmemnobs.c in Sources */,
 				15D65A523EB23EC385C05E0C /* jquant1.c in Sources */,
 				3C0EB1DDA5243E31B2D92CE3 /* jquant2.c in Sources */,
-				1E4832B42B95308299B767BA /* jdmerge.c in Sources */,
+				311840186794346AAAA42092 /* jutils.c in Sources */,
 				94B1C88076793400810FAC31 /* png.c in Sources */,
 				1569BB4728693B6285623A24 /* pngerror.c in Sources */,
 				D9496139621533328AE727B7 /* pngget.c in Sources */,
@@ -8988,52 +8988,52 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FCE5B139CBE73FCB804EF7DF /* jcomapi.c in Sources */,
-				311840186794346AAAA42093 /* jutils.c in Sources */,
-				DE26572475EE336B8EEA5D94 /* jerror.c in Sources */,
-				18A318847EAC37F2B915F083 /* jmemmgr.c in Sources */,
-				A7692B4D8658347BA16EEB85 /* jmemnobs.c in Sources */,
+				5D3AD309AF39385EBF7D9DFA /* jaricom.c in Sources */,
 				894D43C8F224394FB3171F28 /* jcapimin.c in Sources */,
 				743BB23211B336A6A0F26E59 /* jcapistd.c in Sources */,
-				CCE4ECA9CE883B008065C6FD /* jctrans.c in Sources */,
-				ACD644CFA85A3B70A3E3B11A /* jcparam.c in Sources */,
-				76A83A293C9F33BCB7DFDE28 /* jdatadst.c in Sources */,
-				86003C8EB906304F9025F78A /* jcinit.c in Sources */,
-				C6DF6F29407B34F29ED1B66F /* jcmaster.c in Sources */,
-				DB73248401573A5996D8E68F /* jcmarker.c in Sources */,
-				98DF13E96160304EBB905E75 /* jcmainct.c in Sources */,
-				32486A808EBC3E088598D51E /* jcprepct.c in Sources */,
+				7EB83F6375BF3E73ABE56C42 /* jcarith.c in Sources */,
 				CA5BD8ABDBA13641BBE7CD68 /* jccoefct.c in Sources */,
 				11DD420E32FB3EFB9DA0AB5D /* jccolor.c in Sources */,
-				50D7E093424138C88BB50D29 /* jcsample.c in Sources */,
-				BDB7B2AD26CB356B8BEAAECF /* jchuff.c in Sources */,
-				A212431902B8343CA6D229D5 /* jcphuff.c in Sources */,
 				BFA6983551B4310DA7C8A406 /* jcdctmgr.c in Sources */,
-				9B3F9D04FB533D99B58BD51B /* jfdctfst.c in Sources */,
-				0948599C4FD53611A09B52AD /* jfdctflt.c in Sources */,
-				CEC6430AEB6E3200BFA75D09 /* jfdctint.c in Sources */,
+				BDB7B2AD26CB356B8BEAAECF /* jchuff.c in Sources */,
+				86003C8EB906304F9025F78A /* jcinit.c in Sources */,
+				98DF13E96160304EBB905E75 /* jcmainct.c in Sources */,
+				DB73248401573A5996D8E68F /* jcmarker.c in Sources */,
+				C6DF6F29407B34F29ED1B66F /* jcmaster.c in Sources */,
+				FCE5B139CBE73FCB804EF7DF /* jcomapi.c in Sources */,
+				ACD644CFA85A3B70A3E3B11A /* jcparam.c in Sources */,
+				32486A808EBC3E088598D51E /* jcprepct.c in Sources */,
+				50D7E093424138C88BB50D29 /* jcsample.c in Sources */,
+				CCE4ECA9CE883B008065C6FD /* jctrans.c in Sources */,
 				8B9C9FCB954F3596A4CED9A7 /* jdapimin.c in Sources */,
 				67EBCE5FA5FF36349ADF0918 /* jdapistd.c in Sources */,
-				11818B68C5263EB68D708847 /* jdtrans.c in Sources */,
+				8093A858CA9E3E9EA2D21861 /* jdarith.c in Sources */,
+				76A83A293C9F33BCB7DFDE28 /* jdatadst.c in Sources */,
 				4CB3626391CE34D4B1F71AA2 /* jdatasrc.c in Sources */,
-				CEBAAB0C77983358A601C000 /* jdmaster.c in Sources */,
-				14EF556997B0350F931EBE90 /* jdinput.c in Sources */,
-				61C3F7D495FB3E8BA402E4FA /* jdmarker.c in Sources */,
-				28ADE8D385A53445A5451F25 /* jdhuff.c in Sources */,
-				D0DA11B814AF30A185851231 /* jdphuff.c in Sources */,
-				9FD99E06F6613A1A958FAF6D /* jdmainct.c in Sources */,
 				B5470121BB4B35DE9C4836DC /* jdcoefct.c in Sources */,
-				E7D02E64384F37BC8939A2C6 /* jdpostct.c in Sources */,
-				13854E7822783719A2530794 /* jddctmgr.c in Sources */,
-				48A1F28E04603A68A1E7031A /* jidctfst.c in Sources */,
-				B01C4EF49CF9390DA93A3504 /* jidctflt.c in Sources */,
-				C43A9650A9DC3372AB8F5F7A /* jidctint.c in Sources */,
-				1A7FA35BDE4F35C685AB51A7 /* jidctred.c in Sources */,
-				D997FFC948B73FDA892DB533 /* jdsample.c in Sources */,
 				D9F02AFDA07D3857A905527E /* jdcolor.c in Sources */,
+				13854E7822783719A2530794 /* jddctmgr.c in Sources */,
+				28ADE8D385A53445A5451F25 /* jdhuff.c in Sources */,
+				14EF556997B0350F931EBE90 /* jdinput.c in Sources */,
+				9FD99E06F6613A1A958FAF6D /* jdmainct.c in Sources */,
+				61C3F7D495FB3E8BA402E4FA /* jdmarker.c in Sources */,
+				CEBAAB0C77983358A601C000 /* jdmaster.c in Sources */,
+				1E4832B42B95308299B767BB /* jdmerge.c in Sources */,
+				E7D02E64384F37BC8939A2C6 /* jdpostct.c in Sources */,
+				D997FFC948B73FDA892DB533 /* jdsample.c in Sources */,
+				11818B68C5263EB68D708847 /* jdtrans.c in Sources */,
+				DE26572475EE336B8EEA5D94 /* jerror.c in Sources */,
+				0948599C4FD53611A09B52AD /* jfdctflt.c in Sources */,
+				9B3F9D04FB533D99B58BD51B /* jfdctfst.c in Sources */,
+				CEC6430AEB6E3200BFA75D09 /* jfdctint.c in Sources */,
+				B01C4EF49CF9390DA93A3504 /* jidctflt.c in Sources */,
+				48A1F28E04603A68A1E7031A /* jidctfst.c in Sources */,
+				C43A9650A9DC3372AB8F5F7A /* jidctint.c in Sources */,
+				18A318847EAC37F2B915F083 /* jmemmgr.c in Sources */,
+				A7692B4D8658347BA16EEB85 /* jmemnobs.c in Sources */,
 				15D65A523EB23EC385C05E0D /* jquant1.c in Sources */,
 				3C0EB1DDA5243E31B2D92CE4 /* jquant2.c in Sources */,
-				1E4832B42B95308299B767BB /* jdmerge.c in Sources */,
+				311840186794346AAAA42093 /* jutils.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9966,52 +9966,52 @@
 				7A79D9AC608E3B8287229174 /* tif_warning.c in Sources */,
 				F2F2963D8ECC32D39FDBF101 /* tif_write.c in Sources */,
 				6E2C2E8AA1713ADE9C338379 /* tif_zip.c in Sources */,
-				FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */,
-				311840186794346AAAA42091 /* jutils.c in Sources */,
-				DE26572475EE336B8EEA5D92 /* jerror.c in Sources */,
-				18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */,
-				A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */,
+				5D3AD309AF39385EBF7D9DF8 /* jaricom.c in Sources */,
 				894D43C8F224394FB3171F26 /* jcapimin.c in Sources */,
 				743BB23211B336A6A0F26E57 /* jcapistd.c in Sources */,
-				CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */,
-				ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */,
-				76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */,
-				86003C8EB906304F9025F788 /* jcinit.c in Sources */,
-				C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */,
-				DB73248401573A5996D8E68D /* jcmarker.c in Sources */,
-				98DF13E96160304EBB905E73 /* jcmainct.c in Sources */,
-				32486A808EBC3E088598D51C /* jcprepct.c in Sources */,
+				7EB83F6375BF3E73ABE56C40 /* jcarith.c in Sources */,
 				CA5BD8ABDBA13641BBE7CD66 /* jccoefct.c in Sources */,
 				11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */,
-				50D7E093424138C88BB50D27 /* jcsample.c in Sources */,
-				BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */,
-				A212431902B8343CA6D229D3 /* jcphuff.c in Sources */,
 				BFA6983551B4310DA7C8A404 /* jcdctmgr.c in Sources */,
-				9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */,
-				0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */,
-				CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */,
+				BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */,
+				86003C8EB906304F9025F788 /* jcinit.c in Sources */,
+				98DF13E96160304EBB905E73 /* jcmainct.c in Sources */,
+				DB73248401573A5996D8E68D /* jcmarker.c in Sources */,
+				C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */,
+				FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */,
+				ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */,
+				32486A808EBC3E088598D51C /* jcprepct.c in Sources */,
+				50D7E093424138C88BB50D27 /* jcsample.c in Sources */,
+				CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */,
 				8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */,
 				67EBCE5FA5FF36349ADF0916 /* jdapistd.c in Sources */,
-				11818B68C5263EB68D708845 /* jdtrans.c in Sources */,
+				8093A858CA9E3E9EA2D2185F /* jdarith.c in Sources */,
+				76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */,
 				4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */,
-				CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */,
-				14EF556997B0350F931EBE8E /* jdinput.c in Sources */,
-				61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */,
-				28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */,
-				D0DA11B814AF30A18585122F /* jdphuff.c in Sources */,
-				9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */,
 				B5470121BB4B35DE9C4836DA /* jdcoefct.c in Sources */,
-				E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */,
-				13854E7822783719A2530792 /* jddctmgr.c in Sources */,
-				48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */,
-				B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */,
-				C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */,
-				1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */,
-				D997FFC948B73FDA892DB531 /* jdsample.c in Sources */,
 				D9F02AFDA07D3857A905527C /* jdcolor.c in Sources */,
+				13854E7822783719A2530792 /* jddctmgr.c in Sources */,
+				28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */,
+				14EF556997B0350F931EBE8E /* jdinput.c in Sources */,
+				9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */,
+				61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */,
+				CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */,
+				1E4832B42B95308299B767B9 /* jdmerge.c in Sources */,
+				E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */,
+				D997FFC948B73FDA892DB531 /* jdsample.c in Sources */,
+				11818B68C5263EB68D708845 /* jdtrans.c in Sources */,
+				DE26572475EE336B8EEA5D92 /* jerror.c in Sources */,
+				0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */,
+				9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */,
+				CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */,
+				B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */,
+				48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */,
+				C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */,
+				18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */,
+				A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */,
 				15D65A523EB23EC385C05E0B /* jquant1.c in Sources */,
 				3C0EB1DDA5243E31B2D92CE2 /* jquant2.c in Sources */,
-				1E4832B42B95308299B767B9 /* jdmerge.c in Sources */,
+				311840186794346AAAA42091 /* jutils.c in Sources */,
 				94B1C88076793400810FAC30 /* png.c in Sources */,
 				1569BB4728693B6285623A23 /* pngerror.c in Sources */,
 				D9496139621533328AE727B6 /* pngget.c in Sources */,
diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj
index 174027fabc..59850629b9 100644
--- a/build/osx/wxiphone.xcodeproj/project.pbxproj
+++ b/build/osx/wxiphone.xcodeproj/project.pbxproj
@@ -99,7 +99,6 @@
 		1937FBA0A0DD32A8A743CFE1 /* valtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE8701E1CF2B352B945C17E5 /* valtext.cpp */; };
 		19D823E564D932758EA6F8D1 /* UniConversion.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */; };
 		1A4F9F18BBEB3515AC7C7CC6 /* LexMetapost.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */; };
-		1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */ = {isa = PBXBuildFile; fileRef = 646743F6FDFE3ACFA1A79B40 /* jidctred.c */; };
 		1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */; };
 		1AF2B2346C9639DAA4D15F30 /* numdlgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A7F3F58B1E3812A055C84F /* numdlgg.cpp */; };
 		1B06622C8D8731FC832199E2 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB82939EDC593F9CA95C3098 /* init.cpp */; };
@@ -229,9 +228,6 @@
 		3E99016BDE043A08B4D6B3CE /* htmprint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 194ADD28300E329E80F7892E /* htmprint.cpp */; };
 		3EB6B8528A0D3B6CADAE1256 /* archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02D2E8B5C89939CE90B99E2B /* archive.cpp */; };
 		3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */; };
-		CC6752334EB93A6B9C0391B3 /* filter_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = D785BC35292138E0BB94EADC /* filter_neon.S */; };
-		BB12132A86E2350AA47414CC /* arm_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 933D7637CAA43F6C99814BC5 /* arm_init.c */; };
-		0F2FD12272023C869CE86008 /* filter_neon_intrinsics.c in Sources */ = {isa = PBXBuildFile; fileRef = 39507FA11D8838109A22B7DA /* filter_neon_intrinsics.c */; };
 		403FBA20CEFE3EAFB4E6B905 /* dir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F7332A03D93D3DABB050615D /* dir.cpp */; };
 		4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; };
 		41943A8F82723027A151A468 /* fileconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61DA2A4C0D143CBE804BB8A1 /* fileconf.cpp */; };
@@ -319,6 +315,7 @@
 		5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; };
 		5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; };
 		5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
+		5D3AD309AF39385EBF7D9DF8 /* jaricom.c in Sources */ = {isa = PBXBuildFile; fileRef = 573D0D15EE9E3E629D61EA65 /* jaricom.c */; };
 		5EE94793DFCB3BA281A4864E /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = FDB0E2D0966C3E408C4A2D3D /* infback.c */; };
 		5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; };
 		5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; };
@@ -431,6 +428,7 @@
 		7DC4A542372437ECA0790F87 /* art_msw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B540E18F9C91381CA175BABB /* art_msw.cpp */; };
 		7DEC57D6CE8232A09EF74219 /* PropSetSimple.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 41D75DF4695B361DB700D51D /* PropSetSimple.cxx */; };
 		7E6C627A325F32FFB2EF9B9E /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A82EDCFFBAC30098B238957 /* caret.cpp */; };
+		7EB83F6375BF3E73ABE56C40 /* jcarith.c in Sources */ = {isa = PBXBuildFile; fileRef = AA234ACC79743DA797601AA6 /* jcarith.c */; };
 		7ECC6EE6D5273F75BB6B7B74 /* tif_dirinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 032A38738B58394E8617617B /* tif_dirinfo.c */; };
 		7EF89F935314301381802FAB /* filectrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2334539088B036BEAB230D1C /* filectrlg.cpp */; };
 		7F77E347E1243D77A666FB43 /* clipbrd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12453E271F2A3AC9969E62A4 /* clipbrd.cpp */; };
@@ -438,6 +436,7 @@
 		800CFCEDBB7938338C65EEAC /* notifmsgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B233180893DB3328AF4847DA /* notifmsgcmn.cpp */; };
 		805CCAE64D023561AD334B53 /* popupwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 530DC2E26BF2313E8702AD43 /* popupwin.cpp */; };
 		80665EEAE8613DF8A93A7984 /* utilscmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4188821BBA833CCAA678B234 /* utilscmn.cpp */; };
+		8093A858CA9E3E9EA2D2185F /* jdarith.c in Sources */ = {isa = PBXBuildFile; fileRef = FA9DD56E399533A5BE7AAD16 /* jdarith.c */; };
 		815AE3FED68330F4933AA16F /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = C94DC3402FAE3C4FA776DEEA /* window.mm */; };
 		81B742D64BEB373DB705947A /* m_list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B4028ABB08C63AB59F5F240B /* m_list.cpp */; };
 		825EAD51920B387DB4F8C426 /* LexAsn1.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A46D50BEBF523B3F88831086 /* LexAsn1.cxx */; };
@@ -540,7 +539,6 @@
 		A1A7B833061C35B4AABD093C /* preferencesg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D8F06DEA1AA339ED819B3812 /* preferencesg.cpp */; };
 		A1A7D793B034398B8696EF33 /* utils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 789F45D14FF23E248FCFB5FA /* utils.mm */; };
 		A1AF8FF873D6383996995ECF /* statusbr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071FEABEA61E3B559A47A7DB /* statusbr.cpp */; };
-		A212431902B8343CA6D229D3 /* jcphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E38569D873B6394F9E5B821C /* jcphuff.c */; };
 		A2473402D8B83628B1F66749 /* wxprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 607EF0043E723B7B9BE101EA /* wxprintf.cpp */; };
 		A2769D1659AE3CA3B58C2CAE /* wincmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */; };
 		A283187810EB32DAA173BD33 /* artstd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24E82A05E9A9323287CDB15B /* artstd.cpp */; };
@@ -697,7 +695,6 @@
 		CFF73578F04D357E83D1D830 /* lboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */; };
 		D070C3BE95483FE38BABA1BE /* region.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00DA3D3EEF5E305CA73A1871 /* region.cpp */; };
 		D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B17772732159304AA7312D72 /* dcclient.cpp */; };
-		D0DA11B814AF30A18585122F /* jdphuff.c in Sources */ = {isa = PBXBuildFile; fileRef = E85E680C62B63D4EBAB2E784 /* jdphuff.c */; };
 		D13596A4E3CD31DE810061A1 /* imagjpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6876262846EA3569B36D92E9 /* imagjpeg.cpp */; };
 		D13AE659C3AC37B68D39B2C9 /* LexLout.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B14D6E7E15FD3C869E341198 /* LexLout.cxx */; };
 		D17E3053DA0D3F7EA4D0951B /* helpdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81821049E39B32C6ABCF6820 /* helpdlg.cpp */; };
@@ -1067,9 +1064,6 @@
 		3FB6D34C3029357EB64AECAA /* scrlwing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrlwing.cpp; path = ../../src/generic/scrlwing.cpp; sourceTree = "<group>"; };
 		3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmlwin.cpp; path = ../../src/html/htmlwin.cpp; sourceTree = "<group>"; };
 		400275BE019D3E5BA47988BE /* inffast.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = inffast.c; path = ../../src/zlib/inffast.c; sourceTree = "<group>"; };
-		D785BC35292138E0BB94EADC /* filter_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = filter_neon.S; path = ../../src/png/arm/filter_neon.S; sourceTree = "<group>"; };
-		933D7637CAA43F6C99814BC5 /* arm_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = arm_init.c; path = ../../src/png/arm/arm_init.c; sourceTree = "<group>"; };
-		39507FA11D8838109A22B7DA /* filter_neon_intrinsics.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_neon_intrinsics.c; path = ../../src/png/arm/filter_neon_intrinsics.c; sourceTree = "<group>"; };
 		4048A3523EC03409BD899BEF /* xtixml.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtixml.cpp; path = ../../src/common/xtixml.cpp; sourceTree = "<group>"; };
 		40586C8986443431A64EB066 /* LexLisp.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexLisp.cxx; path = ../../src/stc/scintilla/lexers/LexLisp.cxx; sourceTree = "<group>"; };
 		4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_pixarlog.c; path = ../../src/tiff/libtiff/tif_pixarlog.c; sourceTree = "<group>"; };
@@ -1142,6 +1136,7 @@
 		5612DBC4125B379DA2B28825 /* buttonbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = buttonbar.cpp; path = ../../src/ribbon/buttonbar.cpp; sourceTree = "<group>"; };
 		56653FACC7D13804A70556AD /* sckfile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = sckfile.cpp; path = ../../src/common/sckfile.cpp; sourceTree = "<group>"; };
 		570D603125ED3A14848FA2E2 /* gaugecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gaugecmn.cpp; path = ../../src/common/gaugecmn.cpp; sourceTree = "<group>"; };
+		573D0D15EE9E3E629D61EA65 /* jaricom.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jaricom.c; path = ../../src/jpeg/jaricom.c; sourceTree = "<group>"; };
 		57E4784E521339BEB971D81D /* LexAVS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAVS.cxx; path = ../../src/stc/scintilla/lexers/LexAVS.cxx; sourceTree = "<group>"; };
 		57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_listbk.cpp; path = ../../src/xrc/xh_listbk.cpp; sourceTree = "<group>"; };
 		580AFC66F3003582B43043B1 /* animateg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = animateg.cpp; path = ../../src/generic/animateg.cpp; sourceTree = "<group>"; };
@@ -1198,7 +1193,6 @@
 		63867276260C3F4A980E83D8 /* rgncmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rgncmn.cpp; path = ../../src/common/rgncmn.cpp; sourceTree = "<group>"; };
 		63F15C5B895F38028FE5D0A5 /* debugrpt.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = debugrpt.cpp; path = ../../src/common/debugrpt.cpp; sourceTree = "<group>"; };
 		640783FBACA43206B782C77B /* evtloopcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = evtloopcmn.cpp; path = ../../src/common/evtloopcmn.cpp; sourceTree = "<group>"; };
-		646743F6FDFE3ACFA1A79B40 /* jidctred.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jidctred.c; path = ../../src/jpeg/jidctred.c; sourceTree = "<group>"; };
 		64B25B87203E3464BCDD277D /* tif_read.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_read.c; path = ../../src/tiff/libtiff/tif_read.c; sourceTree = "<group>"; };
 		64DA16CF41C834D7B7642024 /* prntdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = prntdlgg.cpp; path = ../../src/generic/prntdlgg.cpp; sourceTree = "<group>"; };
 		66411D54BAD338498AC59401 /* xh_scrol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_scrol.cpp; path = ../../src/xrc/xh_scrol.cpp; sourceTree = "<group>"; };
@@ -1429,6 +1423,7 @@
 		A9C7F740A55E39FD890B3C7F /* editors.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = editors.cpp; path = ../../src/propgrid/editors.cpp; sourceTree = "<group>"; };
 		A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontpickercmn.cpp; path = ../../src/common/fontpickercmn.cpp; sourceTree = "<group>"; };
 		A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scrolbarcmn.cpp; path = ../../src/common/scrolbarcmn.cpp; sourceTree = "<group>"; };
+		AA234ACC79743DA797601AA6 /* jcarith.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcarith.c; path = ../../src/jpeg/jcarith.c; sourceTree = "<group>"; };
 		AA6C6739C3BD3EFA9CF71102 /* jcinit.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcinit.c; path = ../../src/jpeg/jcinit.c; sourceTree = "<group>"; };
 		AA90128E29A03CCCA30F4D35 /* vlbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vlbox.cpp; path = ../../src/generic/vlbox.cpp; sourceTree = "<group>"; };
 		AAB58DD0DEC13D68B8708085 /* fs_filter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fs_filter.cpp; path = ../../src/common/fs_filter.cpp; sourceTree = "<group>"; };
@@ -1633,7 +1628,6 @@
 		E145FC31ED523B4AA5080A61 /* RESearch.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RESearch.cxx; path = ../../src/stc/scintilla/src/RESearch.cxx; sourceTree = "<group>"; };
 		E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = listctrlcmn.cpp; path = ../../src/common/listctrlcmn.cpp; sourceTree = "<group>"; };
 		E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = statbrma.cpp; path = ../../src/osx/carbon/statbrma.cpp; sourceTree = "<group>"; };
-		E38569D873B6394F9E5B821C /* jcphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcphuff.c; path = ../../src/jpeg/jcphuff.c; sourceTree = "<group>"; };
 		E433B890264339BA8DB97B1D /* regcomp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = regcomp.c; path = ../../src/regex/regcomp.c; sourceTree = "<group>"; };
 		E4E16323A43E36DC8024EDF1 /* textctrl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = textctrl.mm; path = ../../src/osx/iphone/textctrl.mm; sourceTree = "<group>"; };
 		E5357E76650035639844D15B /* stringimpl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stringimpl.cpp; path = ../../src/common/stringimpl.cpp; sourceTree = "<group>"; };
@@ -1645,7 +1639,6 @@
 		E78CBF86AAE637CB982B2EC0 /* LexMarkdown.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMarkdown.cxx; path = ../../src/stc/scintilla/lexers/LexMarkdown.cxx; sourceTree = "<group>"; };
 		E79B2D1F630036129B9677A7 /* tif_dir.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dir.c; path = ../../src/tiff/libtiff/tif_dir.c; sourceTree = "<group>"; };
 		E8072CA67D19346ABF4D465F /* slidercmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = slidercmn.cpp; path = ../../src/common/slidercmn.cpp; sourceTree = "<group>"; };
-		E85E680C62B63D4EBAB2E784 /* jdphuff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdphuff.c; path = ../../src/jpeg/jdphuff.c; sourceTree = "<group>"; };
 		E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CellBuffer.cxx; path = ../../src/stc/scintilla/src/CellBuffer.cxx; sourceTree = "<group>"; };
 		E89AC104BF4F33A083F8B382 /* jccoefct.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jccoefct.c; path = ../../src/jpeg/jccoefct.c; sourceTree = "<group>"; };
 		E8BD1489D95E3FD78B200B1B /* commandlinkbuttong.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = commandlinkbuttong.cpp; path = ../../src/generic/commandlinkbuttong.cpp; sourceTree = "<group>"; };
@@ -1708,6 +1701,7 @@
 		F951601E73683F27AD8CA99D /* MarginView.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MarginView.cxx; path = ../../src/stc/scintilla/src/MarginView.cxx; sourceTree = "<group>"; };
 		FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glcanvas_osx.cpp; path = ../../src/osx/glcanvas_osx.cpp; sourceTree = "<group>"; };
 		FA7029BB5751398AA02D8C24 /* imagtga.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagtga.cpp; path = ../../src/common/imagtga.cpp; sourceTree = "<group>"; };
+		FA9DD56E399533A5BE7AAD16 /* jdarith.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdarith.c; path = ../../src/jpeg/jdarith.c; sourceTree = "<group>"; };
 		FADE850169F7347F83FE1499 /* xh_statbar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_statbar.cpp; path = ../../src/xrc/xh_statbar.cpp; sourceTree = "<group>"; };
 		FB46BC22F6B23909A938C561 /* regex.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = regex.cpp; path = ../../src/common/regex.cpp; sourceTree = "<group>"; };
 		FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dcbufcmn.cpp; path = ../../src/common/dcbufcmn.cpp; sourceTree = "<group>"; };
@@ -2477,9 +2471,6 @@
 		6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = {
 			isa = PBXGroup;
 			children = (
-				933D7637CAA43F6C99814BC5 /* arm_init.c */,
-				39507FA11D8838109A22B7DA /* filter_neon_intrinsics.c */,
-				D785BC35292138E0BB94EADC /* filter_neon.S */,
 				AF26BAB1F4733114926F1724 /* png.c */,
 				1A0650754DC2358CA5933B28 /* pngerror.c */,
 				91300EB871CC39ECBC430D48 /* pngget.c */,
@@ -2502,52 +2493,52 @@
 		7650A73F7FC9305EA62DAE86 /* libjpeg */ = {
 			isa = PBXGroup;
 			children = (
-				8EB76F786D7F3FF286948D22 /* jcomapi.c */,
-				5BEC6B3CAFB532CBB9F95D74 /* jutils.c */,
-				108517BCD39230E7A89BC943 /* jerror.c */,
-				14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */,
-				374E341C8703367686DEDE93 /* jmemnobs.c */,
+				573D0D15EE9E3E629D61EA65 /* jaricom.c */,
 				6EDDEEEC981133E8BA6A3998 /* jcapimin.c */,
 				F83172EE2DAE352FB969D4F2 /* jcapistd.c */,
-				725574EF98C4301989181CBF /* jctrans.c */,
-				2F41EDEB298538CC86FF6DC1 /* jcparam.c */,
-				59B19927E27F39ACB1D2BDA3 /* jdatadst.c */,
-				AA6C6739C3BD3EFA9CF71102 /* jcinit.c */,
-				3E3043D7BE9C33B59E900CCE /* jcmaster.c */,
-				664736BDE465350C9C4750E9 /* jcmarker.c */,
-				810EB7316DF3344197C78EC0 /* jcmainct.c */,
-				7FE0455EBDC63D82B2D88587 /* jcprepct.c */,
+				AA234ACC79743DA797601AA6 /* jcarith.c */,
 				E89AC104BF4F33A083F8B382 /* jccoefct.c */,
 				8EFF4707641D3F20AB602ED6 /* jccolor.c */,
-				53D06E47477B3E32BB6B915E /* jcsample.c */,
-				DC0FFDC7A6163F2DA73B84EB /* jchuff.c */,
-				E38569D873B6394F9E5B821C /* jcphuff.c */,
 				6DBF3053414F3C448312165A /* jcdctmgr.c */,
-				029486D6A2EC3DE0902A6A24 /* jfdctfst.c */,
-				93D07403FCA530D7A9FD2917 /* jfdctflt.c */,
-				90EC2A5B80EE3031BA4087B9 /* jfdctint.c */,
+				DC0FFDC7A6163F2DA73B84EB /* jchuff.c */,
+				AA6C6739C3BD3EFA9CF71102 /* jcinit.c */,
+				810EB7316DF3344197C78EC0 /* jcmainct.c */,
+				664736BDE465350C9C4750E9 /* jcmarker.c */,
+				3E3043D7BE9C33B59E900CCE /* jcmaster.c */,
+				8EB76F786D7F3FF286948D22 /* jcomapi.c */,
+				2F41EDEB298538CC86FF6DC1 /* jcparam.c */,
+				7FE0455EBDC63D82B2D88587 /* jcprepct.c */,
+				53D06E47477B3E32BB6B915E /* jcsample.c */,
+				725574EF98C4301989181CBF /* jctrans.c */,
 				86884BC843F6337EABF744BB /* jdapimin.c */,
 				1EF327CE8D7E3C11BFC6BD74 /* jdapistd.c */,
-				4549845C0751356A907C23E0 /* jdtrans.c */,
+				FA9DD56E399533A5BE7AAD16 /* jdarith.c */,
+				59B19927E27F39ACB1D2BDA3 /* jdatadst.c */,
 				DECAF5DD80383A2CA76EB383 /* jdatasrc.c */,
-				ED19EF377E653F71B1876259 /* jdmaster.c */,
-				CCF7564A2B733F759AA8496B /* jdinput.c */,
-				20E4A10BCD773C84AEC481A1 /* jdmarker.c */,
-				72869747E68E37998CB0A07E /* jdhuff.c */,
-				E85E680C62B63D4EBAB2E784 /* jdphuff.c */,
-				B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */,
 				F1A6F3936A0D31CBB58082BA /* jdcoefct.c */,
-				375FF97B202F3C359402D13E /* jdpostct.c */,
-				A5BBC1E494D33D028CA547FF /* jddctmgr.c */,
-				A0DCC5EF59143640BE13AD73 /* jidctfst.c */,
-				3C131F7BF8A83960ACB26242 /* jidctflt.c */,
-				1DAF0931E4AD3E6581D7FDBC /* jidctint.c */,
-				646743F6FDFE3ACFA1A79B40 /* jidctred.c */,
-				5FFCF47A161B3E08B19BFE14 /* jdsample.c */,
 				68B81FBDA49D3C1991B6356A /* jdcolor.c */,
+				A5BBC1E494D33D028CA547FF /* jddctmgr.c */,
+				72869747E68E37998CB0A07E /* jdhuff.c */,
+				CCF7564A2B733F759AA8496B /* jdinput.c */,
+				B2D390E5D5BF32D4AAA1E15A /* jdmainct.c */,
+				20E4A10BCD773C84AEC481A1 /* jdmarker.c */,
+				ED19EF377E653F71B1876259 /* jdmaster.c */,
+				0890779C662C35889A8C6C2E /* jdmerge.c */,
+				375FF97B202F3C359402D13E /* jdpostct.c */,
+				5FFCF47A161B3E08B19BFE14 /* jdsample.c */,
+				4549845C0751356A907C23E0 /* jdtrans.c */,
+				108517BCD39230E7A89BC943 /* jerror.c */,
+				93D07403FCA530D7A9FD2917 /* jfdctflt.c */,
+				029486D6A2EC3DE0902A6A24 /* jfdctfst.c */,
+				90EC2A5B80EE3031BA4087B9 /* jfdctint.c */,
+				3C131F7BF8A83960ACB26242 /* jidctflt.c */,
+				A0DCC5EF59143640BE13AD73 /* jidctfst.c */,
+				1DAF0931E4AD3E6581D7FDBC /* jidctint.c */,
+				14C2A7E01B4B3B168DB73B4F /* jmemmgr.c */,
+				374E341C8703367686DEDE93 /* jmemnobs.c */,
 				4BA14FFC0F4B3AE0B4D6B185 /* jquant1.c */,
 				02D9332D5C5632E981936E29 /* jquant2.c */,
-				0890779C662C35889A8C6C2E /* jdmerge.c */,
+				5BEC6B3CAFB532CBB9F95D74 /* jutils.c */,
 			);
 			name = libjpeg;
 			sourceTree = "<group>";
@@ -3148,7 +3139,6 @@
 				B839235BED6F3609BDB732B8 /* dndcmn.cpp in Sources */,
 				2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */,
 				F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */,
-				BB12132A86E2350AA47414CC /* arm_init.c in Sources */,
 				B1E30CF6CFA932F5A3DBA94F /* docview.cpp in Sources */,
 				F80C2290D67B345F9CF60085 /* dpycmn.cpp in Sources */,
 				6BF19C7CA9E93D989C210FE3 /* dseldlg.cpp in Sources */,
@@ -3314,7 +3304,6 @@
 				F016C51053373E658ED4C9A9 /* helpext.cpp in Sources */,
 				760C729E41D93CC1AA2B4E0D /* hyperlinkg.cpp in Sources */,
 				955D2199F1893D37BA2D7478 /* laywin.cpp in Sources */,
-				0F2FD12272023C869CE86008 /* filter_neon_intrinsics.c in Sources */,
 				CEE0D7A7D5D8323B9957A780 /* notifmsgg.cpp in Sources */,
 				1E17F95DD433379E8C18298C /* odcombo.cpp in Sources */,
 				6A10511265493FA2BB79CE4D /* propdlg.cpp in Sources */,
@@ -3532,53 +3521,52 @@
 				7A79D9AC608E3B8287229174 /* tif_warning.c in Sources */,
 				F2F2963D8ECC32D39FDBF101 /* tif_write.c in Sources */,
 				6E2C2E8AA1713ADE9C338379 /* tif_zip.c in Sources */,
-				FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */,
-				311840186794346AAAA42091 /* jutils.c in Sources */,
-				DE26572475EE336B8EEA5D92 /* jerror.c in Sources */,
-				18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */,
-				A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */,
+				5D3AD309AF39385EBF7D9DF8 /* jaricom.c in Sources */,
 				894D43C8F224394FB3171F26 /* jcapimin.c in Sources */,
 				743BB23211B336A6A0F26E57 /* jcapistd.c in Sources */,
-				CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */,
-				ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */,
-				76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */,
-				86003C8EB906304F9025F788 /* jcinit.c in Sources */,
-				C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */,
-				DB73248401573A5996D8E68D /* jcmarker.c in Sources */,
-				98DF13E96160304EBB905E73 /* jcmainct.c in Sources */,
-				32486A808EBC3E088598D51C /* jcprepct.c in Sources */,
+				7EB83F6375BF3E73ABE56C40 /* jcarith.c in Sources */,
 				CA5BD8ABDBA13641BBE7CD66 /* jccoefct.c in Sources */,
 				11DD420E32FB3EFB9DA0AB5B /* jccolor.c in Sources */,
-				50D7E093424138C88BB50D27 /* jcsample.c in Sources */,
-				BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */,
-				A212431902B8343CA6D229D3 /* jcphuff.c in Sources */,
 				BFA6983551B4310DA7C8A404 /* jcdctmgr.c in Sources */,
-				9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */,
-				CC6752334EB93A6B9C0391B3 /* filter_neon.S in Sources */,
-				0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */,
-				CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */,
+				BDB7B2AD26CB356B8BEAAECD /* jchuff.c in Sources */,
+				86003C8EB906304F9025F788 /* jcinit.c in Sources */,
+				98DF13E96160304EBB905E73 /* jcmainct.c in Sources */,
+				DB73248401573A5996D8E68D /* jcmarker.c in Sources */,
+				C6DF6F29407B34F29ED1B66D /* jcmaster.c in Sources */,
+				FCE5B139CBE73FCB804EF7DD /* jcomapi.c in Sources */,
+				ACD644CFA85A3B70A3E3B118 /* jcparam.c in Sources */,
+				32486A808EBC3E088598D51C /* jcprepct.c in Sources */,
+				50D7E093424138C88BB50D27 /* jcsample.c in Sources */,
+				CCE4ECA9CE883B008065C6FB /* jctrans.c in Sources */,
 				8B9C9FCB954F3596A4CED9A5 /* jdapimin.c in Sources */,
 				67EBCE5FA5FF36349ADF0916 /* jdapistd.c in Sources */,
-				11818B68C5263EB68D708845 /* jdtrans.c in Sources */,
+				8093A858CA9E3E9EA2D2185F /* jdarith.c in Sources */,
+				76A83A293C9F33BCB7DFDE26 /* jdatadst.c in Sources */,
 				4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */,
-				CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */,
-				14EF556997B0350F931EBE8E /* jdinput.c in Sources */,
-				61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */,
-				28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */,
-				D0DA11B814AF30A18585122F /* jdphuff.c in Sources */,
-				9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */,
 				B5470121BB4B35DE9C4836DA /* jdcoefct.c in Sources */,
-				E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */,
-				13854E7822783719A2530792 /* jddctmgr.c in Sources */,
-				48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */,
-				B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */,
-				C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */,
-				1A7FA35BDE4F35C685AB51A5 /* jidctred.c in Sources */,
-				D997FFC948B73FDA892DB531 /* jdsample.c in Sources */,
 				D9F02AFDA07D3857A905527C /* jdcolor.c in Sources */,
+				13854E7822783719A2530792 /* jddctmgr.c in Sources */,
+				28ADE8D385A53445A5451F23 /* jdhuff.c in Sources */,
+				14EF556997B0350F931EBE8E /* jdinput.c in Sources */,
+				9FD99E06F6613A1A958FAF6B /* jdmainct.c in Sources */,
+				61C3F7D495FB3E8BA402E4F8 /* jdmarker.c in Sources */,
+				CEBAAB0C77983358A601BFFE /* jdmaster.c in Sources */,
+				1E4832B42B95308299B767B9 /* jdmerge.c in Sources */,
+				E7D02E64384F37BC8939A2C4 /* jdpostct.c in Sources */,
+				D997FFC948B73FDA892DB531 /* jdsample.c in Sources */,
+				11818B68C5263EB68D708845 /* jdtrans.c in Sources */,
+				DE26572475EE336B8EEA5D92 /* jerror.c in Sources */,
+				0948599C4FD53611A09B52AB /* jfdctflt.c in Sources */,
+				9B3F9D04FB533D99B58BD519 /* jfdctfst.c in Sources */,
+				CEC6430AEB6E3200BFA75D07 /* jfdctint.c in Sources */,
+				B01C4EF49CF9390DA93A3502 /* jidctflt.c in Sources */,
+				48A1F28E04603A68A1E70318 /* jidctfst.c in Sources */,
+				C43A9650A9DC3372AB8F5F78 /* jidctint.c in Sources */,
+				18A318847EAC37F2B915F081 /* jmemmgr.c in Sources */,
+				A7692B4D8658347BA16EEB83 /* jmemnobs.c in Sources */,
 				15D65A523EB23EC385C05E0B /* jquant1.c in Sources */,
 				3C0EB1DDA5243E31B2D92CE2 /* jquant2.c in Sources */,
-				1E4832B42B95308299B767B9 /* jdmerge.c in Sources */,
+				311840186794346AAAA42091 /* jutils.c in Sources */,
 				94B1C88076793400810FAC30 /* png.c in Sources */,
 				1569BB4728693B6285623A23 /* pngerror.c in Sources */,
 				D9496139621533328AE727B6 /* pngget.c in Sources */,

From 986f61f33eac945a4a50896333e662060768a23d Mon Sep 17 00:00:00 2001
From: ali kettab <aliket1435@gmail.com>
Date: Wed, 14 Feb 2018 12:24:32 +0100
Subject: [PATCH 359/916] Avoid wxEVT_TEXT_ENTER when completion popup is shown
 in wxGTK

---
 src/gtk/textentry.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 84144d2289..9ffc06ace9 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -148,7 +148,19 @@ wx_gtk_insert_text_callback(GtkEditable *editable,
         g_signal_stop_emission_by_name (editable, "insert_text");
     }
 }
-}
+
+// GTK+ does not expose any mechanism that we can really rely on to detect if/when
+// the completion popup is shown or hidden. And the sole reliable way (for now) to
+// know its state is to connect to the "grab-notify" signal and be notified then
+// for its state. this is the best we can do for now than any other alternative.
+// (GtkEntryCompletion grabs/ungrabs keyboard and mouse events on popups/popdowns).
+
+static void
+wx_gtk_entry_parent_grab_notify (GtkWidget *widget,
+                                 gboolean was_grabbed,
+                                 wxTextAutoCompleteData *data);
+
+} // extern "C"
 
 //-----------------------------------------------------------------------------
 //  clipboard events: "copy-clipboard", "cut-clipboard", "paste-clipboard"
@@ -210,9 +222,23 @@ public:
     // for wxTextAutoCompleteFixed.
     virtual bool ChangeCompleter(wxTextCompleter* completer) = 0;
 
+    // We should toggle off wxTE_PROCESS_ENTER flag of our wxTextEntry while
+    // the completion popup is shown to let it see Enter event and process it
+    // on its own (e.g. to dismiss itself). This is done by "grab-notify" signal
+    // see wxTextCtrl::OnChar()
+    void ToggleProcessEnterFlag( bool toggleOff )
+    {
+        if ( toggleOff )
+            GetEditableWindow(m_entry)->SetWindowStyleFlag(m_origWinFlags & ~wxTE_PROCESS_ENTER);
+        else
+            GetEditableWindow(m_entry)->SetWindowStyleFlag(m_origWinFlags);
+    }
+
     void DisableCompletion()
     {
         gtk_entry_set_completion (GetGtkEntry(), NULL);
+
+        g_signal_handlers_disconnect_by_data (GetGtkEntry(), this);
     }
 
     virtual ~wxTextAutoCompleteData()
@@ -234,10 +260,17 @@ protected:
     explicit wxTextAutoCompleteData(wxTextEntry* entry)
         : m_entry(entry)
     {
+        // Save original flags
+        m_origWinFlags = GetEditableWindow(m_entry)->GetWindowStyleFlag();
+
         GtkEntryCompletion* const completion = gtk_entry_completion_new();
 
         gtk_entry_completion_set_text_column (completion, 0);
         gtk_entry_set_completion (GetGtkEntry(), completion);
+
+        g_signal_connect (GTK_WIDGET(GetGtkEntry()), "grab-notify",
+                          G_CALLBACK (wx_gtk_entry_parent_grab_notify),
+                          this);
     }
 
     // Provide access to wxTextEntry::GetEditableWindow() to the derived
@@ -270,6 +303,9 @@ protected:
     // The text entry we're associated with.
     wxTextEntry * const m_entry;
 
+    // The original flags of the associated wxTextEntry.
+    long m_origWinFlags;
+
     wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteData);
 };
 
@@ -410,6 +446,33 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteDynamic);
 };
 
+extern "C"
+{
+
+static void
+wx_gtk_entry_parent_grab_notify (GtkWidget *widget,
+                                 gboolean was_grabbed,
+                                 wxTextAutoCompleteData *data)
+{
+    g_return_if_fail (GTK_IS_ENTRY(widget));
+
+    bool toggleOff = false;
+
+    if ( gtk_widget_has_focus (widget) )
+    {
+        // If was_grabbed is FALSE that means the topmost grab widget ancestor
+        // of our GtkEntry becomes shadowed by a call to gtk_grab_add()
+        // which means that the GtkEntryCompletion popup window is actually
+        // shown on screen.
+
+        if ( !was_grabbed )
+            toggleOff = true;
+    }
+
+    data->ToggleProcessEnterFlag(toggleOff);
+}
+
+} // extern "C"
 
 // ============================================================================
 // wxTextEntry implementation

From dd5d755bc2354871efecba2ff6c18013c65d21fb Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Thu, 15 Feb 2018 19:54:42 +0100
Subject: [PATCH 360/916] Fix reading 64-bit values from ZIP headers

Specific values where not correctly converted because of
a signed/unsigned mismatch.
---
 src/common/zipstrm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 063c1edf4c..3b25275b7f 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -133,7 +133,7 @@ static inline wxUint64 CrackUint64(const char *m)
         (static_cast<wxUint64>(n[6]) << 48) |
         (static_cast<wxUint64>(n[5]) << 40) |
         (static_cast<wxUint64>(n[4]) << 32) |
-        (n[3] << 24) | (n[2] << 16) | (n[1] << 8) | n[0];
+        (static_cast<wxUint64>(n[3]) << 24) | (n[2] << 16) | (n[1] << 8) | n[0];
 }
 
 // Decode a little endian wxUint32 number from a character array

From 29f5eeb69db9a7751a3f396416baae0818f825fd Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Tue, 13 Feb 2018 23:16:58 +0100
Subject: [PATCH 361/916] Fix ZIP64 creation with individual files larger 4GB

If single files larger than 4GB where added the recorded file sizes
in the local file header where not updated correctly. Additionally
recorded file sizes in the central directory where in the wrong order
making it impossible to extract.

To enable adding files with unknown size which might be larger than 4GB
the new method wxZipOutputStream::SetFormat() is added.

Additionally a check has been added in case a file larger 4GB has been
written without ZIP64 info.
---
 include/wx/zipstrm.h   | 20 +++++++++-
 interface/wx/zipstrm.h | 44 ++++++++++++++++++++++
 src/common/zipstrm.cpp | 84 ++++++++++++++++++++++++++++++------------
 3 files changed, 124 insertions(+), 24 deletions(-)

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 9323cd101c..6191dcda81 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -110,6 +110,14 @@ enum wxZipFlags
     wxZIP_RESERVED          = 0xF000
 };
 
+enum wxZipArchiveFormat
+{
+    /// Default zip format
+    wxZIP_FORMAT_DEFAULT,
+    /// ZIP64 format
+    wxZIP_FORMAT_ZIP64
+};
+
 // Forward decls
 //
 class WXDLLIMPEXP_FWD_BASE wxZipEntry;
@@ -131,6 +139,8 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 // Zip Entry - holds the meta data for a file in the zip
 
+class wxDataOutputStream;
+
 class WXDLLIMPEXP_BASE wxZipEntry : public wxArchiveEntry
 {
 public:
@@ -225,7 +235,7 @@ private:
     wxArchiveEntry* DoClone() const wxOVERRIDE             { return ZipClone(); }
 
     size_t ReadLocal(wxInputStream& stream, wxMBConv& conv);
-    size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const;
+    size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv, wxZipArchiveFormat zipFormat);
 
     size_t ReadCentral(wxInputStream& stream, wxMBConv& conv);
     size_t WriteCentral(wxOutputStream& stream, wxMBConv& conv) const;
@@ -234,6 +244,9 @@ private:
     size_t WriteDescriptor(wxOutputStream& stream, wxUint32 crc,
                            wxFileOffset compressedSize, wxFileOffset size);
 
+    void WriteLocalFileSizes(wxDataOutputStream& ds) const;
+    void WriteLocalZip64ExtraInfo(wxOutputStream& stream) const;
+
     bool LoadExtraInfo(const char* extraData, wxUint16 extraLen, bool localInfo);
 
     wxUint16 GetInternalFlags(bool checkForUTF8) const;
@@ -256,6 +269,7 @@ private:
     wxUint16     m_DiskStart;          // for multidisk archives, not unsupported
     wxUint16     m_InternalAttributes; // bit 0 set for text files
     wxUint32     m_ExternalAttributes; // system specific depends on SystemMadeBy
+    wxUint16     m_z64infoOffset;      // Offset of ZIP64 local extra data for file sizes
 
     class wxZipMemory *m_Extra;
     class wxZipMemory *m_LocalExtra;
@@ -307,6 +321,9 @@ public:
     int  GetLevel() const                       { return m_level; }
     void WXZIPFIX SetLevel(int level);
 
+    void SetFormat(wxZipArchiveFormat format)   { m_format = format; };
+    wxZipArchiveFormat GetFormat() const        { return m_format; };
+
 protected:
     virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size) wxOVERRIDE;
     virtual wxFileOffset OnSysTell() const wxOVERRIDE      { return m_entrySize; }
@@ -351,6 +368,7 @@ private:
     wxFileOffset m_offsetAdjustment;
     wxString m_Comment;
     bool m_endrecWritten;
+    wxZipArchiveFormat m_format;
 
     wxDECLARE_NO_COPY_CLASS(wxZipOutputStream);
 };
diff --git a/interface/wx/zipstrm.h b/interface/wx/zipstrm.h
index 8a787b7031..c3d54ebfd4 100644
--- a/interface/wx/zipstrm.h
+++ b/interface/wx/zipstrm.h
@@ -80,6 +80,19 @@ enum wxZipFlags
     wxZIP_RESERVED          = 0xF000
 };
 
+/**
+    Zip archive format
+
+    @since 3.1.1
+*/
+enum wxZipArchiveFormat
+{
+    /// Default zip format
+    wxZIP_FORMAT_DEFAULT,
+    /// ZIP64 format
+    wxZIP_FORMAT_ZIP64
+};
+
 
 /**
     @class wxZipNotifier
@@ -558,11 +571,17 @@ public:
     //@{
     /**
         Takes ownership of @a entry and uses it to create a new entry in the zip.
+
+        If you do not specify a size and plan to put more than 4GB data into the
+        entry see SetFormat()
     */
     bool PutNextEntry(wxZipEntry* entry);
 
     /**
         Create a new entry with the given name, timestamp and size.
+
+        If you do not specify a size and plan to put more than 4GB data into the
+        entry see SetFormat()
     */
     bool PutNextEntry(const wxString& name,
                       const wxDateTime& dt = wxDateTime::Now(),
@@ -574,5 +593,30 @@ public:
         It is written at the end of the zip.
     */
     void SetComment(const wxString& comment);
+
+    /**
+        Set the format of the archive.
+
+        The normal zip format is limited to single files and the complete
+        archive smaller than 4GB with less then 65k files. If any of these
+        limits are exceed this class will automatically create a ZIP64 file.
+
+        However to support single entries with more than 4GB of data
+        (compressed or original) which sizes are unknown when adding the
+        entry with PutNextEntry() the format has to be set to
+        wxZIP_FORMAT_ZIP64 adding such entries.
+
+        @since 3.1.1
+    */
+    void SetFormat(wxZipArchiveFormat format);
+
+    /**
+        Get the format of the archive.
+
+        @since 3.1.1
+
+        @see SetFormat()
+    */
+    wxZipArchiveFormat GetFormat() const;
 };
 
diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 3b25275b7f..5269de93f7 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -757,6 +757,7 @@ wxZipEntry::wxZipEntry(
     m_DiskStart(0),
     m_InternalAttributes(0),
     m_ExternalAttributes(0),
+    m_z64infoOffset(0),
     m_Extra(NULL),
     m_LocalExtra(NULL),
     m_zipnotifier(NULL),
@@ -792,6 +793,7 @@ wxZipEntry::wxZipEntry(const wxZipEntry& e)
     m_DiskStart(e.m_DiskStart),
     m_InternalAttributes(e.m_InternalAttributes),
     m_ExternalAttributes(e.m_ExternalAttributes),
+    m_z64infoOffset(0),
     m_Extra(AddRef(e.m_Extra)),
     m_LocalExtra(AddRef(e.m_LocalExtra)),
     m_zipnotifier(NULL),
@@ -1127,7 +1129,7 @@ size_t wxZipEntry::ReadLocal(wxInputStream& stream, wxMBConv& conv)
     return LOCAL_SIZE + nameLen + extraLen;
 }
 
-size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
+size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv, wxZipArchiveFormat zipFormat)
 {
     wxString unixName = GetName(wxPATH_UNIX);
     const wxWX2MBbuf name_buf = unixName.mb_str(conv);
@@ -1135,9 +1137,11 @@ size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
     if (!name) name = "";
     wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name));
 
-    bool z64Required = m_CompressedSize > 0xffffffff || m_Size > 0xffffffff;
+    if ( (zipFormat == wxZIP_FORMAT_ZIP64) ||
+        m_CompressedSize >= 0xffffffff || m_Size >= 0xffffffff )
+        m_z64infoOffset = LOCAL_SIZE + nameLen;
     wxUint16 versionNeeded =
-        z64Required ? Z64_VERSION_NEEDED_TO_EXTRACT : int(m_VersionNeeded);
+        (m_z64infoOffset > 0) ? Z64_VERSION_NEEDED_TO_EXTRACT : int(m_VersionNeeded);
 
     wxDataOutputStream ds(stream);
 
@@ -1145,25 +1149,17 @@ size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
     ds.Write32(GetDateTime().GetAsDOS());
 
     ds.Write32(m_Crc);
-    ds.Write32(m_CompressedSize != wxInvalidOffset ?
-               LimitUint32(m_CompressedSize) : 0);
-    ds.Write32(m_Size != wxInvalidOffset ?
-               LimitUint32(m_Size) : 0);
+    WriteLocalFileSizes(ds);
 
     ds << nameLen;
     wxUint16 extraLen = wx_truncate_cast(wxUint16, GetLocalExtraLen());
-    if (z64Required)
+    if (m_z64infoOffset)
         extraLen += 20; // tag and 2x64bit file sizes
     ds.Write16(extraLen);
 
     stream.Write(name, nameLen);
-    if (z64Required)
-    {
-        ds.Write16(1);  // id
-        ds.Write16(16); // record size
-        ds.Write64(static_cast<wxInt64>(m_CompressedSize));
-        ds.Write64(static_cast<wxInt64>(m_Size));
-    }
+    if (m_z64infoOffset > 0)
+        WriteLocalZip64ExtraInfo(stream);
     if (GetLocalExtraLen())
         stream.Write(m_LocalExtra->GetData(), GetLocalExtraLen());
 
@@ -1264,7 +1260,7 @@ size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
     }
 
     wxUint16 versionNeeded =
-        (z64Required) ? Z64_VERSION_NEEDED_TO_EXTRACT : GetVersionNeeded();
+        (z64Required || m_z64infoOffset) ? Z64_VERSION_NEEDED_TO_EXTRACT : GetVersionNeeded();
 
     wxDataOutputStream ds(stream);
 
@@ -1288,10 +1284,10 @@ size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
     {
         ds.Write16(1); // tag
         ds.Write16(z64InfoLen); // record size
-        if (m_CompressedSize > 0xffffffff)
-            ds.Write64(static_cast<wxInt64>(m_CompressedSize));
         if (m_Size > 0xffffffff)
             ds.Write64(static_cast<wxInt64>(m_Size));
+        if (m_CompressedSize > 0xffffffff)
+            ds.Write64(static_cast<wxInt64>(m_CompressedSize));
         if (m_Offset > 0xffffffff)
             ds.Write64(static_cast<wxInt64>(m_Offset));
     }
@@ -1357,12 +1353,40 @@ size_t wxZipEntry::WriteDescriptor(wxOutputStream& stream, wxUint32 crc,
     wxDataOutputStream ds(stream);
 
     ds.Write32(crc);
-    ds.Write32(wx_truncate_cast(wxUint32, compressedSize));
-    ds.Write32(wx_truncate_cast(wxUint32, size));
+    WriteLocalFileSizes(ds);
 
     return SUMS_SIZE;
 }
 
+void wxZipEntry::WriteLocalFileSizes(wxDataOutputStream& ds) const
+{
+    wxUint32 compressedSize;
+    wxUint32 size;
+    if (m_z64infoOffset > 0)
+    {
+        compressedSize = 0xffffffff;
+        size = 0xffffffff;
+    }
+    else
+    {
+        compressedSize = m_CompressedSize != wxInvalidOffset ?
+             wx_truncate_cast(wxUint32, m_CompressedSize) : 0;
+        size = m_Size != wxInvalidOffset ?
+            wx_truncate_cast(wxUint32, m_Size) : 0;
+    }
+    ds.Write32(compressedSize);
+    ds.Write32(size);
+}
+
+void  wxZipEntry::WriteLocalZip64ExtraInfo(wxOutputStream& stream) const
+{
+    wxDataOutputStream ds(stream);
+    ds.Write16(1);  // id
+    ds.Write16(16); // record size
+    ds.Write64(static_cast<wxUint64>(m_Size));
+    ds.Write64(static_cast<wxUint64>(m_CompressedSize));
+}
+
 // Returns the flags as specified or including the UTF-8 flag if filename
 // contains non ASCII characters
 wxUint16 wxZipEntry::GetInternalFlags(bool checkForUTF8) const
@@ -2173,6 +2197,7 @@ void wxZipOutputStream::Init(int level)
     m_level = level;
     m_offsetAdjustment = wxInvalidOffset;
     m_endrecWritten = false;
+    m_format = wxZIP_FORMAT_DEFAULT;
 }
 
 wxZipOutputStream::~wxZipOutputStream()
@@ -2401,7 +2426,7 @@ void wxZipOutputStream::CreatePendingEntry(const void *buffer, size_t size)
         if (spPending->m_CompressedSize != wxInvalidOffset)
             spPending->m_Flags |= wxZIP_SUMS_FOLLOW;
 
-    m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv());
+    m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv(), m_format);
     m_lasterror = m_parent_o_stream->GetLastError();
 
     if (IsOk()) {
@@ -2454,7 +2479,7 @@ void wxZipOutputStream::CreatePendingEntry()
     }
 
     spPending->m_Flags &= ~wxZIP_SUMS_FOLLOW;
-    m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv());
+    m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv(), m_format);
 
     if (m_parent_o_stream->IsOk()) {
         m_entries.push_back(spPending.release());
@@ -2552,6 +2577,12 @@ bool wxZipOutputStream::CloseEntry()
             m_parent_o_stream->SeekO(headerOffset + SUMS_OFFSET);
             entry.WriteDescriptor(*m_parent_o_stream, m_crcAccumulator,
                                   compressedSize, m_entrySize);
+            if (entry.m_z64infoOffset > 0)
+            {
+                // Skip to ZIP64 extended information extra field
+                m_parent_o_stream->SeekO(headerOffset + entry.m_z64infoOffset);
+                entry.WriteLocalZip64ExtraInfo(*m_parent_o_stream);
+            }
             m_parent_o_stream->SeekO(here);
             m_lasterror = m_parent_o_stream->GetLastError();
         } else {
@@ -2565,7 +2596,14 @@ bool wxZipOutputStream::CloseEntry()
     m_store->Close();
     m_raw = false;
 
-    if (IsOk())
+    if (IsOk() && entry.m_z64infoOffset == 0 &&
+        (entry.m_CompressedSize > 0xffffffff || entry.m_Size > 0xffffffff))
+    {
+        wxLogError(_("error writing zip entry '%s': file too large without ZIP64"),
+            entry.GetName().c_str());
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    }
+    else if (IsOk())
         m_lasterror = m_parent_o_stream->GetLastError();
     else
         wxLogError(_("error writing zip entry '%s': bad crc or length"),

From 4265e671fd6c70bca7794a9006d84daad6dc6455 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 9 Feb 2018 23:26:36 +0100
Subject: [PATCH 362/916] Fix wxGTK compilation with Cairo 1.2

Avoid using cairo_clip_extents() function, which was added in 1.4,
unless we have at least this version at both compile- and run-time.

This allows the library to be compiled under CentOS 5, which only has
Cairo 1.2 and which is, unfortunately, still in use.
---
 src/generic/graphicc.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index bb30529579..fa7cea6226 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -2408,10 +2408,21 @@ void wxCairoContext::ResetClip()
 void wxCairoContext::GetClipBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble* h)
 {
     double x1, y1, x2, y2;
-    cairo_clip_extents(m_context, &x1, &y1, &x2, &y2);
-    // Check if we have an empty clipping box.
-    if ( x2 - x1 <= DBL_MIN || y2 - y1 <= DBL_MIN )
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 4, 0)
+    if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 4, 0) )
+    {
+        cairo_clip_extents(m_context, &x1, &y1, &x2, &y2);
+        // Check if we have an empty clipping box.
+        if ( x2 - x1 <= DBL_MIN || y2 - y1 <= DBL_MIN )
+            x1 = x2 = y1 = y2 = 0.0;
+    }
+    else
+#endif // Cairo >= 1.4
+    {
+        // There doesn't seem to be any way to get the clipping box with this
+        // ancient version.
         x1 = x2 = y1 = y2 = 0.0;
+    }
 
     if ( x )
         *x = x1;

From 5b2bb1ab8141b2edeb29ef3229c7993f4638e820 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 16 Feb 2018 13:27:13 +0100
Subject: [PATCH 363/916] Minor cleanup after the previous commit

Make m_origWinFlags const; keep just a single call to
SetWindowStyleFlag() and some space harmonization.

No real changes.
---
 src/gtk/textentry.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 9ffc06ace9..0a89c11129 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -226,19 +226,20 @@ public:
     // the completion popup is shown to let it see Enter event and process it
     // on its own (e.g. to dismiss itself). This is done by "grab-notify" signal
     // see wxTextCtrl::OnChar()
-    void ToggleProcessEnterFlag( bool toggleOff )
+    void ToggleProcessEnterFlag(bool toggleOff)
     {
+        long flags = m_origWinFlags;
         if ( toggleOff )
-            GetEditableWindow(m_entry)->SetWindowStyleFlag(m_origWinFlags & ~wxTE_PROCESS_ENTER);
-        else
-            GetEditableWindow(m_entry)->SetWindowStyleFlag(m_origWinFlags);
+            flags &= ~wxTE_PROCESS_ENTER;
+
+        GetEditableWindow(m_entry)->SetWindowStyleFlag(flags);
     }
 
     void DisableCompletion()
     {
         gtk_entry_set_completion (GetGtkEntry(), NULL);
 
-        g_signal_handlers_disconnect_by_data (GetGtkEntry(), this);
+        g_signal_handlers_disconnect_by_data(GetGtkEntry(), this);
     }
 
     virtual ~wxTextAutoCompleteData()
@@ -258,11 +259,9 @@ protected:
     }
 
     explicit wxTextAutoCompleteData(wxTextEntry* entry)
-        : m_entry(entry)
+        : m_entry(entry),
+          m_origWinFlags(GetEditableWindow(m_entry)->GetWindowStyleFlag())
     {
-        // Save original flags
-        m_origWinFlags = GetEditableWindow(m_entry)->GetWindowStyleFlag();
-
         GtkEntryCompletion* const completion = gtk_entry_completion_new();
 
         gtk_entry_completion_set_text_column (completion, 0);
@@ -304,7 +303,7 @@ protected:
     wxTextEntry * const m_entry;
 
     // The original flags of the associated wxTextEntry.
-    long m_origWinFlags;
+    const long m_origWinFlags;
 
     wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteData);
 };
@@ -458,7 +457,7 @@ wx_gtk_entry_parent_grab_notify (GtkWidget *widget,
 
     bool toggleOff = false;
 
-    if ( gtk_widget_has_focus (widget) )
+    if ( gtk_widget_has_focus(widget) )
     {
         // If was_grabbed is FALSE that means the topmost grab widget ancestor
         // of our GtkEntry becomes shadowed by a call to gtk_grab_add()

From 8577d9ddca969c6ce07a8081f6380954c4816bc2 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 14 Feb 2018 23:05:24 +0100
Subject: [PATCH 364/916] Fix build warnings in Direct2D related code

Regressions since df1456e4e2c2ac029ebcad17db5f5eb3478d1bc6 and
b936bfe85efaf0e179ec6ce071853934aecdf43a.

See https://github.com/wxWidgets/wxWidgets/pull/731
---
 src/msw/graphicsd2d.cpp | 4 ++--
 src/stc/PlatWX.cpp      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index 5d562102b0..87e1a4bd01 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -41,8 +41,8 @@
 #include <wincodec.h>
 
 #ifdef __MINGW64_TOOLCHAIN__
-#ifndef DRWITE_E_NOFONT
-#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)
+#ifndef DWRITE_E_NOFONT
+#define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002L)
 #endif
 #endif
 
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 431d7a7361..b46c5ef885 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -797,9 +797,9 @@ bool SurfaceFontDataD2D::Initialised() const
 // SurfaceDataD2D
 
 SurfaceDataD2D::SurfaceDataD2D(ScintillaWX* editor)
-    : m_editor(editor),
-      m_pD2DFactory(::wxD2D1Factory()),
-      m_pDWriteFactory(::wxDWriteFactory())
+    : m_pD2DFactory(::wxD2D1Factory()),
+      m_pDWriteFactory(::wxDWriteFactory()),
+      m_editor(editor)
 {
     if ( Initialised() )
     {
@@ -1107,7 +1107,7 @@ void SurfaceD2D::Release()
             m_clipsActive--;
         }
         hr = m_pRenderTarget->EndDraw();
-        if ( hr == D2DERR_RECREATE_TARGET && m_surfaceData && !m_ownRenderTarget )
+        if ( hr == (HRESULT)D2DERR_RECREATE_TARGET && m_surfaceData && !m_ownRenderTarget )
         {
             m_surfaceData->DiscardGraphicsResources();
             m_surfaceData->SetEditorPaintAbandoned();

From b552efedfc6830859053361bb867ba0ae464814b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 16 Feb 2018 15:57:05 +0100
Subject: [PATCH 365/916] Remove commented out line in wxOSX SetFocus()

No real changes, just remove a "TODO" comment as it seems it's safe to
do it after 5+ years (see f897d9ed1a1d1c4cdce789ef0cd2963e199b4595 which
added it).
---
 src/osx/cocoa/window.mm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 2c2c3e48a6..3f261bbee4 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -3045,8 +3045,6 @@ bool wxWidgetCocoaImpl::SetFocus()
     if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
         targetView = [(NSScrollView*) m_osxView documentView];
 
-    // TODO remove if no issues arise: should not raise the window, only assign focus
-    //[[m_osxView window] makeKeyAndOrderFront:nil] ;
     [[m_osxView window] makeFirstResponder: targetView] ;
     return true;
 }

From a3673be1559a60870379f9c87a757ae698f6aa2f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 16 Feb 2018 16:02:42 +0100
Subject: [PATCH 366/916] Clarify and improve wording of ZIP64 documentation

Try to make it more clear when SetFormat(wxZIP_FORMAT_ZIP64) needs to be
called and add some missing words.
---
 interface/wx/zipstrm.h | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/interface/wx/zipstrm.h b/interface/wx/zipstrm.h
index c3d54ebfd4..7b8f136997 100644
--- a/interface/wx/zipstrm.h
+++ b/interface/wx/zipstrm.h
@@ -87,9 +87,9 @@ enum wxZipFlags
 */
 enum wxZipArchiveFormat
 {
-    /// Default zip format
+    /// Default zip format: use ZIP64 if it is determined to be necessary.
     wxZIP_FORMAT_DEFAULT,
-    /// ZIP64 format
+    /// ZIP64 format: force the use of ZIP64 format.
     wxZIP_FORMAT_ZIP64
 };
 
@@ -599,12 +599,13 @@ public:
 
         The normal zip format is limited to single files and the complete
         archive smaller than 4GB with less then 65k files. If any of these
-        limits are exceed this class will automatically create a ZIP64 file.
+        limits are exceeded, this class will automatically create a ZIP64 file,
+        so in most situations calling SetFormat() is not necessary.
 
         However to support single entries with more than 4GB of data
-        (compressed or original) which sizes are unknown when adding the
-        entry with PutNextEntry() the format has to be set to
-        wxZIP_FORMAT_ZIP64 adding such entries.
+        (compressed or original) whose sizes are unknown when adding the
+        entry with PutNextEntry(), the format has to be set to
+        wxZIP_FORMAT_ZIP64 before adding such entries.
 
         @since 3.1.1
     */
@@ -613,10 +614,12 @@ public:
     /**
         Get the format of the archive.
 
+        This returns the value passed to SetFormat() and not necessarily the
+        actual archive format (e.g. this method could return
+        wxZIP_FORMAT_DEFAULT even if a ZIP64 will end up being created).
+
         @since 3.1.1
 
-        @see SetFormat()
-    */
     wxZipArchiveFormat GetFormat() const;
 };
 

From 28bf0e8687465e5d1f031faf6b07ff94a3cc76d7 Mon Sep 17 00:00:00 2001
From: Hugo Elias <hugo.elias@virgin.net>
Date: Sun, 24 Dec 2017 15:14:00 +0100
Subject: [PATCH 367/916] Add wxIMAGE_OPTION_GIF_TRANSPARENCY for GIF image
 loading

Allow to keep the originally defined transparent pixels colour instead
of replacing it with bright pink (which is still the default behaviour).

Closes #18014.
---
 docs/changes.txt        |  1 +
 include/wx/imaggif.h    |  4 +++
 interface/wx/image.h    | 16 +++++++++++
 src/common/gifdecod.cpp | 60 ++++++++++++++++++++++++++++++++---------
 4 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 373590c364..7fc8529dd0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -183,6 +183,7 @@ All (GUI):
 - Extend wxRendererNative::DrawGauge() to work for vertical gauges too.
 - Add wxHD_BITMAP_ON_RIGHT style to wxHeaderCtrl.
 - Send wxEVT_DATAVIEW_ITEM_EDITING_DONE when editing was cancelled too.
+- Add wxIMAGE_OPTION_GIF_TRANSPARENCY (Hugo Elias).
 
 wxGTK:
 
diff --git a/include/wx/imaggif.h b/include/wx/imaggif.h
index b59744c0cb..48b07dc147 100644
--- a/include/wx/imaggif.h
+++ b/include/wx/imaggif.h
@@ -20,6 +20,10 @@
 
 #define wxIMAGE_OPTION_GIF_COMMENT wxT("GifComment")
 
+#define wxIMAGE_OPTION_GIF_TRANSPARENCY           wxS("Transparency")
+#define wxIMAGE_OPTION_GIF_TRANSPARENCY_HIGHLIGHT wxS("Highlight")
+#define wxIMAGE_OPTION_GIF_TRANSPARENCY_UNCHANGED wxS("Unchanged")
+
 struct wxRGB;
 struct GifHashTableType;
 class WXDLLIMPEXP_FWD_CORE wxImageArray; // anidecod.h
diff --git a/interface/wx/image.h b/interface/wx/image.h
index 0b3c85b315..9a6f39737f 100644
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -93,6 +93,9 @@ enum wxImagePNGType
 #define wxIMAGE_OPTION_CUR_HOTSPOT_Y                    wxString("HotSpotY")
 
 #define wxIMAGE_OPTION_GIF_COMMENT                      wxString("GifComment")
+#define wxIMAGE_OPTION_GIF_TRANSPARENCY                 wxString("Transparency")
+#define wxIMAGE_OPTION_GIF_TRANSPARENCY_HIGHLIGHT       wxString("Highlight")
+#define wxIMAGE_OPTION_GIF_TRANSPARENCY_UNCHANGED       wxString("Unchanged")
 
 #define wxIMAGE_OPTION_PNG_FORMAT                       wxString("PngFormat")
 #define wxIMAGE_OPTION_PNG_BITDEPTH                     wxString("PngBitDepth")
@@ -1287,6 +1290,19 @@ public:
             PHOTOMETRIC_MINISWHITE or PHOTOMETRIC_MINISBLACK. The other values
             are taken care of.
 
+        Options specific to wxGIFHandler:
+        @li @c wxIMAGE_OPTION_GIF_TRANSPARENCY: How to deal with transparent pixels.
+            By default, the color of transparent pixels is changed to bright pink, so
+            that if the image is accidentally drawn without transparency, it will be
+            obvious.
+            Normally, this would not be noticed, as these pixels will not be rendered.
+            But in some cases it might be useful to load a GIF without making any
+            modifications to its colours.
+            Use @c wxIMAGE_OPTION_GIF_TRANSPARENCY_UNCHANGED to keep the colors correct.
+            Use @c wxIMAGE_OPTION_GIF_TRANSPARENCY_HIGHLIGHT to convert transparent pixels
+            to pink (default).
+            This option has been added in wxWidgets 3.1.1.
+
         @note
         Be careful when combining the options @c wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL,
         @c wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, and @c wxIMAGE_OPTION_TIFF_PHOTOMETRIC.
diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index bea6addc38..7872120eb7 100644
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -130,8 +130,10 @@ bool wxGIFDecoder::ConvertToImage(unsigned int frame, wxImage *image) const
     unsigned long i;
     int      transparent;
 
-    // just in case...
-    image->Destroy();
+    // Store the original value of the transparency option, before it is reset
+    // by Create().
+    const wxString&
+        transparency = image->GetOption(wxIMAGE_OPTION_GIF_TRANSPARENCY);
 
     // create the image
     wxSize sz = GetFrameSize(frame);
@@ -149,24 +151,58 @@ bool wxGIFDecoder::ConvertToImage(unsigned int frame, wxImage *image) const
     // set transparent colour mask
     if (transparent != -1)
     {
-        for (i = 0; i < GetNcolours(frame); i++)
+        if ( transparency.empty() ||
+                transparency == wxIMAGE_OPTION_GIF_TRANSPARENCY_HIGHLIGHT )
         {
-            if ((pal[3 * i + 0] == 255) &&
-                (pal[3 * i + 1] == 0) &&
-                (pal[3 * i + 2] == 255))
+            // By default, we assign bright pink to transparent pixels to make
+            // them perfectly noticeable if someone accidentally draws the
+            // image without taking transparency into account. Due to this use
+            // of pink, we need to change any existing image pixels with this
+            // colour to use something different.
+            for (i = 0; i < GetNcolours(frame); i++)
             {
-                pal[3 * i + 2] = 254;
+                if ((pal[3 * i + 0] == 255) &&
+                    (pal[3 * i + 1] == 0) &&
+                    (pal[3 * i + 2] == 255))
+                {
+                    pal[3 * i + 2] = 254;
+                }
             }
+
+            pal[3 * transparent + 0] = 255;
+            pal[3 * transparent + 1] = 0;
+            pal[3 * transparent + 2] = 255;
+
+            image->SetMaskColour(255, 0, 255);
         }
+        else if ( transparency == wxIMAGE_OPTION_GIF_TRANSPARENCY_UNCHANGED )
+        {
+            // Leave the GIF exactly as as it was, just adjust (in the least
+            // noticeable way, by just flipping a single bit) non-transparent
+            // pixels colour,
+            for (i = 0; i < GetNcolours(frame); i++)
+            {
+                if ((pal[3 * i + 0] == pal[3 * transparent + 0]) &&
+                    (pal[3 * i + 1] == pal[3 * transparent + 1]) &&
+                    (pal[3 * i + 2] == pal[3 * transparent + 2]))
+                {
+                    pal[3 * i + 2] ^= 1;
+                }
+            }
 
-        pal[3 * transparent + 0] = 255,
-        pal[3 * transparent + 1] = 0,
-        pal[3 * transparent + 2] = 255;
-
-        image->SetMaskColour(255, 0, 255);
+            image->SetMaskColour(pal[3 * transparent + 0],
+                                 pal[3 * transparent + 1],
+                                 pal[3 * transparent + 2]);
+        }
+        else
+        {
+            wxFAIL_MSG( wxS("Unknown wxIMAGE_OPTION_GIF_TRANSPARENCY value") );
+        }
     }
     else
+    {
         image->SetMask(false);
+    }
 
 #if wxUSE_PALETTE
     unsigned char r[256];

From 958d0081a571c0f0c8f5fbf20dbe958d9f4e4b8a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Feb 2018 13:17:54 +0100
Subject: [PATCH 368/916] Close documentation comment accidentally left open

Fix an accidental removal of the closing comment marker in
a3673be1559a60870379f9c87a757ae698f6aa2f.

See https://github.com/wxWidgets/wxWidgets/pull/730
---
 interface/wx/zipstrm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/wx/zipstrm.h b/interface/wx/zipstrm.h
index 7b8f136997..e07b8c8f24 100644
--- a/interface/wx/zipstrm.h
+++ b/interface/wx/zipstrm.h
@@ -619,7 +619,7 @@ public:
         wxZIP_FORMAT_DEFAULT even if a ZIP64 will end up being created).
 
         @since 3.1.1
-
+    */
     wxZipArchiveFormat GetFormat() const;
 };
 

From 3567cd5b00209b16350743df26c0b61bf635704c Mon Sep 17 00:00:00 2001
From: Kvaz1r <atomic.alarm@yandex.ru>
Date: Fri, 16 Feb 2018 21:02:54 +0200
Subject: [PATCH 369/916] Check that rows in wxDataViewListCtrl have the right
 size

Vectors passed to wxDataViewListCtrl::{Append,Insert,Prepend}Item()
functions must have the correct, i.e. equal to the column count, number
of items as otherwise accessing them later would result in a crash.

Add checks verifying that this is indeed the case.

Closes https://github.com/wxWidgets/wxWidgets/pull/724
---
 src/common/datavcmn.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 9043cf3fd4..d2d253ca2d 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -2209,6 +2209,7 @@ wxString wxDataViewListStore::GetColumnType( unsigned int pos ) const
 
 void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data )
 {
+    wxCHECK_RET( values.size() == GetColumnCount(), "wrong number of values" );
     wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
     line->m_values = values;
     m_data.push_back( line );
@@ -2218,6 +2219,7 @@ void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxUIntP
 
 void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data )
 {
+    wxCHECK_RET( values.size() == GetColumnCount(), "wrong number of values" );
     wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
     line->m_values = values;
     m_data.insert( m_data.begin(), line );
@@ -2228,6 +2230,7 @@ void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxUInt
 void wxDataViewListStore::InsertItem(  unsigned int row, const wxVector<wxVariant> &values,
                                        wxUIntPtr data )
 {
+    wxCHECK_RET( values.size() == GetColumnCount(), "wrong number of values" );
     wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
     line->m_values = values;
     m_data.insert( m_data.begin()+row, line );

From 23c2d67c08d4d70a56b7a114acfe0c2e23b104ce Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Feb 2018 13:29:57 +0100
Subject: [PATCH 370/916] Improve wxDataViewListCtrl::AppendItem() and related
 methods docs

Explain that the vector passed to {Append,Insert,Prepend}Item() must
have the same number of elements as there are columns in the control and
that no more columns can be added after adding any items.

See https://github.com/wxWidgets/wxWidgets/pull/724
---
 interface/wx/dataview.h | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 9ef314b359..d4aba98428 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -2960,17 +2960,29 @@ public:
     //@{
 
     /**
-        Appends an item (=row) to the control and store.
+        Appends an item (i.e.\ a row) to the control.
+
+        Note that the size of @a values vector must be exactly equal to the
+        number of columns in the control and that columns must not be modified
+        after adding any items to the control (or, conversely, items must not
+        be added before the columns are set up).
     */
     void AppendItem( const wxVector<wxVariant> &values, wxUIntPtr data = NULL );
 
     /**
-        Prepends an item (=row) to the control and store.
+        Prepends an item (i.e.\ a row) to the control.
+
+        See remarks for AppendItem() for preconditions of this method.
     */
     void PrependItem( const wxVector<wxVariant> &values, wxUIntPtr data = NULL );
 
     /**
-        Inserts an item (=row) to the control and store.
+        Inserts an item (i.e.\ a row) to the control.
+
+        See remarks for AppendItem() for preconditions of this method.
+
+        Additionally, @a row must be less than or equal to the current number
+        of items in the control (see GetItemCount()).
     */
     void InsertItem( unsigned int row, const wxVector<wxVariant> &values, wxUIntPtr data = NULL );
 

From ac608afdfedb618e0d47d995797f86d2e121f48a Mon Sep 17 00:00:00 2001
From: zonkx <36549474+zonkx@users.noreply.github.com>
Date: Fri, 16 Feb 2018 20:57:12 +0100
Subject: [PATCH 371/916] Round alpha correctly in bilinear image scaling code
 too

Add 0.5 to round the alpha values correctly too, just as it was already
done in f4c9767b493e9239bb3548ebb49e1c3d492e8bdc for the RGB values.

Closes https://github.com/wxWidgets/wxWidgets/pull/733
---
 src/common/image.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 31b69845cb..846eeee64f 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -844,7 +844,7 @@ wxImage wxImage::ResampleBilinear(int width, int height) const
             dst_data += 3;
 
             if ( src_alpha )
-                *dst_alpha++ = static_cast<unsigned char>(a1 * dy1 + a2 * dy);
+                *dst_alpha++ = static_cast<unsigned char>(a1 * dy1 + a2 * dy +.5);
         }
     }
 

From a52b839f66661fa6dc38a46479a217b0a55a3a38 Mon Sep 17 00:00:00 2001
From: Danny Scott <doscott@doscott.ca>
Date: Sat, 17 Feb 2018 13:40:41 +0100
Subject: [PATCH 372/916] Use vswhere to set environment variables for MSVS
 2017

Allow building official releases with MSVS 2017 without doing it from
its "developer command prompt" by using the vswhere utility to set up
the paths correctly.

Closes #18083.
---
 build/tools/msvs/findvs.bat        | 54 ++++++++++++++++++++++++++++++
 build/tools/msvs/officialbuild.bat | 19 ++++++++---
 2 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 build/tools/msvs/findvs.bat

diff --git a/build/tools/msvs/findvs.bat b/build/tools/msvs/findvs.bat
new file mode 100644
index 0000000000..7234f95302
--- /dev/null
+++ b/build/tools/msvs/findvs.bat
@@ -0,0 +1,54 @@
+@echo off
+
+rem This is used to set up the VS2017 and later (hopefully) environment.
+
+rem Called with two paramaters, the inclusive low and the exclusisve high.
+if "%1" == "" goto ERR_NOPARM
+if "%2" == "" goto ERR_NOPARM
+
+rem If not running from official build, remember where we are.
+
+if "%curr_dir%" == "" (
+  set curr_dir=%cd%
+)
+
+@echo Checking if vswhere in path
+vswhere 1>nul
+
+if errorlevel 9009 (
+@echo "vswhere not found, trying C:\Program Files (x86)\Microsoft Visual Studio\Installer"
+set "PATH=C:\Program Files (x86)\Microsoft Visual Studio\Installer;%PATH%"
+)
+
+vswhere 1>nul
+if errorlevel 9009 (
+@echo "vswhere not found"
+goto ERR_EXIT
+)
+
+for /f "usebackq tokens=*" %%i in (`vswhere -latest -version "[%1,%2)" -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
+  set InstallDir=%%i
+)
+
+if "%InstallDir%" == "" (
+  @echo Install directory not found
+  goto ERR_EXIT
+)
+
+if NOT exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
+  @echo Can't find an vsdevcmd.bat
+  goto ERR_EXIT
+)
+
+call "%InstallDir%"\Common7\Tools\vsdevcmd.bat
+
+rem Go back to where we were before vsdevcmd changed things.
+cd %curr_dir%
+
+goto end
+
+:ERR_NOPARM
+@echo Need to specifiy version min/max range, eg.: 15.0 16.0
+:ERR_EXIT
+exit /b 1
+:end
diff --git a/build/tools/msvs/officialbuild.bat b/build/tools/msvs/officialbuild.bat
index 4771bf9664..aca9161920 100755
--- a/build/tools/msvs/officialbuild.bat
+++ b/build/tools/msvs/officialbuild.bat
@@ -1,4 +1,6 @@
-ECHO ON
+@echo off
+
+rem SetLocal EnableDelayedExpansion
 
 if "%1" == "" goto ERR_NOPARM
 
@@ -22,11 +24,20 @@ set compvers="Unknown"
 
 if "%1" == "vc141" (
   @echo Building for vc141 / vs2017
-  @echo This will only work if the environment varialbe VS150COMNTOOLS is set
-  @echo or a VS2017 command prompt is used.
   set comp=141
   set compvers=vc141
-  call "%VS150COMNTOOLS%VsDevCmd.bat"
+
+  if NOT "%VS150COMNTOOLS%" == "" (
+    call "%VS150COMNTOOLS%VsDevCmd.bat"
+  )
+  if "%VS150COMNTOOLS%" == "" (
+    call %curr_dir%\findvs 15.0 16.0
+
+    if errorlevel 1 (
+      @echo vswhere.exe must be in your path or a VS2017 developer command prompt must be used.
+      goto end
+    )
+  )
 )
 if "%1" == "vc140" (
   @echo Building for vc140 / vs2015

From 0d640f8510ce9948e0ae0053801e4ef946b07da1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Feb 2018 13:44:16 +0100
Subject: [PATCH 373/916] Add a mailmap entry for Danny Scott

Let Git now about multiple email addresses used by Danny.
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index cbaae76c77..b56d2a70a3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,6 +4,7 @@ Daniel Kulp		<dan@kulp.com>				<dkulp@apache.org>
 Bogdan Iordanescu						<bogdan_iordanescu@yahoo.com>
 Cătălin Răceanu							<maildus@gmail.com>
 			<maildus@gmail.com>			<catalinr@users.noreply.github.com>
+Danny Scott		<doscott@doscott.ca>			<doscott@gmail.com>
 Dimitri Schoolwerth	<dimitri.schoolwerth@gmail.com>		<dimitri@schoolwerth.com>
 Hubert Talbot							<hubert.talbot64@gmail.com>
 Ilya Bizyaev							<bizyaev.game@yandex.ru>

From 6bb45751e574984b1300141bdb29ec29e6f3e8ec Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Feb 2018 14:17:13 +0100
Subject: [PATCH 374/916] Remove redundant ShouldForwardFromEditToCombo() check

No real changes, just avoid calling ShouldForwardFromEditToCombo() in
MSWProcessEditMsg() because this function is only called when the
message should be forwarded.

Also make the comment about the return value more clear.
---
 src/msw/combobox.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 87dcc61b3e..45c9be0ffd 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -277,15 +277,10 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
             break;
     }
 
-    if ( ShouldForwardFromEditToCombo(msg) )
-    {
-        // For all the messages forward from the edit control the
-        // result is not used.
-        WXLRESULT result;
-        return MSWHandleMessage(&result, msg, wParam, lParam);
-    }
-
-    return false;
+    // For all the messages forwarded from the edit control the result is not
+    // used and 0 must be returned if the message is handled.
+    WXLRESULT result;
+    return MSWHandleMessage(&result, msg, wParam, lParam);
 }
 
 bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)

From 4179375f3ebcf59fe3fcf7bc552c0bc7fb0de783 Mon Sep 17 00:00:00 2001
From: AliKet <aliket1435@gmail.com>
Date: Sat, 17 Feb 2018 14:49:38 +0100
Subject: [PATCH 375/916] Add custom auto-completer support to wxMSW wxComboBox
 too

Custom auto-completers didn't work for wxComboBox as it didn't generate
wxEVT_AFTER_CHAR event that the completion code in wxTextEntry relies on
to make them work.

Add this event generation to wxComboBox::MSWProcessEditMsg() to fix
this.

Closes https://github.com/wxWidgets/wxWidgets/pull/732
---
 src/msw/combobox.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 45c9be0ffd..e2072b31cc 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -280,7 +280,25 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
     // For all the messages forwarded from the edit control the result is not
     // used and 0 must be returned if the message is handled.
     WXLRESULT result;
-    return MSWHandleMessage(&result, msg, wParam, lParam);
+    bool processed = MSWHandleMessage(&result, msg, wParam, lParam);
+
+    // Special hack for WM_CHAR needed by wxTextEntry auto-completion support.
+    if ( !processed && msg == WM_CHAR )
+    {
+        // Here we reproduce what MSWDefWindowProc() does for this window
+        // itself, but for the EDIT window.
+        ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, (HWND)GetEditHWND(),
+                         msg, wParam, lParam);
+
+        // Send the event allowing completion code to do its thing.
+        wxKeyEvent event(CreateCharEvent(wxEVT_AFTER_CHAR, wParam, lParam));
+        HandleWindowEvent(event);
+
+        // Default window proc was already called, don't call it again.
+        processed = true;
+    }
+
+    return processed;
 }
 
 bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)

From 1dc1d66fe1b4c91d965fc7e0291a3d84284095de Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Feb 2018 14:49:54 +0100
Subject: [PATCH 376/916] Stop using Fn keys as accelerators in the widgets
 sample

This prevented them from being used for their usual purposes, e.g. F4
didn't open the combobox dropdown under MSW, which was annoying as it
made testing more difficult.

Just stop using the accelerators, especially as they could be only used
for less than half of pages anyhow.
---
 samples/widgets/widgets.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 8fa5ebb5fb..90ac92a059 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -541,7 +541,7 @@ void WidgetsFrame::InitBook()
     wxArrayString labels[MAX_PAGES];
 
     wxMenu *menuPages = new wxMenu;
-    unsigned int nPage = 0, nFKey = 0;
+    unsigned int nPage = 0;
     int cat, imageId = 1;
 
     // we need to first create all pages and only then add them to the book
@@ -579,16 +579,9 @@ void WidgetsFrame::InitBook()
             labels[cat].Add(info->GetLabel());
             if ( cat == ALL_PAGE )
             {
-                wxString radioLabel(info->GetLabel());
-                nFKey++;
-                if ( nFKey <= 12 )
-                {
-                    radioLabel << wxT("\tF" ) << nFKey;
-                }
-
                 menuPages->AppendRadioItem(
                             Widgets_GoToPage + nPage,
-                            radioLabel
+                            info->GetLabel()
                            );
 #if !USE_TREEBOOK
                 // consider only for book in book architecture

From c83ddec75f26749ea92c34995f892030e8dad441 Mon Sep 17 00:00:00 2001
From: New Pagodi <NewPagodi@users.noreply.github.com>
Date: Sat, 17 Feb 2018 19:49:44 +0100
Subject: [PATCH 377/916] Fix drawing call tips in wxSTC when using Direct2D

Use the correct window as the containing control in SurfaceD2D.

Closes #18080.
---
 src/stc/PlatWX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index b46c5ef885..303bfbf9d6 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -1036,7 +1036,7 @@ void SurfaceD2D::Init(SurfaceID sid, WindowID wid)
     if ( win && win->GetName() == "wxSTCCallTip" )
         win = win->GetParent();
 
-    wxStyledTextCtrl* const stc = wxDynamicCast(wid, wxStyledTextCtrl);
+    wxStyledTextCtrl* const stc = wxDynamicCast(win, wxStyledTextCtrl);
     if ( stc )
     {
         wxDC* const dc = static_cast<wxDC*>(sid);

From 8278f7b618af03ef9fdba6a9eab58f560c084961 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Feb 2018 17:00:00 +0100
Subject: [PATCH 378/916] Fix crash when changing auto-completer in wxGTK

Recent changes resulted in crashes when handling grab-notify signal in
an already deleted object.

Fix this by disconnecting our grab-notify handler when destroying the
object, unless the entire associated wxTextEntry is being destroyed (in
which case no such signals risk to be generated anyhow).

In order to be able to do this safely, store the widget to whose signal
we had connected and check that the widget is still valid before
disconnecting. This also allows to simplify the code by getting rid of
DisableCompletion() and just doing the cleanup in dtor.

Closes #18084.
---
 src/gtk/textentry.cpp | 47 ++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 0a89c11129..d34229d3b2 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -235,18 +235,19 @@ public:
         GetEditableWindow(m_entry)->SetWindowStyleFlag(flags);
     }
 
-    void DisableCompletion()
-    {
-        gtk_entry_set_completion (GetGtkEntry(), NULL);
-
-        g_signal_handlers_disconnect_by_data(GetGtkEntry(), this);
-    }
-
     virtual ~wxTextAutoCompleteData()
     {
-        // Do not call DisableCompletion() here, it would result in problems
-        // when this object is destroyed from wxTextEntry dtor as the real
-        // control (e.g. wxTextCtrl) is already destroyed by then.
+        // Note that we must not use m_entry here because this could result in
+        // using an already half-destroyed wxTextEntry when we're destroyed
+        // from its dtor (which is executed after wxTextCtrl dtor, which had
+        // already destroyed the actual entry). So use the stored widget
+        // instead and only after checking that it is still valid.
+        if ( GTK_IS_ENTRY(m_widgetEntry) )
+        {
+            gtk_entry_set_completion(m_widgetEntry, NULL);
+
+            g_signal_handlers_disconnect_by_data(m_widgetEntry, this);
+        }
     }
 
 protected:
@@ -260,14 +261,15 @@ protected:
 
     explicit wxTextAutoCompleteData(wxTextEntry* entry)
         : m_entry(entry),
+          m_widgetEntry(entry->GetEntry()),
           m_origWinFlags(GetEditableWindow(m_entry)->GetWindowStyleFlag())
     {
         GtkEntryCompletion* const completion = gtk_entry_completion_new();
 
         gtk_entry_completion_set_text_column (completion, 0);
-        gtk_entry_set_completion (GetGtkEntry(), completion);
+        gtk_entry_set_completion(m_widgetEntry, completion);
 
-        g_signal_connect (GTK_WIDGET(GetGtkEntry()), "grab-notify",
+        g_signal_connect (m_widgetEntry, "grab-notify",
                           G_CALLBACK (wx_gtk_entry_parent_grab_notify),
                           this);
     }
@@ -280,8 +282,6 @@ protected:
         return entry->GetEditableWindow();
     }
 
-    GtkEntry* GetGtkEntry() const { return m_entry->GetEntry(); }
-
     // Helper function for appending a string to GtkListStore.
     void AppendToStore(GtkListStore* store, const wxString& s)
     {
@@ -293,7 +293,7 @@ protected:
     // Really change the completion model (which may be NULL).
     void UseModel(GtkListStore* store)
     {
-        GtkEntryCompletion* const c = gtk_entry_get_completion (GetGtkEntry());
+        GtkEntryCompletion* const c = gtk_entry_get_completion(m_widgetEntry);
         gtk_entry_completion_set_model (c, GTK_TREE_MODEL(store));
         gtk_entry_completion_complete (c);
     }
@@ -302,6 +302,9 @@ protected:
     // The text entry we're associated with.
     wxTextEntry * const m_entry;
 
+    // And its GTK widget.
+    GtkEntry* const m_widgetEntry;
+
     // The original flags of the associated wxTextEntry.
     const long m_origWinFlags;
 
@@ -709,6 +712,9 @@ bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
     // Try to update the existing data first.
     if ( !m_autoCompleteData || !m_autoCompleteData->ChangeStrings(choices) )
     {
+        delete m_autoCompleteData;
+        m_autoCompleteData = NULL;
+
         // If it failed, try creating a new object for fixed completion.
         wxTextAutoCompleteFixed* const ac = wxTextAutoCompleteFixed::New(this);
         if ( !ac )
@@ -716,7 +722,6 @@ bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
 
         ac->ChangeStrings(choices);
 
-        delete m_autoCompleteData;
         m_autoCompleteData = ac;
     }
 
@@ -730,12 +735,6 @@ bool wxTextEntry::DoAutoCompleteCustom(wxTextCompleter *completer)
     {
         if ( m_autoCompleteData )
         {
-            // This is not done in dtor because it's unnecessary when replacing
-            // one completer with another one, and even dangerous, when the
-            // control is being destroyed anyhow, so we need to call it
-            // explicitly here to really disable completion.
-            m_autoCompleteData->DisableCompletion();
-
             delete m_autoCompleteData;
             m_autoCompleteData = NULL;
         }
@@ -748,6 +747,9 @@ bool wxTextEntry::DoAutoCompleteCustom(wxTextCompleter *completer)
         if ( !m_autoCompleteData ||
                 !m_autoCompleteData->ChangeCompleter(completer) )
         {
+            delete m_autoCompleteData;
+            m_autoCompleteData = NULL;
+
             wxTextAutoCompleteDynamic* const
                 ac = wxTextAutoCompleteDynamic::New(this);
             if ( !ac )
@@ -755,7 +757,6 @@ bool wxTextEntry::DoAutoCompleteCustom(wxTextCompleter *completer)
 
             ac->ChangeCompleter(completer);
 
-            delete m_autoCompleteData;
             m_autoCompleteData = ac;
         }
     }

From a4487c056ba9b22144cea974ec86dcc0267a7bc2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Feb 2018 17:13:34 +0100
Subject: [PATCH 379/916] Preserve style changes in wxGTK wxTextEntry
 auto-complete code

Don't overwrite the current window style with the style that it had when
AutoComplete() was called in wxGTK code, just turn wxTE_PROCESS_ENTER
off or on, without touching the other bits.

This still can result in setting wxTE_PROCESS_ENTER bit itself
unexpectedly if it somehow is changed while the completion popup is
shown, but this shouldn't happen often (if ever) in practice and, at
least, the other bits are preserved no matter what.

See https://github.com/wxWidgets/wxWidgets/pull/729
---
 src/gtk/textentry.cpp | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index d34229d3b2..c608a609de 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -228,11 +228,33 @@ public:
     // see wxTextCtrl::OnChar()
     void ToggleProcessEnterFlag(bool toggleOff)
     {
-        long flags = m_origWinFlags;
-        if ( toggleOff )
-            flags &= ~wxTE_PROCESS_ENTER;
+        wxWindow* const win = GetEditableWindow(m_entry);
 
-        GetEditableWindow(m_entry)->SetWindowStyleFlag(flags);
+        long flags = win->GetWindowStyleFlag();
+        if ( toggleOff )
+        {
+            // Store the original window flags before we change them.
+            m_hadProcessEnterFlag = (flags & wxTE_PROCESS_ENTER) != 0;
+            if ( !m_hadProcessEnterFlag )
+            {
+                // No need to do anything, it was already off.
+                return;
+            }
+
+            flags &= ~wxTE_PROCESS_ENTER;
+        }
+        else // Restore the original flags.
+        {
+            if ( !m_hadProcessEnterFlag )
+            {
+                // We hadn't turned it off, no need to turn it back on.
+                return;
+            }
+
+            flags |= wxTE_PROCESS_ENTER;
+        }
+
+        win->SetWindowStyleFlag(flags);
     }
 
     virtual ~wxTextAutoCompleteData()
@@ -261,9 +283,11 @@ protected:
 
     explicit wxTextAutoCompleteData(wxTextEntry* entry)
         : m_entry(entry),
-          m_widgetEntry(entry->GetEntry()),
-          m_origWinFlags(GetEditableWindow(m_entry)->GetWindowStyleFlag())
+          m_widgetEntry(entry->GetEntry())
     {
+        // This will be really set in ToggleProcessEnterFlag().
+        m_hadProcessEnterFlag = false;
+
         GtkEntryCompletion* const completion = gtk_entry_completion_new();
 
         gtk_entry_completion_set_text_column (completion, 0);
@@ -305,8 +329,9 @@ protected:
     // And its GTK widget.
     GtkEntry* const m_widgetEntry;
 
-    // The original flags of the associated wxTextEntry.
-    const long m_origWinFlags;
+    // True if the window had wxTE_PROCESS_ENTER flag before we turned it off
+    // in ToggleProcessEnterFlag().
+    bool m_hadProcessEnterFlag;
 
     wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteData);
 };

From cad824d089aa8610bb6575e42d0e6fd30f04e433 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Feb 2018 19:06:32 +0100
Subject: [PATCH 380/916] Let windows with wxWANTS_CHARS have TAB presses under
 Mac

This notably fixes the use of TAB in wxStyledTextCtrl, where it's
supposed to be handled by the control itself and not as a navigation
key, but is more general than this.

Fixes a regression from 8bca6deda302ae7e26da2892160f2784aa4335bb.

Closes #17999.
---
 src/osx/cocoa/window.mm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 3f261bbee4..e7f5e4fc58 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -3552,8 +3552,9 @@ bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
 
 bool wxWidgetCocoaImpl::ShouldHandleKeyNavigation(const wxKeyEvent &WXUNUSED(event)) const
 {
-    // Only controls that intercept tabs for different behavior should return false (ie wxTE_PROCESS_TAB)
-    return true;
+    // If the window wants to have all keys, let it have it and don't process
+    // TAB as key navigation event.
+    return !m_wxPeer->HasFlag(wxWANTS_CHARS);
 }
 
 bool wxWidgetCocoaImpl::DoHandleKeyNavigation(const wxKeyEvent &event)

From bf418320b7e0c1659a768e439372d9eafb33c36b Mon Sep 17 00:00:00 2001
From: "Stefano D. Mtangoo" <mwinjilisti@gmail.com>
Date: Sat, 17 Feb 2018 19:10:11 +0100
Subject: [PATCH 381/916] Work around crash in wxStyledTextCtrl under Mac

When not using double buffering, double-clicking to select text in the
control results in crashes.

Avoid this by using double-buffering under Mac, even though it shouldn't
be necessary.

This reverts the changes of cb799483b7cf19f0e2db5df857be5e79dafab38d
under Mac.

See #18085.
---
 src/stc/stc.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index b4602db8da..620e0b9197 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -224,8 +224,9 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
     // STC doesn't support RTL languages at all
     SetLayoutDirection(wxLayout_LeftToRight);
 
-    // Rely on native double buffering by default.
-#if wxALWAYS_NATIVE_DOUBLE_BUFFER
+    // Rely on native double buffering by default, except under Mac where it
+    // doesn't work for some reason, see #18085.
+#if wxALWAYS_NATIVE_DOUBLE_BUFFER && !defined(__WXMAC__)
     SetBufferedDraw(false);
 #else
     SetBufferedDraw(true);

From 379a404f9804ac044df44f18907e192917fec8aa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 18 Feb 2018 21:30:31 +0100
Subject: [PATCH 382/916] Update release notes for final 3.1.1

Remove all references to RC.
---
 docs/release.md | 112 ++++++++++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 57 deletions(-)

diff --git a/docs/release.md b/docs/release.md
index 5f43994e41..89b2d403ce 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -1,32 +1,30 @@
-*WARNING* This is a release candidate and not the final 3.1.1 release yet.
-
 Welcome to wxWidgets, a free and open source cross-platform C++ framework for writing advanced GUI applications using native controls.
 
 wxWidgets 3.1.1 is the second release in the 3.1 development branch. This release is a "development" one as it makes (very few) incompatible API changes compared to 3.0 and does not guarantee the ABI stability, unlike the 3.0.x series. It is not inherently more buggy or less stable than the "stable" releases and you're encouraged to use it. If you're already using 3.0, upgrading shouldn't require any special effort, so please try it out.
 
-Please see [**README**](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1-rc/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1-rc/docs/changes.txt) for details of the changes in it.
+Please see [**README**](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/changes.txt) for details of the changes in it.
 
 
 ## Source Files and Documentation
 
 If you intend to build wxWidgets from sources (which is recommended), please do **NOT** download the files using the "Source code" links just above, which are automatically generated by GitHub and don't contain the submodules sources which are necessary for building wxWidgets.
 
-Instead, download one of [wxWidgets-3.1.1-rc.zip](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.zip) or [wxWidgets-3.1.1-rc.7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.7z), for much smaller size, for Microsoft Windows systems or [wxWidgets-3.1.1-rc.tar.bz2](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxWidgets-3.1.1-rc.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform.
+Instead, download one of [wxWidgets-3.1.1.zip](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.zip) or [wxWidgets-3.1.1.7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.7z), for much smaller size, for Microsoft Windows systems or [wxWidgets-3.1.1.tar.bz2](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform.
 
 In addition, we provide archives containing the documentation in either HTML or Microsoft CHM formats. Notice that the documentation is also [available online](http://docs.wxwidgets.org/3.1).
 
-Finally, Microsoft Windows users may download [Setup.exe file](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1-rc/wxMSW-3.1.1-rc-Setup.exe) containing both sources and documentation, however please note that this file does _not_ contain any binaries, please see below for those.
+Finally, Microsoft Windows users may download [Setup.exe file](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxMSW-3.1.1-Setup.exe) containing both sources and documentation, however please note that this file does _not_ contain any binaries, please see below for those.
 
 To verify your download please use the following SHA-1 checksums:
 
-    d3f8a8f5bd7b5dee2176a14fce93b3767d217f00  wxMSW-3.1.1-rc-Setup.exe
-    d8de5b7075ba7674e8c0e2cd722259d48e627dc7  wxWidgets-3.1.1-rc-docs-chm.zip
-    000c818361eddd403557aacf8b63ac0210335919  wxWidgets-3.1.1-rc-docs-html.tar.bz2
-    f5ec0051a4fe620dbeee5262ba1ce30922e5d85c  wxWidgets-3.1.1-rc-docs-html.zip
-    f4d1bda81ef27fb232eb58f88730cfeafb35b477  wxWidgets-3.1.1-rc-headers.7z
-    36efadd43d9994495d71a698922113a0d8d46b73  wxWidgets-3.1.1-rc.7z
-    2968073dffa60c1ad5016d1b0d4eedb5b701efdf  wxWidgets-3.1.1-rc.tar.bz2
-    84d7e7a8347fc727801a407302e2801ee7bfc608  wxWidgets-3.1.1-rc.zip
+    0000000000000000000000000000000000000000  wxMSW-3.1.1-Setup.exe
+    0000000000000000000000000000000000000000  wxWidgets-3.1.1-docs-chm.zip
+    0000000000000000000000000000000000000000  wxWidgets-3.1.1-docs-html.tar.bz2
+    0000000000000000000000000000000000000000  wxWidgets-3.1.1-docs-html.zip
+    0000000000000000000000000000000000000000  wxWidgets-3.1.1-headers.7z
+    0000000000000000000000000000000000000000  wxWidgets-3.1.1.7z
+    0000000000000000000000000000000000000000  wxWidgets-3.1.1.tar.bz2
+    0000000000000000000000000000000000000000  wxWidgets-3.1.1.zip
 
 ## Binaries
 
@@ -55,50 +53,50 @@ End users may download one of `wxMSW-3.1.1_vcXXX_ReleaseDLL.7z` or `wxMSW-3.1.1_
 
 To verify your download please use the following SHA-1 checksums:
 
-    26836356a6e77091caad508d765b60899c30892e wxMSW-3.1.1-rc_gcc510TDM_Dev.7z
-    b7eb62bdb152e5539fd5e9ecc105d322fadba3ec wxMSW-3.1.1-rc_gcc510TDM_ReleaseDLL.7z
-    77c84112ffcad3b2c649d9fd3adcd4e140945b61 wxMSW-3.1.1-rc_gcc510TDM_x64_Dev.7z
-    24e775999ea19b641a11850af0547ac81fd1bc6b wxMSW-3.1.1-rc_gcc510TDM_x64_ReleaseDLL.7z
-    ead74e56b9d22e578addd52b8246eadfddbd93d1 wxMSW-3.1.1-rc_gcc720_Dev.7z
-    7c43aa6937853d1113430ce1b31a0747e89a6b47 wxMSW-3.1.1-rc_gcc720_ReleaseDLL.7z
-    298016eb7cb2a509b4dedc5a8c09eb2b98950698 wxMSW-3.1.1-rc_gcc720_x64_Dev.7z
-    741087b3fcbe809ae60563e19cf0db21b571725a wxMSW-3.1.1-rc_gcc720_x64_ReleaseDLL.7z
-    7537561f1a93ca06a37be730ca9f81506da665db wxMSW-3.1.1-rc_vc90_Dev.7z
-    3df72df959b4ae8279cb27519ea5b114003d17f6 wxMSW-3.1.1-rc_vc90_ReleaseDLL.7z
-    1c506db10f555f11ae17ba08430482d81be1c0db wxMSW-3.1.1-rc_vc90_ReleasePDB.7z
-    3b45c2680499b3e397264f0ae8f6d2617a139b8a wxMSW-3.1.1-rc_vc90_x64_Dev.7z
-    3ba14408edad9b325bc0dd0ba98197954ce2db5e wxMSW-3.1.1-rc_vc90_x64_ReleaseDLL.7z
-    e8c5f145a89a556069221886e7644c3b07d2799f wxMSW-3.1.1-rc_vc90_x64_ReleasePDB.7z
-    936f454b547ec17e3cefdf4f43c9af8738f803ca wxMSW-3.1.1-rc_vc100_Dev.7z
-    940c8c3923be2ad4a71e3de349657bb5443de918 wxMSW-3.1.1-rc_vc100_ReleaseDLL.7z
-    8a4dedfc318272b182a83f5947b5224a7f17c532 wxMSW-3.1.1-rc_vc100_ReleasePDB.7z
-    c68ccae3a29096e7f78732c65cddabeee5e226b6 wxMSW-3.1.1-rc_vc100_x64_Dev.7z
-    ea540496a5875454ff90ba3f6ea65ddcacc9a4a5 wxMSW-3.1.1-rc_vc100_x64_ReleaseDLL.7z
-    8100a2bfab8909de47fb483bb8bd78c03ddb4df5 wxMSW-3.1.1-rc_vc100_x64_ReleasePDB.7z
-    1fa4c99e48cbf0f50289d07f6ceae8a71be62a19 wxMSW-3.1.1-rc_vc110_Dev.7z
-    2e44afb8f7080fc673af2abb456cf176dad4b1a2 wxMSW-3.1.1-rc_vc110_ReleaseDLL.7z
-    730e2e1db22e3bc308284562c8ecfbfc3f6a6e9e wxMSW-3.1.1-rc_vc110_ReleasePDB.7z
-    5c2578deba24a1daf61ae08a7daa1a8662dbe8c9 wxMSW-3.1.1-rc_vc110_x64_Dev.7z
-    57da37116c3b80d4f765b85fafcb30e2cb200dab wxMSW-3.1.1-rc_vc110_x64_ReleaseDLL.7z
-    6700dbc853484d385753ad4361c16c48c4bd3e3a wxMSW-3.1.1-rc_vc110_x64_ReleasePDB.7z
-    b4dac305e230ae0c9bfcd07fee632a4aad835329 wxMSW-3.1.1-rc_vc120_Dev.7z
-    c986f27c6f88b9feb7706f4bff5f50b68b14cec2 wxMSW-3.1.1-rc_vc120_ReleaseDLL.7z
-    ca5ca15eadc0d1ca6b79824bb9704215c7945195 wxMSW-3.1.1-rc_vc120_ReleasePDB.7z
-    c9a4850228a1b42d1606d1043b9a3d0b334727a9 wxMSW-3.1.1-rc_vc120_x64_Dev.7z
-    6a02c05ab72b06e30ef9f9e355956f3957c86eb1 wxMSW-3.1.1-rc_vc120_x64_ReleaseDLL.7z
-    2c36680649bf3093536e20067d30e1242a6023d3 wxMSW-3.1.1-rc_vc120_x64_ReleasePDB.7z
-    aeede25c3de0f975c811fbce634c5aaf354195fa wxMSW-3.1.1-rc_vc140_Dev.7z
-    900203c8f300214e038fbb1ae10ba3eb1a114740 wxMSW-3.1.1-rc_vc140_ReleaseDLL.7z
-    788c9b39c0c298735313de425c4ca7986b163908 wxMSW-3.1.1-rc_vc140_ReleasePDB.7z
-    68ae8e1c42ff0105ea186c0d32cee95861a1a5a4 wxMSW-3.1.1-rc_vc140_x64_Dev.7z
-    550f3d0f52f4d21babf03b66e26145787eb9d922 wxMSW-3.1.1-rc_vc140_x64_ReleaseDLL.7z
-    5b57a82a1799ae1a05a385685ce9f729e3fed056 wxMSW-3.1.1-rc_vc140_x64_ReleasePDB.7z
-    5990f6bf1d157e2b7e8f254d2a60dfd682971790 wxMSW-3.1.1-rc_vc141_Dev.7z
-    fde6140a4348621a1b876ed6c289778d4312f2f1 wxMSW-3.1.1-rc_vc141_ReleaseDLL.7z
-    824eef674529ca75e620dac6dce45cc6a0c2328b wxMSW-3.1.1-rc_vc141_ReleasePDB.7z
-    a4b4014c1a1289d798597ebc810a01e88edf53bc wxMSW-3.1.1-rc_vc141_x64_Dev.7z
-    285afbcc27e18344654183d8b9e6beca9a9eab92 wxMSW-3.1.1-rc_vc141_x64_ReleaseDLL.7z
-    82685386d8291dd5012ef00ced5fdc45cb0d8a04 wxMSW-3.1.1-rc_vc141_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc720_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc720_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc720_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc720_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_ReleasePDB.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_x64_Dev.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_x64_ReleaseDLL.7z
+    0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_x64_ReleasePDB.7z
 
 
 ## Reporting Problems

From c3be5d7550812c3cfbb55de051772064c79d7b6b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 18 Feb 2018 22:45:02 +0100
Subject: [PATCH 383/916] Use relative path in Doxygen STRIP_FROM_PATH

This seems better than requiring yet another environment variable to be
defined, and should work reliably as Doxygen is always run from
docs/doxygen directory.

Leave WXWIDGETS in STRIP_FROM_INC_PATH which doesn't seem to be used
anywhere anyhow -- and so, perhaps, should be removed entirely?
---
 docs/doxygen/Doxyfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 5eca312e91..bd3284cffa 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -19,7 +19,7 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = YES # Default: NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = "$(WXWIDGETS)/"
+STRIP_FROM_PATH        = ../..
 STRIP_FROM_INC_PATH    = "$(WXWIDGETS)/include/" \
                          "$(WXWIDGETS)/interface/"
 SHORT_NAMES            = NO

From 0a10bfc63e915a4dc24fd9a434585ac6bf3aa392 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 18 Feb 2018 22:46:35 +0100
Subject: [PATCH 384/916] Fix wrong @subpage usage on the main manual page

Using @subpage multiple times with the pages we wanted to just link to
resulted in them appearing twice in the tree shown in the CHM file.

Just use @ref when a link is wanted instead.
---
 docs/doxygen/mainpages/manual.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h
index 7f996c3d87..aa180ff0df 100644
--- a/docs/doxygen/mainpages/manual.h
+++ b/docs/doxygen/mainpages/manual.h
@@ -23,10 +23,10 @@ developing native cross-platform GUI applications in C++!
 
 @n
 
-If you are new to wxWidgets, please start with the @subpage page_introduction
-and follow with the @subpage page_topics, with maybe a look at
-@subpage page_samples as you go. If you are already familiar with wxWidgets,
-please read about @subpage overview_changes_since28 "the changes" in the latest
+If you are new to wxWidgets, please start with the @ref page_introduction
+and follow with the @ref page_topics, with maybe a look at
+@ref page_samples as you go. If you are already familiar with wxWidgets,
+please read about @ref overview_changes_since28 "the changes" in the latest
 version compared to 2.8 series. And you can also follow the links in the
 reference section or jump directly to the
 <a href="classes.html">alphabetical list of classes</a> to find out more about

From 26c18da2e47cc48bc31961ab51b215b88ef23a69 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 18 Feb 2018 22:47:46 +0100
Subject: [PATCH 385/916] Fix unreadable example in wxDataViewValueAdjuster
 documentation

@code tag must be used to make the code readable and using @example
seems to be unnecessary and just results in the creation of an extra
"Examples" page in the documentation containing only this example and an
absolute path (apparently not affected by STRIP_FROM_PATH) to
interface/wx/dataview.h file itself in the generated documentation.
---
 interface/wx/dataview.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index d4aba98428..22fd11fe88 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3875,7 +3875,7 @@ public:
     alternative to implementing an entire wxDataViewCustomRenderer
     specialization.
 
-    @example
+    @code
     // Markup renderer that removes bgcolor attributes when in selection
     class DataViewMarkupRenderer : public wxDataViewTextRenderer
     {
@@ -3904,7 +3904,7 @@ public:
             }
         };
     };
-    @endexample
+    @endcode
 
     @since 3.1.1
 

From 2ec2837f6ddf8b45a76085db058f15772c795215 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 20 Feb 2018 00:08:01 +0100
Subject: [PATCH 386/916] Update version to 3.1.2

Run misc/scripts/inc_release and rebake.
---
 Makefile.in                              | 16 ++++++------
 build/bakefiles/version.bkl              |  2 +-
 build/msw/makefile.bcc                   |  4 +--
 build/msw/makefile.gcc                   |  4 +--
 build/msw/makefile.vc                    |  4 +--
 build/msw/wx_setup.props                 |  2 +-
 build/msw/wx_vc7_adv.vcproj              | 16 ++++++------
 build/msw/wx_vc7_aui.vcproj              | 16 ++++++------
 build/msw/wx_vc7_base.vcproj             | 16 ++++++------
 build/msw/wx_vc7_core.vcproj             | 16 ++++++------
 build/msw/wx_vc7_gl.vcproj               | 16 ++++++------
 build/msw/wx_vc7_html.vcproj             | 16 ++++++------
 build/msw/wx_vc7_media.vcproj            | 16 ++++++------
 build/msw/wx_vc7_net.vcproj              | 16 ++++++------
 build/msw/wx_vc7_propgrid.vcproj         | 16 ++++++------
 build/msw/wx_vc7_qa.vcproj               | 16 ++++++------
 build/msw/wx_vc7_ribbon.vcproj           | 16 ++++++------
 build/msw/wx_vc7_richtext.vcproj         | 16 ++++++------
 build/msw/wx_vc7_stc.vcproj              | 16 ++++++------
 build/msw/wx_vc7_webview.vcproj          | 16 ++++++------
 build/msw/wx_vc7_xml.vcproj              | 16 ++++++------
 build/msw/wx_vc7_xrc.vcproj              | 16 ++++++------
 build/msw/wx_vc8_adv.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc8_aui.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc8_base.vcproj             | 32 ++++++++++++------------
 build/msw/wx_vc8_core.vcproj             | 32 ++++++++++++------------
 build/msw/wx_vc8_gl.vcproj               | 32 ++++++++++++------------
 build/msw/wx_vc8_html.vcproj             | 32 ++++++++++++------------
 build/msw/wx_vc8_media.vcproj            | 32 ++++++++++++------------
 build/msw/wx_vc8_net.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc8_propgrid.vcproj         | 32 ++++++++++++------------
 build/msw/wx_vc8_qa.vcproj               | 32 ++++++++++++------------
 build/msw/wx_vc8_ribbon.vcproj           | 32 ++++++++++++------------
 build/msw/wx_vc8_richtext.vcproj         | 32 ++++++++++++------------
 build/msw/wx_vc8_stc.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc8_webview.vcproj          | 32 ++++++++++++------------
 build/msw/wx_vc8_xml.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc8_xrc.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc9_adv.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc9_aui.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc9_base.vcproj             | 32 ++++++++++++------------
 build/msw/wx_vc9_core.vcproj             | 32 ++++++++++++------------
 build/msw/wx_vc9_gl.vcproj               | 32 ++++++++++++------------
 build/msw/wx_vc9_html.vcproj             | 32 ++++++++++++------------
 build/msw/wx_vc9_media.vcproj            | 32 ++++++++++++------------
 build/msw/wx_vc9_net.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc9_propgrid.vcproj         | 32 ++++++++++++------------
 build/msw/wx_vc9_qa.vcproj               | 32 ++++++++++++------------
 build/msw/wx_vc9_ribbon.vcproj           | 32 ++++++++++++------------
 build/msw/wx_vc9_richtext.vcproj         | 32 ++++++++++++------------
 build/msw/wx_vc9_stc.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc9_webview.vcproj          | 32 ++++++++++++------------
 build/msw/wx_vc9_xml.vcproj              | 32 ++++++++++++------------
 build/msw/wx_vc9_xrc.vcproj              | 32 ++++++++++++------------
 build/osx/wxvers.xcconfig                |  2 +-
 build/tools/msvs/getversion.bat          |  2 +-
 configure.in                             |  4 +--
 demos/bombs/Makefile.in                  |  2 +-
 demos/forty/Makefile.in                  |  2 +-
 demos/fractal/Makefile.in                |  2 +-
 demos/life/Makefile.in                   |  2 +-
 demos/poem/Makefile.in                   |  2 +-
 docs/doxygen/Doxyfile                    |  2 +-
 docs/readme.txt                          |  8 +++---
 include/wx/osx/config_xcode.h            |  4 +--
 include/wx/version.h                     |  4 +--
 samples/Info.plist                       |  8 +++---
 samples/access/Makefile.in               |  2 +-
 samples/animate/Makefile.in              |  2 +-
 samples/artprov/Makefile.in              |  2 +-
 samples/aui/Makefile.in                  |  2 +-
 samples/calendar/Makefile.in             |  2 +-
 samples/caret/Makefile.in                |  2 +-
 samples/clipboard/Makefile.in            |  2 +-
 samples/collpane/Makefile.in             |  2 +-
 samples/combo/Makefile.in                |  2 +-
 samples/config/Makefile.in               |  2 +-
 samples/dataview/Makefile.in             |  2 +-
 samples/debugrpt/Makefile.in             |  2 +-
 samples/dialogs/Makefile.in              |  2 +-
 samples/dialup/Makefile.in               |  2 +-
 samples/display/Makefile.in              |  2 +-
 samples/dll/Makefile.in                  |  2 +-
 samples/dnd/Makefile.in                  |  2 +-
 samples/docview/Info.plist               |  8 +++---
 samples/docview/Makefile.in              |  2 +-
 samples/dragimag/Makefile.in             |  2 +-
 samples/drawing/Makefile.in              |  2 +-
 samples/erase/Makefile.in                |  2 +-
 samples/event/Makefile.in                |  2 +-
 samples/except/Makefile.in               |  2 +-
 samples/exec/Makefile.in                 |  2 +-
 samples/font/Makefile.in                 |  2 +-
 samples/fswatcher/Makefile.in            |  2 +-
 samples/grid/Makefile.in                 |  2 +-
 samples/help/Makefile.in                 |  2 +-
 samples/htlbox/Makefile.in               |  2 +-
 samples/html/about/Makefile.in           |  2 +-
 samples/html/help/Makefile.in            |  2 +-
 samples/html/helpview/Makefile.in        |  2 +-
 samples/html/htmlctrl/Makefile.in        |  2 +-
 samples/html/printing/Makefile.in        |  2 +-
 samples/html/test/Makefile.in            |  2 +-
 samples/html/virtual/Makefile.in         |  2 +-
 samples/html/widget/Makefile.in          |  2 +-
 samples/html/zip/Makefile.in             |  2 +-
 samples/image/Makefile.in                |  2 +-
 samples/internat/Makefile.in             |  2 +-
 samples/ipc/Makefile.in                  |  2 +-
 samples/joytest/Makefile.in              |  2 +-
 samples/keyboard/Makefile.in             |  2 +-
 samples/layout/Makefile.in               |  2 +-
 samples/listctrl/Makefile.in             |  2 +-
 samples/mdi/Makefile.in                  |  2 +-
 samples/mediaplayer/Makefile.in          |  2 +-
 samples/memcheck/Makefile.in             |  2 +-
 samples/menu/Makefile.in                 |  2 +-
 samples/minimal/Info_cocoa.plist         |  8 +++---
 samples/minimal/Makefile.in              |  2 +-
 samples/nativdlg/Makefile.in             |  2 +-
 samples/notebook/Makefile.in             |  2 +-
 samples/oleauto/Makefile.in              |  2 +-
 samples/opengl/cube/Makefile.in          |  2 +-
 samples/opengl/isosurf/Makefile.in       |  2 +-
 samples/opengl/penguin/Makefile.in       |  2 +-
 samples/opengl/pyramid/Makefile.in       |  2 +-
 samples/ownerdrw/Makefile.in             |  2 +-
 samples/popup/Makefile.in                |  2 +-
 samples/power/Makefile.in                |  2 +-
 samples/preferences/Makefile.in          |  2 +-
 samples/printing/Makefile.in             |  2 +-
 samples/propgrid/Makefile.in             |  2 +-
 samples/regtest/Makefile.in              |  2 +-
 samples/render/Makefile.in               |  4 +--
 samples/render/makefile.bcc              |  2 +-
 samples/render/makefile.gcc              |  2 +-
 samples/render/makefile.vc               |  2 +-
 samples/render/render_vc7_renddll.vcproj | 12 ++++-----
 samples/render/render_vc8_renddll.vcproj | 24 +++++++++---------
 samples/render/render_vc9_renddll.vcproj | 24 +++++++++---------
 samples/ribbon/Makefile.in               |  2 +-
 samples/richtext/Makefile.in             |  2 +-
 samples/sashtest/Makefile.in             |  2 +-
 samples/scroll/Makefile.in               |  2 +-
 samples/shaped/Makefile.in               |  2 +-
 samples/sockets/Makefile.in              |  2 +-
 samples/sound/Makefile.in                |  2 +-
 samples/splash/Makefile.in               |  2 +-
 samples/splitter/Makefile.in             |  2 +-
 samples/statbar/Makefile.in              |  2 +-
 samples/stc/Makefile.in                  |  2 +-
 samples/svg/Makefile.in                  |  2 +-
 samples/taborder/Makefile.in             |  2 +-
 samples/taskbar/Makefile.in              |  2 +-
 samples/taskbarbutton/Makefile.in        |  2 +-
 samples/text/Makefile.in                 |  2 +-
 samples/thread/Makefile.in               |  2 +-
 samples/toolbar/Makefile.in              |  2 +-
 samples/treectrl/Makefile.in             |  2 +-
 samples/treelist/Makefile.in             |  2 +-
 samples/typetest/Makefile.in             |  2 +-
 samples/uiaction/Makefile.in             |  2 +-
 samples/validate/Makefile.in             |  2 +-
 samples/vscroll/Makefile.in              |  2 +-
 samples/webview/Makefile.in              |  2 +-
 samples/widgets/Makefile.in              |  2 +-
 samples/wizard/Makefile.in               |  2 +-
 samples/wrapsizer/Makefile.in            |  2 +-
 samples/xrc/Makefile.in                  |  2 +-
 samples/xti/Makefile.in                  |  2 +-
 tests/Makefile.in                        |  2 +-
 tests/benchmarks/Makefile.in             |  2 +-
 utils/helpview/src/Makefile.in           |  2 +-
 utils/screenshotgen/src/Makefile.in      |  2 +-
 174 files changed, 819 insertions(+), 819 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6d29b0e0eb..583620372a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,8 +74,8 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 3.1
 WX_RELEASE_NODOT = 31
-WX_VERSION = $(WX_RELEASE).1
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION = $(WX_RELEASE).2
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
 	$(CPPFLAGS) $(CFLAGS)
@@ -14209,17 +14209,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).2
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .2.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).1.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).2.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .1.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .2.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -2.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).2
 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl
index d10595924b..83efd1778b 100644
--- a/build/bakefiles/version.bkl
+++ b/build/bakefiles/version.bkl
@@ -22,7 +22,7 @@
        3. Else, i.e. if there were no changes at all to API but only internal
           changes, change C:R:A to C:R+1:A
     -->
-    <set var="WX_CURRENT">1</set>
+    <set var="WX_CURRENT">2</set>
     <set var="WX_REVISION">0</set>
     <set var="WX_AGE">0</set>
 
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 786e7b5711..0c23f0a938 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -38,7 +38,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
 	-DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 COMPILER_PREFIX = bcc
 OBJS = \
 	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -5593,7 +5593,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index c7b3f16d74..4272f38c1a 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -32,7 +32,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	WINDRES="$(WINDRES)"
 CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 COMPILER_PREFIX = gcc
 OBJS = \
 	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -5775,7 +5775,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 0f266fd231..b2965f5f63 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -29,7 +29,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
 	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 COMPILER_PREFIX = vc
 OBJS = \
 	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
@@ -6290,7 +6290,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(SETUPHDIR)
 	@echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE)
 	@echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE)
-	@echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+	@echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE)
 	@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
 	@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
 	@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props
index c15fb84ffa..f25aff8a49 100644
--- a/build/msw/wx_setup.props
+++ b/build/msw/wx_setup.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <wxVersionString>311</wxVersionString>
+    <wxVersionString>312</wxVersionString>
     <wxShortVersionString>31</wxShortVersionString>
     <wxToolkitPrefix>msw</wxToolkitPrefix>
     <wxCompilerPrefix>vc</wxCompilerPrefix>
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index 05c49a3bbc..2582886c10 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
 				ObjectFile="vc_mswuddll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
 				ObjectFile="vc_mswudll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj
index 2ed6a614e9..55bb856fc0 100644
--- a/build/msw/wx_vc7_aui.vcproj
+++ b/build/msw/wx_vc7_aui.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
 				ObjectFile="vc_mswuddll\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
 				ObjectFile="vc_mswudll\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 22993e476a..509f9cba53 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
 				ObjectFile="vc_mswuddll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
 				ObjectFile="vc_mswudll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index bc06126838..2c7d93902a 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
 				ObjectFile="vc_mswudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj
index 676b6a3195..a516cbdb85 100644
--- a/build/msw/wx_vc7_gl.vcproj
+++ b/build/msw/wx_vc7_gl.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
 				ObjectFile="vc_mswuddll\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
 				ObjectFile="vc_mswudll\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj
index f5b0d24213..e56d656a0b 100644
--- a/build/msw/wx_vc7_html.vcproj
+++ b/build/msw/wx_vc7_html.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
 				ObjectFile="vc_mswuddll\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"
 				ObjectFile="vc_mswudll\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_media.vcproj b/build/msw/wx_vc7_media.vcproj
index fd0e44ada4..f5e9bb4806 100644
--- a/build/msw/wx_vc7_media.vcproj
+++ b/build/msw/wx_vc7_media.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
 				ObjectFile="vc_mswuddll\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
 				ObjectFile="vc_mswudll\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj
index 96da4f0c13..ec19bbe80d 100644
--- a/build/msw/wx_vc7_net.vcproj
+++ b/build/msw/wx_vc7_net.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
 				ObjectFile="vc_mswuddll\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
 				ObjectFile="vc_mswudll\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_propgrid.vcproj b/build/msw/wx_vc7_propgrid.vcproj
index 83ff176b11..b9d2af7c0c 100644
--- a/build/msw/wx_vc7_propgrid.vcproj
+++ b/build/msw/wx_vc7_propgrid.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswuddll\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswudll\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_qa.vcproj b/build/msw/wx_vc7_qa.vcproj
index 8c6279153d..0c9a988699 100644
--- a/build/msw/wx_vc7_qa.vcproj
+++ b/build/msw/wx_vc7_qa.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
 				ObjectFile="vc_mswuddll\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"
 				ObjectFile="vc_mswudll\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj
index 955506328d..a41d8ab721 100644
--- a/build/msw/wx_vc7_ribbon.vcproj
+++ b/build/msw/wx_vc7_ribbon.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswuddll\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswudll\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj
index 3db2fc1eb0..1fa1839b5d 100644
--- a/build/msw/wx_vc7_richtext.vcproj
+++ b/build/msw/wx_vc7_richtext.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswuddll\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswudll\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj
index 2044491705..3217132516 100644
--- a/build/msw/wx_vc7_stc.vcproj
+++ b/build/msw/wx_vc7_stc.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
 				ObjectFile="vc_mswuddll\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
 				ObjectFile="vc_mswudll\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"/>
 			<Tool
diff --git a/build/msw/wx_vc7_webview.vcproj b/build/msw/wx_vc7_webview.vcproj
index d3a098c930..3c095fb107 100644
--- a/build/msw/wx_vc7_webview.vcproj
+++ b/build/msw/wx_vc7_webview.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswuddll\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswudll\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_xml.vcproj b/build/msw/wx_vc7_xml.vcproj
index 312bb3a6d3..81c991a18a 100644
--- a/build/msw/wx_vc7_xml.vcproj
+++ b/build/msw/wx_vc7_xml.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
 				ObjectFile="vc_mswuddll\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"
 				ObjectFile="vc_mswudll\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj
index 40c22a8120..55c805ccf0 100644
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.vcproj
@@ -156,7 +156,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswuddll\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -167,13 +167,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -187,7 +187,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
@@ -221,7 +221,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswudll\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -232,13 +232,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
@@ -254,7 +254,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"/>
 			<Tool
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index ed72fe4498..49ed1c80c5 100644
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
 				ObjectFile="vc_mswuddll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
 				ObjectFile="vc_mswudll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch"
 				ObjectFile="vc_mswuddll_x64\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_advdll.pch"
 				ObjectFile="vc_mswudll_x64\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_adv.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj
index 6197a5aa9f..4151d0c18b 100644
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
 				ObjectFile="vc_mswuddll\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
 				ObjectFile="vc_mswudll\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch"
 				ObjectFile="vc_mswuddll_x64\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_auidll.pch"
 				ObjectFile="vc_mswudll_x64\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index d7bb2eb254..3a22b0bd71 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
 				ObjectFile="vc_mswuddll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
 				ObjectFile="vc_mswudll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch"
 				ObjectFile="vc_mswuddll_x64\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311ud_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_basedll.pch"
 				ObjectFile="vc_mswudll_x64\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311u_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311u_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311u_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index a5cb10c1df..ba6a6f4283 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
 				ObjectFile="vc_mswudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch"
 				ObjectFile="vc_mswuddll_x64\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_coredll.pch"
 				ObjectFile="vc_mswudll_x64\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj
index d9b79f9eb2..aafbc68c01 100644
--- a/build/msw/wx_vc8_gl.vcproj
+++ b/build/msw/wx_vc8_gl.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
 				ObjectFile="vc_mswuddll\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
 				ObjectFile="vc_mswudll\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch"
 				ObjectFile="vc_mswuddll_x64\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_gl.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_gldll.pch"
 				ObjectFile="vc_mswudll_x64\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_gl.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj
index cbb16a5918..917a7418d9 100644
--- a/build/msw/wx_vc8_html.vcproj
+++ b/build/msw/wx_vc8_html.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
 				ObjectFile="vc_mswuddll\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"
 				ObjectFile="vc_mswudll\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch"
 				ObjectFile="vc_mswuddll_x64\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_html.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_htmldll.pch"
 				ObjectFile="vc_mswudll_x64\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_html.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj
index 76310e9f98..06eebf66ce 100644
--- a/build/msw/wx_vc8_media.vcproj
+++ b/build/msw/wx_vc8_media.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
 				ObjectFile="vc_mswuddll\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
 				ObjectFile="vc_mswudll\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch"
 				ObjectFile="vc_mswuddll_x64\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_media.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_mediadll.pch"
 				ObjectFile="vc_mswudll_x64\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_media.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj
index b8fa815178..31bf4accd3 100644
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
 				ObjectFile="vc_mswuddll\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
 				ObjectFile="vc_mswudll\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch"
 				ObjectFile="vc_mswuddll_x64\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311ud_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_net.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_netdll.pch"
 				ObjectFile="vc_mswudll_x64\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311u_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_net.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj
index 86d65d5822..0919fd34fc 100644
--- a/build/msw/wx_vc8_propgrid.vcproj
+++ b/build/msw/wx_vc8_propgrid.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswuddll\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswudll\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswuddll_x64\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswudll_x64\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj
index f8a8ac540b..527643dd00 100644
--- a/build/msw/wx_vc8_qa.vcproj
+++ b/build/msw/wx_vc8_qa.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
 				ObjectFile="vc_mswuddll\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"
 				ObjectFile="vc_mswudll\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch"
 				ObjectFile="vc_mswuddll_x64\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_qa.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_qadll.pch"
 				ObjectFile="vc_mswudll_x64\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_qa.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj
index 72c594c5e8..0b4add11d2 100644
--- a/build/msw/wx_vc8_ribbon.vcproj
+++ b/build/msw/wx_vc8_ribbon.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswuddll\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswudll\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswuddll_x64\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswudll_x64\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj
index a81ad60cca..b50d720c46 100644
--- a/build/msw/wx_vc8_richtext.vcproj
+++ b/build/msw/wx_vc8_richtext.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswuddll\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswudll\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswuddll_x64\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswudll_x64\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj
index 9c0b784297..45fdaee256 100644
--- a/build/msw/wx_vc8_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
 				ObjectFile="vc_mswuddll\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
 				ObjectFile="vc_mswudll\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch"
 				ObjectFile="vc_mswuddll_x64\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_stc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_stcdll.pch"
 				ObjectFile="vc_mswudll_x64\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_stc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_webview.vcproj b/build/msw/wx_vc8_webview.vcproj
index f17e202de3..6e191c3c4c 100644
--- a/build/msw/wx_vc8_webview.vcproj
+++ b/build/msw/wx_vc8_webview.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswuddll\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswudll\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswuddll_x64\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswudll_x64\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj
index 5c1e0210f5..bc8f471460 100644
--- a/build/msw/wx_vc8_xml.vcproj
+++ b/build/msw/wx_vc8_xml.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
 				ObjectFile="vc_mswuddll\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"
 				ObjectFile="vc_mswudll\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch"
 				ObjectFile="vc_mswuddll_x64\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311ud_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xmldll.pch"
 				ObjectFile="vc_mswudll_x64\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311u_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index fc9118d023..dfdd233cef 100644
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -232,7 +232,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswuddll\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -254,14 +254,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswudll\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -334,7 +334,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -345,14 +345,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -586,7 +586,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswuddll_x64\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -597,7 +597,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -608,14 +608,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -677,7 +677,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswudll_x64\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -688,7 +688,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -699,14 +699,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index 4b301910e9..ad0286d0c8 100644
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
 				ObjectFile="vc_mswuddll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
 				ObjectFile="vc_mswudll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch"
 				ObjectFile="vc_mswuddll_x64\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_advdll.pch"
 				ObjectFile="vc_mswudll_x64\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_adv.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj
index e9220f4ad3..1d167c8c09 100644
--- a/build/msw/wx_vc9_aui.vcproj
+++ b/build/msw/wx_vc9_aui.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch"
 				ObjectFile="vc_mswuddll\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_auidll.pch"
 				ObjectFile="vc_mswudll\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch"
 				ObjectFile="vc_mswuddll_x64\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_auidll.pch"
 				ObjectFile="vc_mswudll_x64\aui\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_aui_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_aui_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index ec52aebd6a..2c435c44bb 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"
 				ObjectFile="vc_mswuddll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"
 				ObjectFile="vc_mswudll\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch"
 				ObjectFile="vc_mswuddll_x64\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311ud_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311ud_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_basedll.pch"
 				ObjectFile="vc_mswudll_x64\base\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311u_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311u_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311u_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index f480343e17..1cf92e2fdc 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"
 				ObjectFile="vc_mswuddll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"
 				ObjectFile="vc_mswudll\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch"
 				ObjectFile="vc_mswuddll_x64\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_coredll.pch"
 				ObjectFile="vc_mswudll_x64\core\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_core_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_core.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_core_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj
index 9c31b921e7..0e1953cda8 100644
--- a/build/msw/wx_vc9_gl.vcproj
+++ b/build/msw/wx_vc9_gl.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch"
 				ObjectFile="vc_mswuddll\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_gldll.pch"
 				ObjectFile="vc_mswudll\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch"
 				ObjectFile="vc_mswuddll_x64\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_gl.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_gldll.pch"
 				ObjectFile="vc_mswudll_x64\gl\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib  opengl32.lib glu32.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_gl_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_gl.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_gl_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj
index b24188a9fb..f7db5c0beb 100644
--- a/build/msw/wx_vc9_html.vcproj
+++ b/build/msw/wx_vc9_html.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"
 				ObjectFile="vc_mswuddll\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"
 				ObjectFile="vc_mswudll\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch"
 				ObjectFile="vc_mswuddll_x64\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_html.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_htmldll.pch"
 				ObjectFile="vc_mswudll_x64\html\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_html_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_html.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_html_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj
index 8540280910..b8424ebec1 100644
--- a/build/msw/wx_vc9_media.vcproj
+++ b/build/msw/wx_vc9_media.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch"
 				ObjectFile="vc_mswuddll\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_mediadll.pch"
 				ObjectFile="vc_mswudll\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch"
 				ObjectFile="vc_mswuddll_x64\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_media.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_mediadll.pch"
 				ObjectFile="vc_mswudll_x64\media\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_media_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_media.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_media_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj
index e23a5498b1..f23b6ad85f 100644
--- a/build/msw/wx_vc9_net.vcproj
+++ b/build/msw/wx_vc9_net.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch"
 				ObjectFile="vc_mswuddll\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_netdll.pch"
 				ObjectFile="vc_mswudll\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch"
 				ObjectFile="vc_mswuddll_x64\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311ud_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_net.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311ud_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_netdll.pch"
 				ObjectFile="vc_mswudll_x64\net\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311u_net_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_net.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311u_net_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj
index 2609bf4521..e448b2b61e 100644
--- a/build/msw/wx_vc9_propgrid.vcproj
+++ b/build/msw/wx_vc9_propgrid.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswuddll\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswudll\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswuddll_x64\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_propgriddll.pch"
 				ObjectFile="vc_mswudll_x64\propgrid\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_propgrid_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_propgrid_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj
index 13a6ac790b..e2b61a555c 100644
--- a/build/msw/wx_vc9_qa.vcproj
+++ b/build/msw/wx_vc9_qa.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch"
 				ObjectFile="vc_mswuddll\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_qadll.pch"
 				ObjectFile="vc_mswudll\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch"
 				ObjectFile="vc_mswuddll_x64\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_qa.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_qadll.pch"
 				ObjectFile="vc_mswudll_x64\qa\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_qa_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_qa.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_qa_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj
index e6a3cfd6c7..e0ebdae554 100644
--- a/build/msw/wx_vc9_ribbon.vcproj
+++ b/build/msw/wx_vc9_ribbon.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswuddll\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswudll\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswuddll_x64\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_ribbondll.pch"
 				ObjectFile="vc_mswudll_x64\ribbon\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_ribbon_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_ribbon_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj
index dc821f2177..9ee191a274 100644
--- a/build/msw/wx_vc9_richtext.vcproj
+++ b/build/msw/wx_vc9_richtext.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswuddll\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswudll\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswuddll_x64\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_richtextdll.pch"
 				ObjectFile="vc_mswudll_x64\richtext\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_richtext_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_richtext_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj
index f7e140bf22..085a10c834 100644
--- a/build/msw/wx_vc9_stc.vcproj
+++ b/build/msw/wx_vc9_stc.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"
 				ObjectFile="vc_mswuddll\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"
 				ObjectFile="vc_mswudll\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch"
 				ObjectFile="vc_mswuddll_x64\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_stc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_stcdll.pch"
 				ObjectFile="vc_mswudll_x64\stc\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_stc_vc_custom;__WX__;SCI_LEXER;NO_CXX11_REGEX;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_stc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_stc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_stc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_webview.vcproj b/build/msw/wx_vc9_webview.vcproj
index e95d6512d7..47754d8067 100644
--- a/build/msw/wx_vc9_webview.vcproj
+++ b/build/msw/wx_vc9_webview.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswuddll\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswudll\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswuddll_x64\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_webviewdll.pch"
 				ObjectFile="vc_mswudll_x64\webview\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_webview_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_webview_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj
index 2bf94dfe99..bd305d4c9b 100644
--- a/build/msw/wx_vc9_xml.vcproj
+++ b/build/msw/wx_vc9_xml.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch"
 				ObjectFile="vc_mswuddll\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_xmldll.pch"
 				ObjectFile="vc_mswudll\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch"
 				ObjectFile="vc_mswuddll_x64\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311ud_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_xml.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311ud_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xmldll.pch"
 				ObjectFile="vc_mswudll_x64\xml\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase311u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase312u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxbase311u_xml_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_xml.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase311u_xml_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj
index 8be973f6c4..217be83b05 100644
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -231,7 +231,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswuddll\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +241,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -252,14 +252,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_adv.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -322,7 +322,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswudll\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -332,7 +332,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -343,14 +343,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_adv.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -583,7 +583,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswuddll_x64\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -604,14 +604,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311ud_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311ud_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -674,7 +674,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll_x64\wxprec_xrcdll.pch"
 				ObjectFile="vc_mswudll_x64\xrc\"
-				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -684,7 +684,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw311u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw312u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_x64_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\expat\lib"
 			/>
@@ -695,14 +695,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_adv.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib"
-				OutputFile="..\..\lib\vc_x64_dll\wxmsw311u_xrc_vc_custom.dll"
+				OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw311u_xrc_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig
index e4fe5bf103..2e4f173d30 100644
--- a/build/osx/wxvers.xcconfig
+++ b/build/osx/wxvers.xcconfig
@@ -1,4 +1,4 @@
 // update this file with new version numbers
 
 DYLIB_COMPATIBILITY_VERSION = 3.1
-DYLIB_CURRENT_VERSION = 3.1.1
+DYLIB_CURRENT_VERSION = 3.1.2
diff --git a/build/tools/msvs/getversion.bat b/build/tools/msvs/getversion.bat
index 5e9889e978..181acd8582 100644
--- a/build/tools/msvs/getversion.bat
+++ b/build/tools/msvs/getversion.bat
@@ -1,3 +1,3 @@
 set wxMAJOR_VERSION=3
 set wxMINOR_VERSION=1
-set wxRELEASE_NUMBER=1
+set wxRELEASE_NUMBER=2
diff --git a/configure.in b/configure.in
index 340f2b30bb..8afbc08aaf 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWidgets], [3.1.1], [wx-dev@googlegroups.com])
+AC_INIT([wxWidgets], [3.1.2], [wx-dev@googlegroups.com])
 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
@@ -40,7 +40,7 @@ dnl wx_release_number += 1
 
 wx_major_version_number=3
 wx_minor_version_number=1
-wx_release_number=1
+wx_release_number=2
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index 10baa08033..a319a1b999 100644
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 7d3e2e358c..2b8963f5cf 100644
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 45b8c8b2d6..6d2b3b8c16 100644
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index 2c687458d8..c2e582b4d2 100644
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index 3a199b75e6..528d0b28b7 100644
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index bd3284cffa..bef0fc9a9d 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -6,7 +6,7 @@
 
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = wxWidgets
-PROJECT_NUMBER         = 3.1.1
+PROJECT_NUMBER         = 3.1.2
 PROJECT_BRIEF          =
 PROJECT_LOGO           = logo.png
 OUTPUT_DIRECTORY       = out
diff --git a/docs/readme.txt b/docs/readme.txt
index a37fadc811..4a4fe74365 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWidgets 3.1.1 Release Notes
+wxWidgets 3.1.2 Release Notes
 =============================
 
 Welcome to the latest development release of wxWidgets, a free and open source
@@ -16,12 +16,12 @@ more about wxWidgets at:
 
 Documentation is available online at:
 
-* http://docs.wxwidgets.org/3.1.1/
+* http://docs.wxwidgets.org/3.1.2/
 
 wxWidgets sources and binaries for the selected platforms are available for
 download from:
 
-* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.1/
+* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.2/
 
 
 Changes since 3.1.0
@@ -61,7 +61,7 @@ party libraries have been updated to their latest versions.
 
 Please refer to the detailed change log for the full list of changes:
 
-https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/changes.txt
+https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.2/docs/changes.txt
 
 
 Changes since 3.0
diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index c9f3922de4..1a4946c0e1 100644
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -126,9 +126,9 @@
 
 #define PACKAGE_BUGREPORT "wx-dev@googlegroups.com"
 #define PACKAGE_NAME "wxWidgets"
-#define PACKAGE_STRING "wxWidgets 3.1.1"
+#define PACKAGE_STRING "wxWidgets 3.1.2"
 #define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "3.1.1"
+#define PACKAGE_VERSION "3.1.2"
 
 // for regex
 #define WX_NO_REGEX_ADVANCED 1
diff --git a/include/wx/version.h b/include/wx/version.h
index 57ec66fa40..f977b5364b 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -27,9 +27,9 @@
 /*  NB: this file is parsed by automatic tools so don't change its format! */
 #define wxMAJOR_VERSION      3
 #define wxMINOR_VERSION      1
-#define wxRELEASE_NUMBER     1
+#define wxRELEASE_NUMBER     2
 #define wxSUBRELEASE_NUMBER  0
-#define wxVERSION_STRING   wxT("wxWidgets 3.1.1")
+#define wxVERSION_STRING   wxT("wxWidgets 3.1.2")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
diff --git a/samples/Info.plist b/samples/Info.plist
index 1476b139d8..bcdc6ce2d6 100644
--- a/samples/Info.plist
+++ b/samples/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2018 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 3.1.2, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>3.1.1, (c) 2005-2018 wxWidgets</string>
+	<string>3.1.2, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index ee8fa03fe9..f571d79ef2 100644
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index 7a307a641c..10140e1ea9 100644
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index d8458dc844..c0872109c3 100644
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index b107504320..b921a9dc62 100644
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index 641583f1ee..034df86185 100644
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 0fc3d8ffec..0cde6e4fb8 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index 2bcdd69d72..b19c7f9b16 100644
--- a/samples/clipboard/Makefile.in
+++ b/samples/clipboard/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index 2784914254..21ca83039d 100644
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 5999a5b85f..9893e27d43 100644
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 99be71019f..3b613f8bcb 100644
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index 4ce8cb01cc..60dbf8f14f 100644
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index 956e5c9894..3fcda9313e 100644
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index cef098323f..49bb62198e 100644
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index b8e07e5faf..68bd936bf0 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index b008450623..bafb9800c7 100644
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in
index f6eba32980..5eec3e1e1a 100644
--- a/samples/dll/Makefile.in
+++ b/samples/dll/Makefile.in
@@ -47,7 +47,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index bfca18e6ef..f1b6583b40 100644
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist
index b39ead40c6..e4e80b1619 100644
--- a/samples/docview/Info.plist
+++ b/samples/docview/Info.plist
@@ -51,7 +51,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2018 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 3.1.2, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>doc</string>
 	<key>CFBundleIdentifier</key>
@@ -66,17 +66,17 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>3.1.1, (c) 2005-2018 wxWidgets</string>
+	<string>3.1.2, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>WXMA</string>
 	<key>CFBundleVersion</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 90eac61b26..8415a78332 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index 62806b6b3a..cdcd5c3002 100644
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index cfef6a68f6..12385f46ea 100644
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index cdcaf07bcd..8c04bfff92 100644
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 3b77eacc80..c99d2b6932 100644
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index ff11f1ecd8..78abbfb69c 100644
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index cf2f9e9cf1..4e6222a271 100644
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index ea30d90e4d..eca4325ffd 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in
index 0cd7b7870d..b88bf03ab5 100644
--- a/samples/fswatcher/Makefile.in
+++ b/samples/fswatcher/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index c03685d06c..c3c8571321 100644
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index d43b20b770..0c66269e55 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index c66365452e..fe33e17a97 100644
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index b427662e19..28ab32229b 100644
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index ea7fe0033b..e07831b562 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 77e2d67137..33739f4716 100644
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in
index 87b8e4c22a..689aaf8eab 100644
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index a3d89f10b5..250602ff17 100644
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 770985c696..1b9c6052fa 100644
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index 0c413ad5c2..211077ef89 100644
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index f596abdff3..39a71c056a 100644
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index 5f338921a5..7ed0473a94 100644
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 7067b22f69..e2c1229337 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index b92469d241..3ef989d92d 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 4021ba8cd0..92ea202001 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index 699ee76111..ee8c736011 100644
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 5308401534..81699ecf03 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 0e90eb6a56..e5c429f7d5 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index 5b12acde35..eff840df3f 100644
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index a6e9d4eb4e..43aaacff3c 100644
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index f2e83d27a4..66452d80b0 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index 6eb71ad8c9..b8df990e07 100644
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 228fcbe943..4c0b4ad669 100644
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist
index 561ee3ad00..42d8369cb5 100644
--- a/samples/minimal/Info_cocoa.plist
+++ b/samples/minimal/Info_cocoa.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.1, (c) 2005-2018 wxWidgets</string>
+	<string>$(PRODUCT_NAME) version 3.1.2, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleIconFile</key>
 	<string>wxmac.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -22,17 +22,17 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>3.1.1, (c) 2005-2018 wxWidgets</string>
+	<string>3.1.2, (c) 2005-2018 wxWidgets</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.1.1</string>
+	<string>3.1.2</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2005-2018 wxWidgets</string>
 	<key>NSPrincipalClass</key>
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 8102000e7e..602f911640 100644
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index ae8635fdb4..c1fd94a974 100644
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 4f5ad6ce82..8e3a51053e 100644
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index 95ad72f552..1d0d6e8b7c 100644
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index cdce7101ca..93c44642a8 100644
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index d8014aff5b..ec6a5136fa 100644
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 116722c8c4..cd5d9e0bfa 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/opengl/pyramid/Makefile.in b/samples/opengl/pyramid/Makefile.in
index 49712fb2ce..fec47d7616 100644
--- a/samples/opengl/pyramid/Makefile.in
+++ b/samples/opengl/pyramid/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PYRAMID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index 695e936165..e9a805d717 100644
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index f2d10143a7..0bee55e6ae 100644
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index a00ee8944c..8057d940a3 100644
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in
index b9983f145d..e791885b28 100644
--- a/samples/preferences/Makefile.in
+++ b/samples/preferences/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PREFERENCES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index 66a6485d24..888a1fe4c1 100644
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in
index 9fcc1a4ce6..019fb25e4f 100644
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 7be60c9bec..001aa862db 100644
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index 37e44a75c7..ca9053cb44 100644
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -50,8 +50,8 @@ wx_top_builddir = @wx_top_builddir@
 DESTDIR = 
 WX_RELEASE = 3.1
 WX_RELEASE_NODOT = 31
-WX_VERSION = $(WX_RELEASE).1
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION = $(WX_RELEASE).2
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 LIBDIRNAME = $(wx_top_builddir)/lib
 PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
 RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc
index 581ff0cec6..65279c4cbe 100644
--- a/samples/render/makefile.bcc
+++ b/samples/render/makefile.bcc
@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\..
 ### Variables: ###
 
 WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 COMPILER_PREFIX = bcc
 OBJS = \
 	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc
index 780f193448..305e82c4de 100644
--- a/samples/render/makefile.gcc
+++ b/samples/render/makefile.gcc
@@ -14,7 +14,7 @@ include ../../build/msw/config.gcc
 
 CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 COMPILER_PREFIX = gcc
 OBJS = \
 	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc
index 6bcbf0492e..db9bb8dc21 100644
--- a/samples/render/makefile.vc
+++ b/samples/render/makefile.vc
@@ -13,7 +13,7 @@
 ### Variables: ###
 
 WX_RELEASE_NODOT = 31
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
 COMPILER_PREFIX = vc
 OBJS = \
 	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj
index a70a5f0670..dad8bd0396 100644
--- a/samples/render/render_vc7_renddll.vcproj
+++ b/samples/render/render_vc7_renddll.vcproj
@@ -36,7 +36,7 @@
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
 				ObjectFile="vc_mswuddll\renddll\"
-				ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswuddll\renddll_mswud312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -47,12 +47,12 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
+				OutputFile="vc_mswuddll\renddll_mswud312_vc.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
+				ProgramDatabaseFile="vc_mswuddll\renddll_mswud312_vc.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -97,7 +97,7 @@
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
 				ObjectFile="vc_mswudll\renddll\"
-				ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswudll\renddll_mswu312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -108,12 +108,12 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
+				OutputFile="vc_mswudll\renddll_mswu312_vc.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
+				ProgramDatabaseFile="vc_mswudll\renddll_mswu312_vc.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj
index fef5c34f1b..336bdf2ef2 100644
--- a/samples/render/render_vc8_renddll.vcproj
+++ b/samples/render/render_vc8_renddll.vcproj
@@ -62,7 +62,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				ObjectFile="vc_mswuddll\renddll\"
-				ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswuddll\renddll_mswud312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -84,13 +84,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
+				OutputFile="vc_mswuddll\renddll_mswud312_vc.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
+				ProgramDatabaseFile="vc_mswuddll\renddll_mswud312_vc.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -149,7 +149,7 @@
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				ObjectFile="vc_mswudll\renddll\"
-				ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswudll\renddll_mswu312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -171,13 +171,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
+				OutputFile="vc_mswudll\renddll_mswu312_vc.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
+				ProgramDatabaseFile="vc_mswudll\renddll_mswu312_vc.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -241,7 +241,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				ObjectFile="vc_mswuddll_x64\renddll\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -263,13 +263,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\renddll_mswud311_vc.dll"
+				OutputFile="vc_mswuddll_x64\renddll_mswud312_vc.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
+				ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud312_vc.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -328,7 +328,7 @@
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				ObjectFile="vc_mswudll_x64\renddll\"
-				ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				Detect64BitPortabilityProblems="true"
@@ -350,13 +350,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\renddll_mswu311_vc.dll"
+				OutputFile="vc_mswudll_x64\renddll_mswu312_vc.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu311_vc.pdb"
+				ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu312_vc.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/samples/render/render_vc9_renddll.vcproj b/samples/render/render_vc9_renddll.vcproj
index 2950389c48..2667493bb4 100644
--- a/samples/render/render_vc9_renddll.vcproj
+++ b/samples/render/render_vc9_renddll.vcproj
@@ -62,7 +62,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				ObjectFile="vc_mswuddll\renddll\"
-				ProgramDataBaseFileName="vc_mswuddll\renddll_mswud311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswuddll\renddll_mswud312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -83,13 +83,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswuddll\renddll_mswud311_vc.dll"
+				OutputFile="vc_mswuddll\renddll_mswud312_vc.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll\renddll_mswud311_vc.pdb"
+				ProgramDatabaseFile="vc_mswuddll\renddll_mswud312_vc.pdb"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -149,7 +149,7 @@
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				ObjectFile="vc_mswudll\renddll\"
-				ProgramDataBaseFileName="vc_mswudll\renddll_mswu311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswudll\renddll_mswu312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -170,13 +170,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswudll\renddll_mswu311_vc.dll"
+				OutputFile="vc_mswudll\renddll_mswu312_vc.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll\renddll_mswu311_vc.pdb"
+				ProgramDatabaseFile="vc_mswudll\renddll_mswu312_vc.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -240,7 +240,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				ObjectFile="vc_mswuddll_x64\renddll\"
-				ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswuddll_x64\renddll_mswud312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -261,13 +261,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswuddll_x64\renddll_mswud311_vc.dll"
+				OutputFile="vc_mswuddll_x64\renddll_mswud312_vc.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud311_vc.pdb"
+				ProgramDatabaseFile="vc_mswuddll_x64\renddll_mswud312_vc.pdb"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -327,7 +327,7 @@
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
 				ObjectFile="vc_mswudll_x64\renddll\"
-				ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu311_vc.pdb"
+				ProgramDataBaseFileName="vc_mswudll_x64\renddll_mswu312_vc.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -348,13 +348,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
-				OutputFile="vc_mswudll_x64\renddll_mswu311_vc.dll"
+				OutputFile="vc_mswudll_x64\renddll_mswu312_vc.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
 				GenerateManifest="true"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu311_vc.pdb"
+				ProgramDatabaseFile="vc_mswudll_x64\renddll_mswu312_vc.pdb"
 				TargetMachine="17"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in
index be77d8a2f2..06c3e74733 100644
--- a/samples/ribbon/Makefile.in
+++ b/samples/ribbon/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in
index 7da332190b..4a251338d4 100644
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 RICHTEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index 4033955004..fb06a754db 100644
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SASHTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 5e2528809b..9930beb94b 100644
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SCROLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 4cc2f8ca00..8c4aff2018 100644
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SHAPED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 6da585a47a..d4629cd024 100644
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 5ccb10fc8c..7fd5e9528c 100644
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SOUND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index 26784b4954..df52bc5be3 100644
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SPLASH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index c8aa349cc5..d535750ee3 100644
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SPLITTER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 99889a53f5..c8a90e6cfa 100644
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 STATBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index 25b329d010..5340c09e4c 100644
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 STCTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index eac153827b..87db8226c8 100644
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SVGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in
index f55d03aa5e..0a30d81ac3 100644
--- a/samples/taborder/Makefile.in
+++ b/samples/taborder/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TABORDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index 8d0d647533..980ab1523f 100644
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/taskbarbutton/Makefile.in b/samples/taskbarbutton/Makefile.in
index d8cbb67131..ecefb5beea 100644
--- a/samples/taskbarbutton/Makefile.in
+++ b/samples/taskbarbutton/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TASKBARBUTTON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index 486c22bc2e..f7778c3f2c 100644
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEXT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 7a5aa27d9e..3e3110f803 100644
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 THREAD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index 24b87fca63..0590ab4b61 100644
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index 7097dd464e..154e961304 100644
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TREECTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/treelist/Makefile.in b/samples/treelist/Makefile.in
index 790684107b..b3e27ea511 100644
--- a/samples/treelist/Makefile.in
+++ b/samples/treelist/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TREELIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index 237e8c78bd..87b6f9e88a 100644
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TYPETEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/uiaction/Makefile.in b/samples/uiaction/Makefile.in
index b496b815d7..d2bcb724a6 100644
--- a/samples/uiaction/Makefile.in
+++ b/samples/uiaction/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 UIACTION_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index 494bb84317..4aa492db2c 100644
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 VALIDATE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index fabe61116d..54502ba31d 100644
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 VSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in
index 06f5ceab20..4d0fa2c358 100644
--- a/samples/webview/Makefile.in
+++ b/samples/webview/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WEBVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index 91b090a826..ea578df46a 100644
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIDGETS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index eae057bf0d..fa2fc9adc9 100644
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WIZARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in
index a815d5d4ec..d60de26e90 100644
--- a/samples/wrapsizer/Makefile.in
+++ b/samples/wrapsizer/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 WRAPSIZER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index fd51ebff1a..8e423a5859 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/samples/xti/Makefile.in b/samples/xti/Makefile.in
index 59822f1256..0c3d89dc77 100644
--- a/samples/xti/Makefile.in
+++ b/samples/xti/Makefile.in
@@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 XTI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index f8a086d08b..69d960b891 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -48,7 +48,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 4f498bfd88..401b6e54b8 100644
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -40,7 +40,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 BENCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in
index 8c35d14378..e393147104 100644
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -45,7 +45,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in
index 97ca5a34a1..3612fdb95d 100644
--- a/utils/screenshotgen/src/Makefile.in
+++ b/utils/screenshotgen/src/Makefile.in
@@ -47,7 +47,7 @@ wx_top_builddir = @wx_top_builddir@
 
 DESTDIR = 
 WX_RELEASE = 3.1
-WX_VERSION = $(WX_RELEASE).1
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(wx_top_builddir)/lib
 SCREENSHOTGEN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \

From f3f1819dafc5f36dfcb3572617da0115ee5d2786 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Tue, 13 Feb 2018 23:17:24 +0100
Subject: [PATCH 387/916] Add archive sample

This sample shows usage of wxArchiveStream and wxArchiveFactory.
It also allows for easy testing of wxArchiveStream implementations
outside of the unit tests.

See https://github.com/wxWidgets/wxWidgets/pull/730
---
 autoconf_inc.m4                    |  96 ++--
 build/cmake/samples/CMakeLists.txt |   1 +
 configure                          |   2 +-
 configure.in                       |   2 +-
 docs/doxygen/mainpages/samples.h   |   8 +
 samples/archive/Makefile.in        | 123 +++++
 samples/archive/archive.bkl        |  13 +
 samples/archive/archive.cpp        | 257 +++++++++
 samples/archive/archive_vc7.vcproj | 295 +++++++++++
 samples/archive/archive_vc8.vcproj | 819 +++++++++++++++++++++++++++++
 samples/archive/archive_vc9.vcproj | 791 ++++++++++++++++++++++++++++
 samples/archive/makefile.bcc       | 202 +++++++
 samples/archive/makefile.gcc       | 197 +++++++
 samples/archive/makefile.unx       | 100 ++++
 samples/archive/makefile.vc        | 302 +++++++++++
 samples/makefile.bcc               |  12 +-
 samples/makefile.gcc               |  22 +-
 samples/makefile.vc                |  10 +-
 samples/samples.bkl                |   1 +
 19 files changed, 3192 insertions(+), 61 deletions(-)
 create mode 100644 samples/archive/Makefile.in
 create mode 100644 samples/archive/archive.bkl
 create mode 100644 samples/archive/archive.cpp
 create mode 100644 samples/archive/archive_vc7.vcproj
 create mode 100644 samples/archive/archive_vc8.vcproj
 create mode 100644 samples/archive/archive_vc9.vcproj
 create mode 100644 samples/archive/makefile.bcc
 create mode 100644 samples/archive/makefile.gcc
 create mode 100644 samples/archive/makefile.unx
 create mode 100644 samples/archive/makefile.vc

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index f3f2f9d5bc..98d7d98136 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,4 +1,4 @@
-dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
 dnl
 dnl This macro was generated by
 dnl Bakefile 0.2.11 (http://www.bakefile.org)
@@ -8,55 +8,55 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.11"
 
 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ###
 AC_BAKEFILE_PRECOMP_HEADERS
-dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_debug="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_debug=""
     fi
     AC_SUBST(COND_BUILD_debug)
-dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_debug_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_debug_DEBUG_INFO_default="#"
     if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_debug_DEBUG_INFO_default=""
     fi
     AC_SUBST(COND_BUILD_debug_DEBUG_INFO_default)
-dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_release[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_release="#"
     if test "x$BUILD" = "xrelease" ; then
         COND_BUILD_release=""
     fi
     AC_SUBST(COND_BUILD_release)
-dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_BUILD_release_DEBUG_INFO_default[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_BUILD_release_DEBUG_INFO_default="#"
     if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_release_DEBUG_INFO_default=""
     fi
     AC_SUBST(COND_BUILD_release_DEBUG_INFO_default)
-dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_FLAG_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_FLAG_0="#"
     if test "x$DEBUG_FLAG" = "x0" ; then
         COND_DEBUG_FLAG_0=""
     fi
     AC_SUBST(COND_DEBUG_FLAG_0)
-dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_INFO_0="#"
     if test "x$DEBUG_INFO" = "x0" ; then
         COND_DEBUG_INFO_0=""
     fi
     AC_SUBST(COND_DEBUG_INFO_0)
-dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEBUG_INFO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEBUG_INFO_1="#"
     if test "x$DEBUG_INFO" = "x1" ; then
         COND_DEBUG_INFO_1=""
     fi
     AC_SUBST(COND_DEBUG_INFO_1)
-dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_0[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then
         COND_DEPS_TRACKING_0=""
     fi
     AC_SUBST(COND_DEPS_TRACKING_0)
-dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_DEPS_TRACKING_1[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_DEPS_TRACKING_1="#"
     if test "x$DEPS_TRACKING" = "x1" ; then
         COND_DEPS_TRACKING_1=""
@@ -74,7 +74,7 @@ dnl ### begin block 20_COND_ICC_PCH_1[../../tests/test.bkl,wx.bkl] ###
         COND_ICC_PCH_1=""
     fi
     AC_SUBST(COND_ICC_PCH_1)
-dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0="#"
     if test "x$MONOLITHIC" = "x0" ; then
         COND_MONOLITHIC_0=""
@@ -152,7 +152,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_XRC_1[wx.bkl] ###
         COND_MONOLITHIC_0_SHARED_0_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1=""
@@ -248,7 +248,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_HTML_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_HTML_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_HTML_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_MEDIA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
         COND_MONOLITHIC_0_USE_MEDIA_1=""
@@ -284,7 +284,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_STC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_WEBVIEW_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_0_USE_WEBVIEW_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then
         COND_MONOLITHIC_0_USE_WEBVIEW_1=""
@@ -296,7 +296,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ###
         COND_MONOLITHIC_0_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
         COND_MONOLITHIC_1=""
@@ -314,19 +314,19 @@ dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_1[wx.bkl] ###
         COND_MONOLITHIC_1_SHARED_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
-dnl ### begin block 20_COND_MONOLITHIC_1_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_1_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_MONOLITHIC_1_USE_STC_1="#"
     if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then
         COND_MONOLITHIC_1_USE_STC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_1_USE_STC_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
     fi
     AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
-dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
     if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
         COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
@@ -344,7 +344,7 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[wx.bkl] ###
         COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_MACOSX_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" ; then
         COND_PLATFORM_MACOSX_1=""
@@ -440,13 +440,13 @@ dnl ### begin block 20_COND_PLATFORM_OS2_1[../../demos/bombs/bombs.bkl,../../dem
         COND_PLATFORM_OS2_1=""
     fi
     AC_SUBST(COND_PLATFORM_OS2_1)
-dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_UNIX_0="#"
     if test "x$PLATFORM_UNIX" = "x0" ; then
         COND_PLATFORM_UNIX_0=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_0)
-dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_UNIX_1="#"
     if test "x$PLATFORM_UNIX" = "x1" ; then
         COND_PLATFORM_UNIX_1=""
@@ -500,7 +500,7 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_PLUGINS_0[wx.bkl] ###
         COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
-dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_WIN32_0="#"
     if test "x$PLATFORM_WIN32" = "x0" ; then
         COND_PLATFORM_WIN32_0=""
@@ -518,7 +518,7 @@ dnl ### begin block 20_COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4[wx.bk
         COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_4)
-dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_PLATFORM_WIN32_1="#"
     if test "x$PLATFORM_WIN32" = "x1" ; then
         COND_PLATFORM_WIN32_1=""
@@ -638,7 +638,7 @@ dnl ### begin block 20_COND_SHARED_0_wxUSE_ZLIB_builtin[wx.bkl] ###
         COND_SHARED_0_wxUSE_ZLIB_builtin=""
     fi
     AC_SUBST(COND_SHARED_0_wxUSE_ZLIB_builtin)
-dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_SHARED_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_SHARED_1="#"
     if test "x$SHARED" = "x1" ; then
         COND_SHARED_1=""
@@ -800,7 +800,7 @@ dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
         COND_TOOLKIT_GTK_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_TOOLKIT_MAC="#"
     if test "x$TOOLKIT" = "xMAC" ; then
         COND_TOOLKIT_MAC=""
@@ -824,7 +824,7 @@ dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
         COND_TOOLKIT_MSW=""
@@ -932,37 +932,37 @@ dnl ### begin block 20_COND_TOOLKIT_X11_WXUNIV_1[wx.bkl] ###
         COND_TOOLKIT_X11_WXUNIV_1=""
     fi
     AC_SUBST(COND_TOOLKIT_X11_WXUNIV_1)
-dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_UNICODE_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
         COND_UNICODE_1=""
     fi
     AC_SUBST(COND_UNICODE_1)
-dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_CAIRO_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_CAIRO_1="#"
     if test "x$USE_CAIRO" = "x1" ; then
         COND_USE_CAIRO_1=""
     fi
     AC_SUBST(COND_USE_CAIRO_1)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_EXCEPTIONS_0="#"
     if test "x$USE_EXCEPTIONS" = "x0" ; then
         COND_USE_EXCEPTIONS_0=""
     fi
     AC_SUBST(COND_USE_EXCEPTIONS_0)
-dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_EXCEPTIONS_1="#"
     if test "x$USE_EXCEPTIONS" = "x1" ; then
         COND_USE_EXCEPTIONS_1=""
     fi
     AC_SUBST(COND_USE_EXCEPTIONS_1)
-dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
         COND_USE_GUI_0=""
     fi
     AC_SUBST(COND_USE_GUI_0)
-dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1="#"
     if test "x$USE_GUI" = "x1" ; then
         COND_USE_GUI_1=""
@@ -986,19 +986,19 @@ dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_1[wx.bkl] ###
         COND_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
     fi
     AC_SUBST(COND_USE_GUI_1_wxUSE_LIBJPEG_builtin)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
     fi
     AC_SUBST(COND_USE_GUI_1_wxUSE_LIBPNG_builtin)
-dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_GUI_1_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
@@ -1016,19 +1016,19 @@ dnl ### begin block 20_COND_USE_PCH_1[../../tests/test.bkl,wx.bkl] ###
         COND_USE_PCH_1=""
     fi
     AC_SUBST(COND_USE_PCH_1)
-dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_PLUGINS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_PLUGINS_0="#"
     if test "x$USE_PLUGINS" = "x0" ; then
         COND_USE_PLUGINS_0=""
     fi
     AC_SUBST(COND_USE_PLUGINS_0)
-dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_RTTI_0="#"
     if test "x$USE_RTTI" = "x0" ; then
         COND_USE_RTTI_0=""
     fi
     AC_SUBST(COND_USE_RTTI_0)
-dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_RTTI_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_RTTI_1="#"
     if test "x$USE_RTTI" = "x1" ; then
         COND_USE_RTTI_1=""
@@ -1076,19 +1076,19 @@ dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
         COND_USE_STC_1=""
     fi
     AC_SUBST(COND_USE_STC_1)
-dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_0[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_THREADS_0="#"
     if test "x$USE_THREADS" = "x0" ; then
         COND_USE_THREADS_0=""
     fi
     AC_SUBST(COND_USE_THREADS_0)
-dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_THREADS_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_THREADS_1="#"
     if test "x$USE_THREADS" = "x1" ; then
         COND_USE_THREADS_1=""
     fi
     AC_SUBST(COND_USE_THREADS_1)
-dnl ### begin block 20_COND_USE_WEBVIEW_WEBKIT2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_USE_WEBVIEW_WEBKIT2_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_WEBVIEW_WEBKIT2_1="#"
     if test "x$USE_WEBVIEW_WEBKIT2" = "x1" ; then
         COND_USE_WEBVIEW_WEBKIT2_1=""
@@ -1118,43 +1118,43 @@ dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
         COND_WXUNIV_0=""
     fi
     AC_SUBST(COND_WXUNIV_0)
-dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_WXUNIV_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)
-dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_EXPAT_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_EXPAT_builtin="#"
     if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_wxUSE_EXPAT_builtin=""
     fi
     AC_SUBST(COND_wxUSE_EXPAT_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBJPEG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBJPEG_builtin="#"
     if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_wxUSE_LIBJPEG_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBJPEG_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBPNG_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBPNG_builtin="#"
     if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
         COND_wxUSE_LIBPNG_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBPNG_builtin)
-dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_LIBTIFF_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_LIBTIFF_builtin="#"
     if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
         COND_wxUSE_LIBTIFF_builtin=""
     fi
     AC_SUBST(COND_wxUSE_LIBTIFF_builtin)
-dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_REGEX_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_REGEX_builtin="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_wxUSE_REGEX_builtin=""
     fi
     AC_SUBST(COND_wxUSE_REGEX_builtin)
-dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
+dnl ### begin block 20_COND_wxUSE_ZLIB_builtin[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_wxUSE_ZLIB_builtin="#"
     if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
         COND_wxUSE_ZLIB_builtin=""
diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index 36032772fb..bb0a87e23e 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -9,6 +9,7 @@
 
 wx_add_sample(access accesstest.cpp DEPENDS wxUSE_ACCESSBILITY)
 wx_add_sample(animate anitest.cpp anitest.h LIBRARIES adv DATA throbber.gif hourglass.ani DEPENDS wxUSE_ANIMATIONCTRL)
+wx_add_sample(archive CONSOLE)
 wx_add_sample(artprov arttest.cpp artbrows.cpp artbrows.h)
 wx_add_sample(aui auidemo.cpp LIBRARIES adv aui html NAME auidemo DEPENDS wxUSE_AUI)
 wx_add_sample(calendar RES calendar.rc LIBRARIES adv DEPENDS wxUSE_CALENDARCTRL)
diff --git a/configure b/configure
index 96aa141762..8cb4a36c68 100755
--- a/configure
+++ b/configure
@@ -38744,7 +38744,7 @@ LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
 if test "$wxUSE_GUI" = "yes"; then
 
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov dialogs drawing \
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS archive artprov dialogs drawing \
                      erase event exec font image minimal power render \
                      shaped svg taborder vscroll widgets wrapsizer"
 
diff --git a/configure.in b/configure.in
index 8afbc08aaf..9104bfc8d3 100644
--- a/configure.in
+++ b/configure.in
@@ -7740,7 +7740,7 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl      library features they need are present)
 
     dnl TODO some samples are never built so far: mfc (requires VC++)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov dialogs drawing \
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS archive artprov dialogs drawing \
                      erase event exec font image minimal power render \
                      shaped svg taborder vscroll widgets wrapsizer"
 
diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h
index 00fb5cfb7a..352e175f33 100644
--- a/docs/doxygen/mainpages/samples.h
+++ b/docs/doxygen/mainpages/samples.h
@@ -76,6 +76,14 @@ in wxAnimation.
 
 @sampledir{animate}
 
+@section page_samples_archive Archive Sample
+
+This sample shows how you can use wxArchiveClassFactory, wxArchiveOutputStream
+and wxArchiveInputStream. This shows how to process ZIP and TAR archives using
+wxZipOutputStream and wxTarOutputStream
+
+@sampledir{archive}
+
 @section page_samples_artprov Art Provider Sample
 
 This sample shows how you can customize the look of standard
diff --git a/samples/archive/Makefile.in b/samples/archive/Makefile.in
new file mode 100644
index 0000000000..d69e32c3f1
--- /dev/null
+++ b/samples/archive/Makefile.in
@@ -0,0 +1,123 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.11 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+@MAKE_SET@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+INSTALL = @INSTALL@
+EXEEXT = @EXEEXT@
+BK_DEPS = @BK_DEPS@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+LIBS = @LIBS@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_XML = @EXTRALIBS_XML@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+CXXWARNINGS = @CXXWARNINGS@
+HOST_SUFFIX = @HOST_SUFFIX@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
+wx_top_builddir = @wx_top_builddir@
+
+### Variables: ###
+
+DESTDIR = 
+WX_RELEASE = 3.1
+LIBDIRNAME = $(wx_top_builddir)/lib
+ARCHIVE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(SAMPLES_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
+ARCHIVE_OBJECTS =  \
+	archive_archive.o
+
+### Conditionally set variables: ###
+
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
+@COND_BUILD_debug@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) \
+@COND_MONOLITHIC_1@	$(EXTRALIBS_XML) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@	= \
+@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	= \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@	= \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@	= \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: archive$(EXEEXT)
+
+install: 
+
+uninstall: 
+
+install-strip: install
+
+clean: 
+	rm -rf ./.deps ./.pch
+	rm -f ./*.o
+	rm -f archive$(EXEEXT)
+
+distclean: clean
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+archive$(EXEEXT): $(ARCHIVE_OBJECTS)
+	$(CXX) -o $@ $(ARCHIVE_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+archive_archive.o: $(srcdir)/archive.cpp
+	$(CXXC) -c -o $@ $(ARCHIVE_CXXFLAGS) $(srcdir)/archive.cpp
+
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean
diff --git a/samples/archive/archive.bkl b/samples/archive/archive.bkl
new file mode 100644
index 0000000000..c8a5beae83
--- /dev/null
+++ b/samples/archive/archive.bkl
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+
+<makefile>
+
+    <include file="../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="archive" template="wx_sample_console" template_append="wx_append">
+        <sources>archive.cpp</sources>
+        <wx-lib>base</wx-lib>
+        <uid type="creatorid">wx06</uid>
+    </exe>
+
+</makefile>
diff --git a/samples/archive/archive.cpp b/samples/archive/archive.cpp
new file mode 100644
index 0000000000..1707993d8d
--- /dev/null
+++ b/samples/archive/archive.cpp
@@ -0,0 +1,257 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        samples/archive/archive.cpp
+// Purpose:     A sample application to manipulate archives
+// Author:      Tobias Taschner
+// Created:     2018-02-07
+// Copyright:   (c) 2018 wxWidgets development team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+#include "wx/archive.h"
+#include "wx/app.h"
+#include "wx/cmdline.h"
+#include "wx/filename.h"
+#include "wx/sharedptr.h"
+#include "wx/vector.h"
+#include "wx/wfstream.h"
+#include "wx/zipstrm.h"
+
+class ArchiveApp: public wxAppConsole
+{
+public:
+
+    virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
+
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
+
+    virtual int OnRun() wxOVERRIDE;
+
+private:
+    enum ArchiveCommandType
+    {
+        CMD_CREATE,
+        CMD_LIST,
+        CMD_EXTRACT,
+        CMD_NONE
+    };
+
+    struct ArchiveCommandDesc
+    {
+        ArchiveCommandType type;
+        const char* id;
+        const char* desc;
+    };
+
+    static const ArchiveCommandDesc s_cmdDesc[];
+
+    ArchiveCommandType m_command;
+    wxString m_archiveFileName;
+    wxVector<wxString> m_fileNames;
+    bool m_forceZip64;
+
+    const wxArchiveClassFactory* m_archiveClassFactory;
+
+    int DoCreate();
+
+    int DoList();
+
+    int DoExtract();
+
+    bool CopyStreamData(wxInputStream& inputStream, wxOutputStream& outputStream, wxFileOffset size);
+};
+
+const ArchiveApp::ArchiveCommandDesc ArchiveApp::s_cmdDesc[] =
+{
+    {CMD_CREATE, "c", "create"},
+    {CMD_LIST, "l", "list"},
+    {CMD_EXTRACT, "x", "extract"},
+
+    {CMD_NONE, 0, 0}
+};
+
+void ArchiveApp::OnInitCmdLine(wxCmdLineParser& parser)
+{
+    wxAppConsole::OnInitCmdLine(parser);
+
+    parser.AddParam("command");
+    parser.AddParam("archive_name");
+    parser.AddParam("file_names", wxCMD_LINE_VAL_STRING,
+      wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL);
+    parser.AddSwitch("", "force-zip64", "Force ZIP64 format when creating ZIP archives");
+
+    parser.AddUsageText("\ncommand:");
+    for (const ArchiveCommandDesc* cmdDesc = s_cmdDesc; cmdDesc->type != CMD_NONE; cmdDesc++)
+        parser.AddUsageText(wxString::Format("  %s: %s", cmdDesc->id, cmdDesc->desc));
+
+    wxString formats;
+    for(const wxArchiveClassFactory* factory = wxArchiveClassFactory::GetFirst(); factory;
+        factory = factory->GetNext())
+    {
+        if(!formats.empty())
+            formats += ", ";
+        formats += factory->GetProtocol();
+    }
+    parser.AddUsageText("\nsupported formats: " + formats);
+}
+
+bool ArchiveApp::OnCmdLineParsed(wxCmdLineParser& parser)
+{
+    m_command = CMD_NONE;
+    wxString command = parser.GetParam();
+    for (const ArchiveCommandDesc* cmdDesc = s_cmdDesc; cmdDesc->type != CMD_NONE; cmdDesc++)
+    {
+        if (cmdDesc->id == command)
+            m_command = cmdDesc->type;
+    }
+    if(m_command == CMD_NONE)
+    {
+        wxLogError("Invalid command: %s", command);
+        return false;
+    }
+    m_archiveFileName = parser.GetParam(1);
+    for (size_t i = 2; i < parser.GetParamCount(); i++)
+        m_fileNames.push_back(parser.GetParam(i));
+    m_forceZip64 = parser.FoundSwitch("force-zip64") == wxCMD_SWITCH_ON;
+
+    return wxAppConsole::OnCmdLineParsed(parser);
+}
+
+bool ArchiveApp::CopyStreamData(wxInputStream& inputStream, wxOutputStream& outputStream, wxFileOffset size)
+{
+    wxChar buf[128 * 1024];
+    int readSize = 128 * 1024;
+    wxFileOffset copiedData = 0;
+    while (copiedData < size)
+    {
+        if (copiedData + readSize > size)
+            readSize = size - copiedData;
+        inputStream.Read(buf, readSize);
+        outputStream.Write(buf, readSize);
+        copiedData += readSize;
+    }
+
+    return true;
+}
+
+int ArchiveApp::DoCreate()
+{
+    if (m_fileNames.empty())
+    {
+        wxLogError("Need at least one file to add to archive");
+        return -1;
+    }
+
+    wxTempFileOutputStream fileOutputStream(m_archiveFileName);
+    wxSharedPtr<wxArchiveOutputStream> archiveOutputStream(m_archiveClassFactory->NewStream(fileOutputStream));
+    if (m_archiveClassFactory->GetProtocol().IsSameAs("zip", false) && m_forceZip64)
+        reinterpret_cast<wxZipOutputStream*>(archiveOutputStream.get())->SetFormat(wxZIP_FORMAT_ZIP64);
+
+    for(wxVector<wxString>::iterator fileName = m_fileNames.begin(); fileName != m_fileNames.end(); fileName++)
+    {
+        wxFileName inputFileName(*fileName);
+        wxPrintf("Adding %s...\n", inputFileName.GetFullName());
+        wxFileInputStream inputFileStream(*fileName);
+        if (!inputFileStream.IsOk())
+        {
+            wxLogError("Could not open file");
+            return 1;
+        }
+        if (!archiveOutputStream->PutNextEntry(inputFileName.GetFullName(), wxDateTime::Now(), inputFileStream.GetLength()))
+            break;
+        CopyStreamData(inputFileStream, *archiveOutputStream, inputFileStream.GetLength());
+    }
+
+    if (archiveOutputStream->Close())
+    {
+        fileOutputStream.Commit();
+        wxPrintf("Created archive\n");
+        return 0;
+    }
+    else
+        return 1;
+}
+
+int ArchiveApp::DoList()
+{
+    wxFileInputStream fileInputStream(m_archiveFileName);
+    if (!fileInputStream.IsOk())
+        return 1;
+
+    wxSharedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
+    wxPrintf("Archive: %s\n", m_archiveFileName);
+    wxPrintf("Length     Date       Time     Name\n");
+    wxPrintf("---------- ---------- -------- ----\n");
+
+    wxFileOffset combinedSize = 0;
+    int entryCount = 0;
+    for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
+         entry = archiveStream->GetNextEntry())
+    {
+        combinedSize += entry->GetSize();
+        entryCount++;
+        wxPrintf("%10lld %s %s %s\n",
+                 entry->GetSize(),
+                 entry->GetDateTime().FormatISODate(),
+                 entry->GetDateTime().FormatISOTime(),
+                 entry->GetName());
+    }
+    wxPrintf("----------                     -------\n");
+    wxPrintf("%10lld                     %d files\n", combinedSize, entryCount);
+    return 0;
+}
+
+int ArchiveApp::DoExtract()
+{
+    wxFileInputStream fileInputStream(m_archiveFileName);
+    if (!fileInputStream.IsOk())
+        return 1;
+
+    wxSharedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
+    wxPrintf("Extrating from: %s\n", m_archiveFileName);
+    for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
+         entry = archiveStream->GetNextEntry())
+    {
+        wxPrintf("Extracting: %s...\n", entry->GetName());
+        wxTempFileOutputStream outputFileStream(entry->GetName());
+        CopyStreamData(*archiveStream, outputFileStream, entry->GetSize());
+        outputFileStream.Commit();
+    }
+    wxPrintf("Extracted all files\n");
+    return 0;
+}
+
+int ArchiveApp::OnRun()
+{
+    m_archiveClassFactory = wxArchiveClassFactory::Find(m_archiveFileName, wxSTREAM_FILEEXT);
+    if (!m_archiveClassFactory)
+    {
+        wxLogError("Unsupported file format");
+        return -1;
+    }
+
+    int result = -1;
+    switch (m_command) {
+        case CMD_CREATE:
+            result = DoCreate();
+            break;
+        case CMD_LIST:
+            result = DoList();
+            break;
+        case CMD_EXTRACT:
+            result = DoExtract();
+            break;
+        default:
+            break;
+    }
+
+    return result;
+}
+
+wxIMPLEMENT_APP(ArchiveApp);
diff --git a/samples/archive/archive_vc7.vcproj b/samples/archive/archive_vc7.vcproj
new file mode 100644
index 0000000000..024f99f822
--- /dev/null
+++ b/samples/archive/archive_vc7.vcproj
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<!--
+
+  This project was generated by
+  Bakefile 0.2.11 (http://www.bakefile.org)
+  Do not modify, all changes will be overwritten!
+
+-->
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="archive"
+	ProjectGUID="{9AF8BDED-5CC1-53DF-A65F-32E4061869DC}">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswud\archive\"
+				ProgramDataBaseFileName="vc_mswud\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswud\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswud\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswu\archive\"
+				ProgramDataBaseFileName="vc_mswu\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswu\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswu\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="DLL Debug|Win32"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswuddll\archive\"
+				ProgramDataBaseFileName="vc_mswuddll\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswuddll\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswuddll\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswudll\archive\"
+				ProgramDataBaseFileName="vc_mswudll\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswudll\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="vc_mswudll\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+		
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\archive.cpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		
+	</Globals>
+</VisualStudioProject>
+
diff --git a/samples/archive/archive_vc8.vcproj b/samples/archive/archive_vc8.vcproj
new file mode 100644
index 0000000000..d42996acaa
--- /dev/null
+++ b/samples/archive/archive_vc8.vcproj
@@ -0,0 +1,819 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<!--
+
+  This project was generated by
+  Bakefile 0.2.11 (http://www.bakefile.org)
+  Do not modify, all changes will be overwritten!
+
+-->
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="archive"
+	ProjectGUID="{0BF45B13-43A8-5677-8442-BE7346BF7365}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+		
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswud\archive\"
+				ProgramDataBaseFileName="vc_mswud\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswud\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswud\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswud\archive_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswu\archive\"
+				ProgramDataBaseFileName="vc_mswu\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswu\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswu\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswu\archive_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Debug|Win32"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswuddll\archive\"
+				ProgramDataBaseFileName="vc_mswuddll\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswuddll\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswuddll\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswuddll\archive_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswudll\archive\"
+				ProgramDataBaseFileName="vc_mswudll\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswudll\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswudll\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswudll\archive_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="vc_mswud_x64"
+			IntermediateDirectory="vc_mswud_x64\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswud_x64\archive\"
+				ProgramDataBaseFileName="vc_mswud_x64\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswud_x64\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswud_x64\archive.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswud_x64\archive_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="vc_mswu_x64"
+			IntermediateDirectory="vc_mswu_x64\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswu_x64\archive\"
+				ProgramDataBaseFileName="vc_mswu_x64\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswu_x64\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswu_x64\archive.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswu_x64\archive_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Debug|x64"
+			OutputDirectory="vc_mswuddll_x64"
+			IntermediateDirectory="vc_mswuddll_x64\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswuddll_x64\archive\"
+				ProgramDataBaseFileName="vc_mswuddll_x64\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswuddll_x64\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswuddll_x64\archive.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswuddll_x64\archive_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Release|x64"
+			OutputDirectory="vc_mswudll_x64"
+			IntermediateDirectory="vc_mswudll_x64\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswudll_x64\archive\"
+				ProgramDataBaseFileName="vc_mswudll_x64\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswudll_x64\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswudll_x64\archive.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswudll_x64\archive_vc8.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\archive.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		
+	</Globals>
+</VisualStudioProject>
+
diff --git a/samples/archive/archive_vc9.vcproj b/samples/archive/archive_vc9.vcproj
new file mode 100644
index 0000000000..5455c91801
--- /dev/null
+++ b/samples/archive/archive_vc9.vcproj
@@ -0,0 +1,791 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<!--
+
+  This project was generated by
+  Bakefile 0.2.11 (http://www.bakefile.org)
+  Do not modify, all changes will be overwritten!
+
+-->
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="archive"
+	ProjectGUID="{DC8BF230-646B-5093-AF0A-994E770B5099}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+		
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="vc_mswud"
+			IntermediateDirectory="vc_mswud\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswud\archive\"
+				ProgramDataBaseFileName="vc_mswud\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswud\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswud\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswud\archive_vc9.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="vc_mswu"
+			IntermediateDirectory="vc_mswu\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswu\archive\"
+				ProgramDataBaseFileName="vc_mswu\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswu\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswu\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswu\archive_vc9.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Debug|Win32"
+			OutputDirectory="vc_mswuddll"
+			IntermediateDirectory="vc_mswuddll\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswuddll\archive\"
+				ProgramDataBaseFileName="vc_mswuddll\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswuddll\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswuddll\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswuddll\archive_vc9.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Release|Win32"
+			OutputDirectory="vc_mswudll"
+			IntermediateDirectory="vc_mswudll\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswudll\archive\"
+				ProgramDataBaseFileName="vc_mswudll\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswudll\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswudll\archive.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswudll\archive_vc9.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="vc_mswud_x64"
+			IntermediateDirectory="vc_mswud_x64\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswud_x64\archive\"
+				ProgramDataBaseFileName="vc_mswud_x64\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswud_x64\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswud_x64\archive.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswud_x64\archive_vc9.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="vc_mswu_x64"
+			IntermediateDirectory="vc_mswu_x64\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswu_x64\archive\"
+				ProgramDataBaseFileName="vc_mswu_x64\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_lib\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswu_x64\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_lib"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswu_x64\archive.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswu_x64\archive_vc9.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Debug|x64"
+			OutputDirectory="vc_mswuddll_x64"
+			IntermediateDirectory="vc_mswuddll_x64\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswud;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswuddll_x64\archive\"
+				ProgramDataBaseFileName="vc_mswuddll_x64\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswud;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswuddll_x64\archive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswuddll_x64\archive.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswuddll_x64\archive_vc9.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Release|x64"
+			OutputDirectory="vc_mswudll_x64"
+			IntermediateDirectory="vc_mswudll_x64\archive"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="2"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswu;.\..\..\include;."
+				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				ExceptionHandling="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				ObjectFile="vc_mswudll_x64\archive\"
+				ProgramDataBaseFileName="vc_mswudll_x64\archive.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"
+				Culture="1033"
+				AdditionalIncludeDirectories=".\..\..\lib\vc_x64_dll\mswu;.\..\..\include;."
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=""
+				AdditionalDependencies="wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				OutputFile="vc_mswudll_x64\archive.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=".\..\..\lib\vc_x64_dll"
+				GenerateManifest="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="vc_mswudll_x64\archive.pdb"
+				SubSystem="1"
+				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="vc_mswudll_x64\archive_vc9.bsc"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\archive.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+		
+	</Globals>
+</VisualStudioProject>
+
diff --git a/samples/archive/makefile.bcc b/samples/archive/makefile.bcc
new file mode 100644
index 0000000000..451884c54c
--- /dev/null
+++ b/samples/archive/makefile.bcc
@@ -0,0 +1,202 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.11 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = bcc
+OBJS = \
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ARCHIVE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+	$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. \
+	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
+ARCHIVE_OBJECTS =  \
+	$(OBJS)\archive_archive.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =   
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 = 
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+	-if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\archive.exe
+
+clean: 
+	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+	-if exist $(OBJS)\*.res del $(OBJS)\*.res
+	-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+	-if exist $(OBJS)\archive.exe del $(OBJS)\archive.exe
+	-if exist $(OBJS)\archive.tds del $(OBJS)\archive.tds
+	-if exist $(OBJS)\archive.ilc del $(OBJS)\archive.ilc
+	-if exist $(OBJS)\archive.ild del $(OBJS)\archive.ild
+	-if exist $(OBJS)\archive.ilf del $(OBJS)\archive.ilf
+	-if exist $(OBJS)\archive.ils del $(OBJS)\archive.ils
+
+$(OBJS)\archive.exe: $(ARCHIVE_OBJECTS)
+	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+	c0x32.obj $(ARCHIVE_OBJECTS),$@,, $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,
+|
+
+$(OBJS)\archive_archive.obj: .\archive.cpp
+	$(CXX) -q -c -P -o$@ $(ARCHIVE_CXXFLAGS) .\archive.cpp
+
diff --git a/samples/archive/makefile.gcc b/samples/archive/makefile.gcc
new file mode 100644
index 0000000000..45e18f09b1
--- /dev/null
+++ b/samples/archive/makefile.gcc
@@ -0,0 +1,197 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.11 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = gcc
+OBJS = \
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ARCHIVE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W \
+	-Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ARCHIVE_OBJECTS =  \
+	$(OBJS)\archive_archive.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw$(TOOLKIT_VERSION)
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =   
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
+endif
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+	-if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\archive.exe
+
+clean: 
+	-if exist $(OBJS)\*.o del $(OBJS)\*.o
+	-if exist $(OBJS)\*.d del $(OBJS)\*.d
+	-if exist $(OBJS)\archive.exe del $(OBJS)\archive.exe
+
+$(OBJS)\archive.exe: $(ARCHIVE_OBJECTS)
+	$(CXX) -o $@ $(ARCHIVE_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
+
+$(OBJS)\archive_archive.o: ./archive.cpp
+	$(CXX) -c -o $@ $(ARCHIVE_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/samples/archive/makefile.unx b/samples/archive/makefile.unx
new file mode 100644
index 0000000000..3e548451bc
--- /dev/null
+++ b/samples/archive/makefile.unx
@@ -0,0 +1,100 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.11 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# C++ compiler 
+CXX = `$(WX_CONFIG) --cxx`
+
+# Standard flags for C++ 
+CXXFLAGS ?= 
+
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS ?= 
+
+# Standard linker flags 
+LDFLAGS ?= 
+
+# Location and arguments of wx-config script 
+WX_CONFIG ?= wx-config
+
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
+
+# Use DLL build of wx library to use? [0,1]
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
+
+# Compile Unicode build of wxWidgets? [0,1]
+WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
+
+# Version of the wx library to build against. 
+WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
+
+
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
+WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
+WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
+WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
+	--toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+ARCHIVE_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
+	$(CXXFLAGS)
+ARCHIVE_OBJECTS =  \
+	archive_archive.o
+
+### Conditionally set variables: ###
+
+ifeq ($(WX_UNICODE),0)
+WX_CONFIG_UNICODE_FLAG = --unicode=no
+endif
+ifeq ($(WX_UNICODE),1)
+WX_CONFIG_UNICODE_FLAG = --unicode=yes
+endif
+ifeq ($(WX_SHARED),0)
+WX_CONFIG_SHARED_FLAG = --static=yes
+endif
+ifeq ($(WX_SHARED),1)
+WX_CONFIG_SHARED_FLAG = --static=no
+endif
+
+
+### Targets: ###
+
+all: test_for_selected_wxbuild archive
+
+install: 
+
+uninstall: 
+
+clean: 
+	rm -f ./*.o
+	rm -f ./*.d
+	rm -f archive
+
+test_for_selected_wxbuild: 
+	@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
+
+archive: $(ARCHIVE_OBJECTS)
+	$(CXX) -o $@ $(ARCHIVE_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs base`
+
+archive_archive.o: ./archive.cpp
+	$(CXX) -c -o $@ $(ARCHIVE_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all install uninstall clean
+
+
+# Dependencies tracking:
+-include ./*.d
diff --git a/samples/archive/makefile.vc b/samples/archive/makefile.vc
new file mode 100644
index 0000000000..b360ae12c3
--- /dev/null
+++ b/samples/archive/makefile.vc
@@ -0,0 +1,302 @@
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.11 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 31
+COMPILER_PREFIX = vc
+OBJS = \
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
+LIBDIRNAME = \
+	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ARCHIVE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+	$(__DEBUGINFO_0) /Fd$(OBJS)\archive.pdb $(____DEBUGRUNTIME_3_p) \
+	$(__OPTIMIZEFLAG_6) /D_CRT_SECURE_NO_DEPRECATE=1 \
+	/D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \
+	$(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
+	$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
+	$(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_CONSOLE \
+	/DwxUSE_GUI=0 $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) \
+	$(CXXFLAGS)
+ARCHIVE_OBJECTS =  \
+	$(OBJS)\archive_archive.obj
+
+### Conditionally set variables: ###
+
+!if "$(TARGET_CPU)" == "AMD64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+ARCH_SUFFIX = _ia64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+ARCH_SUFFIX = _x64
+!endif
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw$(TOOLKIT_VERSION)
+!endif
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "X64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "x64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =   
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 = 
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 = /GR-
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+	-if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\archive.exe
+
+clean: 
+	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+	-if exist $(OBJS)\*.res del $(OBJS)\*.res
+	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+	-if exist $(OBJS)\archive.exe del $(OBJS)\archive.exe
+	-if exist $(OBJS)\archive.ilk del $(OBJS)\archive.ilk
+	-if exist $(OBJS)\archive.pdb del $(OBJS)\archive.pdb
+
+$(OBJS)\archive.exe: $(ARCHIVE_OBJECTS)
+	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\archive.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+	$(ARCHIVE_OBJECTS)   $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\archive_archive.obj: .\archive.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ARCHIVE_CXXFLAGS) .\archive.cpp
+
diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index a8358a557f..11b46019ca 100644
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -83,7 +83,7 @@ __xrc___depname = xrc
 
 ### Targets: ###
 
-all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi $(__mediaplayer___depname) menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing $(__propgrid___depname) regtest render $(__ribbon___depname) $(__richtext___depname) sashtest scroll secretstore shaped sockets sound $(__splash___depname) splitter statbar $(__stc___depname) svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll $(__webview___depname) widgets wizard wrapsizer $(__xrc___depname)
+all: access animate archive artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi $(__mediaplayer___depname) menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing $(__propgrid___depname) regtest render $(__ribbon___depname) $(__richtext___depname) sashtest scroll secretstore shaped sockets sound $(__splash___depname) splitter statbar $(__stc___depname) svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll $(__webview___depname) widgets wizard wrapsizer $(__xrc___depname)
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -97,6 +97,10 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>animate.bat
 	call animate.bat
 	@del animate.bat
+	@echo cd archive >archive.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>archive.bat
+	call archive.bat
+	@del archive.bat
 	@echo cd artprov >artprov.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>artprov.bat
 	call artprov.bat
@@ -426,6 +430,12 @@ animate:
 	call animate.bat
 	@del animate.bat
 
+archive: 
+	@echo cd archive >archive.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>archive.bat
+	call archive.bat
+	@del archive.bat
+
 artprov: 
 	@echo cd artprov >artprov.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>artprov.bat
diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index a2b888ebe7..fb5ec26a18 100644
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -80,13 +80,14 @@ endif
 
 ### Targets: ###
 
-all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi $(__mediaplayer___depname) menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing $(__propgrid___depname) regtest render $(__ribbon___depname) $(__richtext___depname) sashtest scroll secretstore shaped sockets sound $(__splash___depname) splitter statbar $(__stc___depname) svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll $(__webview___depname) widgets wizard wrapsizer $(__xrc___depname)
+all: access animate archive artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi $(__mediaplayer___depname) menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing $(__propgrid___depname) regtest render $(__ribbon___depname) $(__richtext___depname) sashtest scroll secretstore shaped sockets sound $(__splash___depname) splitter statbar $(__stc___depname) svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll $(__webview___depname) widgets wizard wrapsizer $(__xrc___depname)
 
 clean: 
 	-if exist .\*.o del .\*.o
 	-if exist .\*.d del .\*.d
 	$(MAKE) -C access -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C animate -f makefile.gcc $(MAKEARGS) clean
+	$(MAKE) -C archive -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean
@@ -173,6 +174,9 @@ access:
 animate: 
 	$(MAKE) -C animate -f makefile.gcc $(MAKEARGS) all
 
+archive: 
+	$(MAKE) -C archive -f makefile.gcc $(MAKEARGS) all
+
 artprov: 
 	$(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all
 
@@ -440,14 +444,14 @@ endif
 memcheck: 
 	$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \
-	config console dataview dialogs dialup display dll dnd docview dragimag drawing \
-	erase event except exec font grid help htlbox html image internat ipc joytest \
-	keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \
-	opengl ownerdrw popup power preferences printing propgrid regtest render ribbon \
-	richtext sashtest scroll secretstore shaped sockets sound splash splitter statbar \
-	stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate \
-	vscroll webview widgets wizard wrapsizer xrc memcheck
+.PHONY: all clean access animate archive artprov aui calendar caret clipboard \
+	collpane combo config console dataview dialogs dialup display dll dnd docview \
+	dragimag drawing erase event except exec font grid help htlbox html image internat \
+	ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg \
+	notebook oleauto opengl ownerdrw popup power preferences printing propgrid \
+	regtest render ribbon richtext sashtest scroll secretstore shaped sockets sound \
+	splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl \
+	typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc memcheck
 
 
 SHELL := $(COMSPEC)
diff --git a/samples/makefile.vc b/samples/makefile.vc
index ca0f0b1fc0..b0dc178ce9 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -74,7 +74,7 @@ __xrc___depname = sub_xrc
 
 ### Targets: ###
 
-all: sub_access sub_animate sub_artprov $(__aui___depname) sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event $(__except___depname) sub_exec sub_font sub_grid $(__help___depname) $(__htlbox___depname) $(__html___depname) sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi $(__mediaplayer___depname) sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing $(__propgrid___depname) sub_regtest sub_render $(__ribbon___depname) $(__richtext___depname) sub_sashtest sub_scroll sub_secretstore sub_shaped sub_sockets sub_sound $(__splash___depname) sub_splitter sub_statbar $(__stc___depname) sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll $(__webview___depname) sub_widgets sub_wizard sub_wrapsizer $(__xrc___depname)
+all: sub_access sub_animate sub_archive sub_artprov $(__aui___depname) sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event $(__except___depname) sub_exec sub_font sub_grid $(__help___depname) $(__htlbox___depname) $(__html___depname) sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi $(__mediaplayer___depname) sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing $(__propgrid___depname) sub_regtest sub_render $(__ribbon___depname) $(__richtext___depname) sub_sashtest sub_scroll sub_secretstore sub_shaped sub_sockets sub_sound $(__splash___depname) sub_splitter sub_statbar $(__stc___depname) sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll $(__webview___depname) sub_widgets sub_wizard sub_wrapsizer $(__xrc___depname)
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -86,6 +86,9 @@ clean:
 	cd animate
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd "$(MAKEDIR)"
+	cd archive
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd "$(MAKEDIR)"
 	cd artprov
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd "$(MAKEDIR)"
@@ -340,6 +343,11 @@ sub_animate:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
 
+sub_archive: 
+	cd archive
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd "$(MAKEDIR)"
+
 sub_artprov: 
 	cd artprov
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
diff --git a/samples/samples.bkl b/samples/samples.bkl
index b87921a8eb..3d415c22c1 100644
--- a/samples/samples.bkl
+++ b/samples/samples.bkl
@@ -14,6 +14,7 @@
     <!-- all samples are enumerated here: -->
     <subproject id="access" template="sub"/>
     <subproject id="animate" template="sub"/>
+    <subproject id="archive" template="sub"/>
     <subproject id="artprov" template="sub"/>
     <subproject id="aui" template="sub" cond="USE_HTML=='1'"/>
     <subproject id="calendar" template="sub"/>

From 4e5904a4cc54e7dc7ceb3397f3a5fb31bb2caa67 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 20 Feb 2018 14:47:12 +0100
Subject: [PATCH 388/916] Remove unused buildbot XML configuration files

Buildbot configuration was redone in pure Python (see master.cfg in
https://github.com/wxWidgets/buildbot repository) since several years
already, there is no need to keep these obsolete files.
---
 build/buildbot/config/StellarWerx32.xml      |  47 --
 build/buildbot/config/StellarWerx64.xml      |  47 --
 build/buildbot/config/TBITCWXBUILDBOT.xml    |  67 --
 build/buildbot/config/brandt32.xml           | 119 ---
 build/buildbot/config/brandt64.xml           |  35 -
 build/buildbot/config/common.xml             | 133 ---
 build/buildbot/config/csleobuild.xml         |  88 --
 build/buildbot/config/example.xml            | 151 ----
 build/buildbot/config/include/csleobuild.xml |  38 -
 build/buildbot/config/include/defs.xml       | 833 -------------------
 build/buildbot/config/include/push.xml       |  40 -
 build/buildbot/config/include/unix.xml       |  91 --
 build/buildbot/config/include/wx-devs.xml    |  48 --
 build/buildbot/config/include/xp_vc.xml      |  79 --
 build/buildbot/config/push.xml               |  85 --
 build/buildbot/config/ravnsgaard.xml         |  48 --
 build/buildbot/config/xp_vc.xml              |  83 --
 build/buildbot/tools/bot.xsd                 |  15 -
 build/buildbot/tools/check.sh                | 182 ----
 build/buildbot/tools/email.xsl               |  39 -
 build/buildbot/tools/embedded.xsl            | 349 --------
 docs/contributing/how-to-release.md          |   4 +-
 22 files changed, 2 insertions(+), 2619 deletions(-)
 delete mode 100644 build/buildbot/config/StellarWerx32.xml
 delete mode 100644 build/buildbot/config/StellarWerx64.xml
 delete mode 100644 build/buildbot/config/TBITCWXBUILDBOT.xml
 delete mode 100644 build/buildbot/config/brandt32.xml
 delete mode 100644 build/buildbot/config/brandt64.xml
 delete mode 100644 build/buildbot/config/common.xml
 delete mode 100644 build/buildbot/config/csleobuild.xml
 delete mode 100644 build/buildbot/config/example.xml
 delete mode 100644 build/buildbot/config/include/csleobuild.xml
 delete mode 100644 build/buildbot/config/include/defs.xml
 delete mode 100644 build/buildbot/config/include/push.xml
 delete mode 100644 build/buildbot/config/include/unix.xml
 delete mode 100644 build/buildbot/config/include/wx-devs.xml
 delete mode 100644 build/buildbot/config/include/xp_vc.xml
 delete mode 100644 build/buildbot/config/push.xml
 delete mode 100644 build/buildbot/config/ravnsgaard.xml
 delete mode 100644 build/buildbot/config/xp_vc.xml
 delete mode 100644 build/buildbot/tools/bot.xsd
 delete mode 100755 build/buildbot/tools/check.sh
 delete mode 100644 build/buildbot/tools/email.xsl
 delete mode 100644 build/buildbot/tools/embedded.xsl

diff --git a/build/buildbot/config/StellarWerx32.xml b/build/buildbot/config/StellarWerx32.xml
deleted file mode 100644
index 47ac0ff679..0000000000
--- a/build/buildbot/config/StellarWerx32.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       StellarWerx32.xml
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/unix.xml"/>
-
-<build>
-    <name>Linux x86 wxGTK trunk STL</name>
-    <builddir>stellarwerx32_wxgtk</builddir>
-    <scheduler>trunk_quick</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--enable-stl --enable-debug"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86 wxX11 stable</name>
-    <builddir>stellarwerx32_wxx11</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--with-x11"/>
-        <compile-all utils="false"/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86 wxGTK trunk ANSI</name>
-    <builddir>stellarwerx32_wxgtk_ansi</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--disable-unicode --enable-debug"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-</bot>
diff --git a/build/buildbot/config/StellarWerx64.xml b/build/buildbot/config/StellarWerx64.xml
deleted file mode 100644
index ec76dadf96..0000000000
--- a/build/buildbot/config/StellarWerx64.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       StellarWerx64.xml
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/unix.xml"/>
-
-<build>
-    <name>Linux x86_64 wxGTK stable</name>
-    <builddir>stellarwerx64_wxgtk</builddir>
-    <scheduler>stable_quick</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--enable-compat26"/>
-        <compile-all utils="false"/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86_64 wxX11 trunk</name>
-    <builddir>stellarwerx64_wxx11</builddir>
-    <scheduler>daily_0700</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--with-x11 --enable-debug"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86_64 wxGTK stable ANSI</name>
-    <builddir>stellarwerx64_wxgtk_ansi</builddir>
-    <scheduler>daily_0700</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--disable-unicode"/>
-        <compile-all utils="false"/>
-        <run-tests/>
-    </steps>
-</build>
-
-</bot>
diff --git a/build/buildbot/config/TBITCWXBUILDBOT.xml b/build/buildbot/config/TBITCWXBUILDBOT.xml
deleted file mode 100644
index a205230aba..0000000000
--- a/build/buildbot/config/TBITCWXBUILDBOT.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       TBITCWXBUILDBOT.xml
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/unix.xml"/>
-
-<build>
-    <name>MinGW x86 trunk</name>
-    <builddir>tbitcwxbuildbot_mingw_trunk</builddir>
-    <scheduler>trunk_quick</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--host=i586-mingw32msvc
-                            --with-cppunit-prefix=/usr/local/i586-mingw32msvc"/>
-        <compile-all/>
-    </steps>
-</build>
-
-<build>
-    <name>MinGW x86 stable</name>
-    <builddir>tbitcwxbuildbot_mingw_stable</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--host=i586-mingw32msvc
-                            --with-cppunit-prefix=/usr/local/i586-mingw32msvc"/>
-        <compile-all utils="false"/>
-    </steps>
-</build>
-
-<!--
-    Commented out 64-bit builds as no 64-bit compiler at the moment.
-
-    If you're re-enabling them take out the space between the hyphens of the
-    configure options below, e.g. take out the space from "- -host=".
-
-<build>
-    <name>MinGW x86_64 trunk</name>
-    <builddir>tbitcwxbuildbot_mingw64_trunk</builddir>
-    <scheduler>trunk_quick</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="- -host=amd64-mingw32msvc
-                            - -with-cppunit-prefix=/usr/local/amd64-mingw32msvc"/>
-        <compile-all/>
-    </steps>
-</build>
-
-<build>
-    <name>MinGW x86_64 stable</name>
-    <builddir>tbitcwxbuildbot_mingw64_stable</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="- -host=amd64-mingw32msvc
-                            - -with-cppunit-prefix=/usr/local/amd64-mingw32msvc"/>
-        <compile-all utils="false"/>
-    </steps>
-</build>
-
--->
-
-</bot>
diff --git a/build/buildbot/config/brandt32.xml b/build/buildbot/config/brandt32.xml
deleted file mode 100644
index 4575b0cfe5..0000000000
--- a/build/buildbot/config/brandt32.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       brandt32.xml
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/unix.xml"/>
-
-<build>
-    <name>Linux x86 wxGTK trunk</name>
-    <builddir>brandt32_gtk</builddir>
-    <scheduler>trunk_quick</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--enable-compat28 --enable-debug"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86 wxGTK trunk STL no compat</name>
-    <builddir>brandt32_gtk_stl</builddir>
-    <scheduler>trunk_quick</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--disable-compat28 --enable-stl"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86 wxGTK trunk static</name>
-    <builddir>brandt32_gtk_trunk_static</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--disable-shared --enable-debug"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86 wxGTK stable static</name>
-    <builddir>brandt32_gtk_stable_static</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--disable-shared"/>
-        <compile-all utils="false"/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86 wxDFB trunk</name>
-    <builddir>brandt32_dfb_trunk</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--with-directfb --enable-debug"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x86 wxDFB stable</name>
-    <builddir>brandt32_dfb_stable</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--with-directfb"/>
-        <compile-all utils="false"/>
-        <run-tests/>
-    </steps>
-</build>
-
-<!-- These last three are ravnsgaard's job's moved here while it is down -->
-<build>
-    <name>Linux i386 wxGTK stable STL</name>
-    <builddir>brandt32_wxgtk_stable</builddir>
-    <scheduler>stable_quick</scheduler>
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--enable-stl"/>
-        <compile-all utils="false"/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux i386 wxGTK trunk no gui</name>
-    <builddir>brandt32_wxgtk_nogui</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--disable-gui --enable-debug"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux i386 wxGTK trunk no features</name>
-    <builddir>brandt32_wxgtk_nofeatures</builddir>
-    <scheduler>daily_0600</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--disable-all-features --enable-debug"/>
-        <compile-all utils="false"/>
-        <run-tests/>
-    </steps>
-</build>
-</bot>
diff --git a/build/buildbot/config/brandt64.xml b/build/buildbot/config/brandt64.xml
deleted file mode 100644
index 51d5587ff0..0000000000
--- a/build/buildbot/config/brandt64.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       brandt64.xml
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/unix.xml"/>
-
-<build>
-    <name>Linux x64 wxGTK trunk</name>
-    <builddir>brandt64_gtk</builddir>
-    <scheduler>trunk_quick</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--enable-compat28 --enable-debug"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>Linux x64 wxGTK trunk STL no compat</name>
-    <builddir>brandt64_gtk_stl</builddir>
-    <scheduler>trunk_quick</scheduler>
-    <steps>
-        <checkout/>
-        <configure options="--disable-compat28 --enable-stl"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-</bot>
diff --git a/build/buildbot/config/common.xml b/build/buildbot/config/common.xml
deleted file mode 100644
index 1aea286c16..0000000000
--- a/build/buildbot/config/common.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       common.xml
-    Purpose:    Schedulers and locks common to all slaves.
-    Author:     Mike Wetherell
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWindows licence
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/defs.xml"/>
-
-<!--
-    Quick schedulers. Builds using these are triggered after each change to
-    the sources on the given branch.
-
-    name:               unique
-    branch:             branch to watch
-    treeStableTimer:    wait until the tree has stopped changing for the
-                        given number of seconds before firing
-    fileNotImportant:   files matching these patterns do not trigger a build
--->
-
-<scheduler>
-    <name>trunk_quick</name>
-    <branch>trunk</branch>
-    <treeStableTimer>900</treeStableTimer>
-    <fileNotImportant>docs/* interface/*</fileNotImportant>
-</scheduler>
-
-<scheduler>
-    <name>release_quick</name>
-    <branch><RELEASE_BRANCH/></branch>
-    <treeStableTimer>900</treeStableTimer>
-    <fileNotImportant>docs/* interface/*</fileNotImportant>
-</scheduler>
-
-<scheduler>
-    <name>stable_quick</name>
-    <branch><STABLE_BRANCH/></branch>
-    <treeStableTimer>900</treeStableTimer>
-    <fileNotImportant>docs/*</fileNotImportant>
-</scheduler>
-
-<!--
-    Schedulers that fire once a week.
-
-    A build can use one of these to be triggered once a week, or more than
-    one if it should run several times a week on particular days.
--->
-
-<nightly-schedulers name="sunday"/>
-<nightly-schedulers name="monday"/>
-<nightly-schedulers name="tuesday"/>
-<nightly-schedulers name="wednesday"/>
-<nightly-schedulers name="thursday"/>
-<nightly-schedulers name="friday"/>
-<nightly-schedulers name="saturday"/>
-
-<!--
-    Schedulers for daily builds.
--->
-
-<nightly-schedulers name="daily"/>
-
-<!--
-    A general purpose slave lock and ones for the trunk and stable branches.
--->
-
-<slavelock>
-    <name>slave</name>
-</slavelock>
-
-<slavelock>
-    <name>trunk</name>
-</slavelock>
-
-<slavelock>
-    <name><STABLE_BRANCH/></name>
-</slavelock>
-
-<slavelock>
-    <name><RELEASE_BRANCH/></name>
-</slavelock>
-
-<!--
-    Map SVN user ids to email addresses.
-
-    The email address in wx-devs.xml can be overridden by adding a line like
-    this after the xi:include:
-
-        <email id="JMS">jaakko.salli -at- dnainternet.net</email>
-
-    or disabled using an empty tag:
-
-        <email id="JMS"/>
--->
-
-<emaillookup name="wx-devs">
-    <xi:include href="include/wx-devs.xml"/>
-    <!-- Overrides... -->
-</emaillookup>
-
-<!--
-    Notify people on the blame list when a build goes from good to bad.
--->
-
-<mailnotifier>
-    <mode>problem</mode>
-    <lookup>wx-devs</lookup>
-</mailnotifier>
-
-<!--
-    Log every build to a mailing list.
--->
-
-<mailnotifier>
-    <extraRecipient>wx-buildbot -at- googlegroups.com</extraRecipient>
-</mailnotifier>
-
-<!--
-    Track SVN changes using the wx-cvs mailing list.
-    The <prefix> is subtracted from the paths in the 'Modified Files:'
-    section, the remainder is then assumed to give the branch and filename.
--->
-
-<svnmaildirsource>
-    <prefix>wxWidgets</prefix>
-</svnmaildirsource>
-
-</bot>
diff --git a/build/buildbot/config/csleobuild.xml b/build/buildbot/config/csleobuild.xml
deleted file mode 100644
index 98ab7097a2..0000000000
--- a/build/buildbot/config/csleobuild.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       csleobuild.xml
-    Purpose:
-    Author:
-    Copyright:
-    Licence:
--->
-
-<bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/csleobuild.xml"/>
-
-    <xsl:variable name="CLANGOPTIONS" select="'-Qunused-arguments -Wno-deprecated-declarations'"/>
-    <xsl:variable name="CLANGOPTIONS32" select="'-Qunused-arguments -Wno-parentheses-equality -Wno-self-assign -Wno-unused-function -Wno-deprecated-declarations -arch i386'"/>
-    <xsl:variable name="CLANGOPTIONIOSSIM" select="'-Qunused-arguments -Wno-parentheses-equality -Wno-self-assign -Wno-unused-function -Wno-deprecated-declarations -arch x86_64'"/>
-    <xsl:variable name="SDK106" select="'--with-macosx-version-min=10.5 --with-macosx-sdk=/Developer/SDKs/MacOSX10.6.sdk --with-cppunit-prefix=/Developer/libstdc++variants/cppunit'"/>
-    <xsl:variable name="SDKCURRENT107" select="'--with-macosx-version-min=10.7 --with-cppunit-prefix=/Developer/libstdc++variants/cppunit'"/>
-    <xsl:variable name="SDKCURRENT" select="'--with-macosx-version-min=10.9 --with-cppunit-prefix=/Developer/libc++variants/cppunit'"/>
-    <xsl:variable name="SDKCURRENTIOSSIM" select="'--with-macosx-version-min=7.1 --with-macosx-sdk=$(xcrun --sdk iphonesimulator --show-sdk-path)'"/>
-    
-<build>
-    <name>OSX 10.9 Cocoa trunk (libstdc++)</name>
-    <builddir>csleo_cocoa</builddir>
-    <scheduler>trunk_quick</scheduler>
-
-    <steps>
-        <checkout/>
-        <configure options="--with-zlib=builtin --without-libiconv --without-liblzma {$SDKCURRENT107} CXXFLAGS='{$CLANGOPTIONS}' CFLAGS='{$CLANGOPTIONS}' OBJCXXFLAGS='{$CLANGOPTIONS}'"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>OSX 10.9 Cocoa trunk (libc++)</name>
-    <builddir>csleo_cocoalibc++</builddir>
-    <scheduler>trunk_quick</scheduler>
-    
-    <steps>
-        <checkout/>
-        <configure options="{$SDKCURRENT} CXXFLAGS='{$CLANGOPTIONS}' CFLAGS='{$CLANGOPTIONS}' OBJCXXFLAGS='{$CLANGOPTIONS}'"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>OSX 10.6 Cocoa Stable</name>
-    <builddir>csleo_stable_cocoa</builddir>
-    <scheduler>stable_quick</scheduler>
-
-    <steps>
-        <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="{$SDK106} CXXFLAGS='{$CLANGOPTIONS32}' CFLAGS='{$CLANGOPTIONS32}' OBJCXXFLAGS='{$CLANGOPTIONS32}' LDFLAGS='-arch i386'"/>
-        <compile-all/>
-        <run-tests/>
-    </steps>
-</build>
-
-<build>
-    <name>OSX 10.6 Carbon Stable</name>
-    <builddir>csleo_stable_carbon</builddir>
-    <scheduler>stable_quick</scheduler>
-
-    <steps>
-    <checkout branch="{$STABLE_BRANCH}"/>
-        <configure options="--with-osx_carbon {$SDK106} CXXFLAGS='{$CLANGOPTIONS32}' CFLAGS='{$CLANGOPTIONS32}' OBJCXXFLAGS='{$CLANGOPTIONS32}' LDFLAGS='-arch i386'"/>
-    <compile-all/>
-    <run-tests/>
-    </steps>
-</build>
-   
-<build>
-    <name>iOS 7.1 64bit iPad sim trunk</name>
-    <builddir>csios64_ipadsim</builddir>
-    <scheduler>trunk_quick</scheduler>
-    
-    <steps>
-        <checkout/>
-        <configure options="--with-osx_iphone --enable-monolithic {$SDKCURRENTIOSSIM} CXXFLAGS='{$CLANGOPTIONIOSSIM}' CFLAGS='{$CLANGOPTIONIOSSIM}' OBJCXXFLAGS='{$CLANGOPTIONIOSSIM}'"/>
-        <compile-all samples="false" utils="false" demos="false" contrib="false" tests="false" />
-    </steps>
-</build>
-    
-</bot>
diff --git a/build/buildbot/config/example.xml b/build/buildbot/config/example.xml
deleted file mode 100644
index 5b60997212..0000000000
--- a/build/buildbot/config/example.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       example.xml
-    Purpose:    Buildbot example configuration.
-    Author:     Mike Wetherell
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWindows licence
-
-    There is one xml file such as this per build slave containing a <build>
-    element for each build the slave runs. Each <build> corresponds to a
-    column in the waterfall display.
-
-    For full documentation see:
-    https://wiki.wxwidgets.org/Development:_Buildbot
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<!--
-    Common declarations.
--->
-<xi:include href="include/defs.xml"/>
-
-<!--
-    Notes:
-
-    The elements marked 'Unique' below must be unique across all builds on
-    all slaves.
-
-    If a build is currently failing because of something other than a bug in
-    wxWidgets, e.g. out of space or missing libs, then comment it out, or
-    add '** Ignore **' to the beginning of the <name>, so that wxWidgets
-    developers know not to waste time investigating.
--->
-<build>
-    <!--
-        Unique. Appears as the title in the waterfall display.
-    -->
-    <name>Linux x86_64 wxGTK Stable</name>
-
-    <!--
-        Unique. The name of a directory for the bulid.
-    -->
-    <builddir>example_gtk</builddir>
-
-    <!--
-        The name of a scheduler that will trigger this build. common.xml
-        currently defines:
-
-        * 'trunk_quick' and 'stable_quick'. These trigger a build after
-          every source change on the trunk and stable branches respectively.
-
-        * Weekly schedulers that fire once a week. There is one of these
-          for every half hour of the week, e.g. you have monday_0600,
-          monday_0630, etc..
-
-        * Daily schedulers that fire once a day. There is also one of these
-          for every half hour, e.g. daily_0600, daily_0630, etc..
-
-        An empty <scheduler/> element takes its value from the previous build
-        incremented in the following way:
-
-        * Weekly schedulers are incremented by a day, monday_0600 becomes
-          tuesday_0600, and at the end of the week the time is also bumped by
-          an hour, saturday_0600 becomes sunday_0700.
-
-        * Daily scheduler are incremented by an hour.
-
-        The <scheduler> element can be omitted, in which case the build
-        never runs automatically, but can still be triggered manually.
-        Or you can use several, e.g. you could use two weekly schedulers
-        that fire on different days to have a build run twice a week.
-    -->
-    <scheduler>monday_0600</scheduler>
-
-    <!--
-        The meaning of <sandbox> is specific to the build slave. There
-        should be a comment in the slave's configuration file saying if they
-        are allowed or required. On the testdrive it specifies the remote
-        machine that will run the bulid.
-    -->
-    <sandbox>debug</sandbox>
-
-    <!--
-        You can override the make command the compile steps will use using
-        this <make> element, if omitted defaults to 'make'. For Windows
-        builds this becomes the place to put build options as there is no
-        configure step.
-    -->
-    <make>nmake -f makefile.vc SHARED=1 CPPUNIT_CFLAGS=-I\cppunit\include CPPUNIT_LIBS=cppunit.lib</make>
-
-    <!--
-        The build steps.
-    -->
-    <steps>
-        <!--
-            Check out the sources, by default the trunk branch. Or for a
-            particular branch or tag, e.g.:
-                <checkout branch="{$STABLE_BRANCH}"/>
-                <checkout branch="branches/WX_2_6_BRANCH"/>
-        -->
-        <checkout/>
-
-        <!--
-            A <shellcommand> build step can be used anywhere you need to run
-            arbitrary commands not covered by the standard build steps.
-            <haltOnFailure/> specifies that the whole build fails if this
-            step fails, without it it continues with the next step anyway.
-        -->
-        <shellcommand>
-            <description>setting up</description>
-            <descriptionDone>set up</descriptionDone>
-            <haltOnFailure/>
-            <command>setup-script</command>
-        </shellcommand>
-
-        <!--
-            Configure. Options and environment variables can be added with
-            the 'options' attribute:
-                <configure options="-with-foobar CC=cc CXX=CC"/>
-            Omitted for Windows builds.
-        -->
-        <configure/>
-
-        <!--
-            Compile the wxWidgets library, subdirectories and tests.
-
-            Takes the following attributes which can all be either 'true' or
-            'false':
-                wx          - build the library
-                samples     - build the samples
-                utils       - build the utils
-                demos       - build the demos
-                contrib     - build the contrib
-                tests       - build the tests
-                msw         - the library makefile is under build\msw
-                gui         - if 'false' builds only a subset of the above
-
-            The attributes usually default to the right values.
-        -->
-        <compile-all/>
-
-        <!--
-            Run the test suites.
-        -->
-        <run-tests/>
-    </steps>
-</build>
-
-</bot>
diff --git a/build/buildbot/config/include/csleobuild.xml b/build/buildbot/config/include/csleobuild.xml
deleted file mode 100644
index 44b90328ac..0000000000
--- a/build/buildbot/config/include/csleobuild.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       include/csleobuild.xml
-    Purpose:    Declarations for the csleobuild slave
-    Author:     Michael Wetherel, Stefan Csomor
-    Copyright:  (c) Stefan Csomor
-    Licence:    wxWindows licence
--->
-
-<bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="unix.xml"/>
-
-<!--
-    run-tests - build step to run the test suites.
--->
-<xsl:template name="run-tests">
-    <xsl:param name="content"/>
-    <test>
-        <defaults content="{$content}">
-            <description>running tests</description>
-            <descriptionDone>run tests</descriptionDone>
-            <warnOnFailure/>
-        </defaults>
-        <copy-with-defaults content="{$content}">
-            <command>
-                export DYLD_LIBRARY_PATH=../lib
-                cd tests &amp;&amp;
-                ./test &amp;&amp;
-                open ./test_gui.app
-            </command>
-        </copy-with-defaults>
-    </test>
-</xsl:template>
-
-</bot>
diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
deleted file mode 100644
index c5271866e5..0000000000
--- a/build/buildbot/config/include/defs.xml
+++ /dev/null
@@ -1,833 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       include/defs.xml
-    Purpose:    Common declarations for buildbot
-    Author:     Mike Wetherell
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWindows licence
--->
-
-<bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:exsl="http://exslt.org/common"
-     xmlns:func="http://exslt.org/functions"
-     xmlns:get="local"
-     xsl:extension-element-prefixes="func"
-     xsl:version="1.0">
-
-<!--
-    Constants
--->
-<xsl:template name="SVN_URL">http://svn.wxwidgets.org/svn/wx/wxWidgets/</xsl:template>
-<xsl:template name="STABLE_BRANCH">branches/WX_3_0_BRANCH</xsl:template>
-<xsl:variable name="STABLE_BRANCH"><STABLE_BRANCH/></xsl:variable>
-<xsl:template name="RELEASE_BRANCH">branches/WX_3_1_0_BRANCH</xsl:template>
-<xsl:variable name="RELEASE_BRANCH"><RELEASE_BRANCH/></xsl:variable>
-<xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template>
-
-<!--
-    disable - comment out a section.
-
-    Usage: <disable>
-                e.g. <build> ... etc.
-           </disable>
-
-    XML comments can't contain a double hyphen which tends to be used in
-    configure commands, so <disable> can be used instead. 
--->
-<xsl:template name="disable"/>
-
-<!--
-    checkout - build step for source checkout.
-
-    Usage: as <svn> with defaults for <baseURL> and <defaultBranch>
-
-    Typically just:
-        <checkout/>
-    for the trunk, or:
-        <checkout branch="branches/WX_3_0_BRANCH"/>
-    to checkout a branch.
--->
-<xsl:template name="checkout">
-    <xsl:param name="content"/>
-    <xsl:param name="branch" select="'trunk'"/>
-    <xsl:variable name="nodes" select="exsl:node-set($content)"/>
-    <svn>
-        <xsl:if test="not($nodes/svnurl)">
-            <xsl:if test="not($nodes/baseURL)">
-                <baseURL><SVN_URL/></baseURL>
-            </xsl:if>
-            <xsl:if test="not($nodes/defaultBranch)">
-                <defaultBranch><xsl:value-of select="$branch"/></defaultBranch>
-            </xsl:if>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-    </svn>
-</xsl:template>
-
-<!--
-    configure - add the options attribute to <configure>
-
-    Usage: <configure options="-with-foobar"/>
--->
-<xsl:template name="configure">
-    <xsl:param name="content"/>
-    <xsl:param name="options"/>
-    <configure>
-        <copy-with-defaults content="{$content}">
-            <command>./configure <xsl:value-of select="normalize-space($options)"/></command>
-        </copy-with-defaults>
-    </configure>
-</xsl:template>
-
-<!--
-    make - specify the make command.
-
-    Usage: <make>nmake -f makefile.vc SHARED=1</make>
-
-    Used as a child of <build> to specify the make command used by the
-    <compile> elements below, if omitted 'make' is used.
--->
-<xsl:template name="make"/>
-
-<!--
-    compile - modifiy <compile> to default to the command given by <make>
-
-    Usage: as <compile>
-
-    The <make> element of <build> spcecifies the make command used by all
-    compile build steps in the build. If <make> is not given 'make' is used.
-
-    The command for a particular compile build step can be further overridden
-    using its <command> element:
-        <compile>
-            <command>myscript</command>
-        </compile>
--->
-<xsl:template name="compile">
-    <xsl:param name="content"/>
-    <compile>
-        <copy-with-defaults content="{$content}">
-            <command><get name="make" default="make"/></command>
-        </copy-with-defaults>
-    </compile>
-</xsl:template>
-
-<!--
-    Adds build steps to compile the library and the usual subdirectories.
-
-    Usage: as <compile> with the additional attributes below.
-
-    Usually the attributes default to suitable values, so typical usage
-    is just <compile-all/>.
-
-    <compile-all [ gui = 'true'|'false' ]
-                 [ msw = 'true'|'false' ]
-                 [ wx = 'true'|'false' ]
-                 [ samples = 'true'|'false' ]
-                 [ utils = 'true'|'false' ]
-                 [ demos = 'true'|'false' ]
-                 [ contrib = 'true'|'false' ]
-                 [ tests = 'true'|'false' ] />
-
-    gui     - if 'true' then build fully the subdirectories specified,
-              otherwise only the wxBase subset of the directories are built.
-    msw     - if 'true' then build the directory 'build/msw' when building the
-              library instead of the root.
-    wx      - build the library itself.
-    samples, utils, demos, contrib, tests
-            - build subdirectories.
--->
-<xsl:template name="compile-all">
-    <xsl:param name="content"/>
-
-    <xsl:param name="gui"><is-gui/></xsl:param>
-    <xsl:param name="msw"><is-msw/></xsl:param>
-
-    <xsl:param name="wx" select="'true'"/>
-    <xsl:param name="samples" select="'true'"/>
-    <xsl:param name="utils" select="'true'"/>
-    <xsl:param name="demos" select="$gui"/>
-    <xsl:param name="contrib"><has-contrib/></xsl:param>
-    <xsl:param name="tests"><has-tests/></xsl:param>
-
-    <xsl:param name="wx-dirs">
-        <get-dirs wx="{$wx}" gui="{$gui}" msw="{$msw}"/>
-    </xsl:param>
-    <xsl:param name="sample-dirs">
-        <get-dirs samples="{$samples}" gui="{$gui}" msw="{$msw}"/>
-    </xsl:param>
-    <xsl:param name="util-dirs">
-        <get-dirs utils="{$utils}" gui="{$gui}" msw="{$msw}"/>
-    </xsl:param>
-    <xsl:param name="demo-dirs">
-        <get-dirs demos="{$demos}" gui="{$gui}" msw="{$msw}"/>
-    </xsl:param>
-    <xsl:param name="contrib-dirs">
-        <get-dirs contrib="{$contrib}" gui="{$gui}" msw="{$msw}"/>
-    </xsl:param>
-    <xsl:param name="test-dirs">
-        <get-dirs tests="{$tests}" gui="{$gui}" msw="{$msw}"/>
-    </xsl:param>
-
-    <compile-subdirs dirs="{$wx-dirs}" halt="true">
-        <xsl:copy-of select="$content"/>
-    </compile-subdirs>
-    <compile-subdirs name="samples" dirs="{$sample-dirs}">
-        <xsl:copy-of select="$content"/>
-    </compile-subdirs>
-    <compile-subdirs name="utils" dirs="{$util-dirs}">
-        <xsl:copy-of select="$content"/>
-    </compile-subdirs>
-    <compile-subdirs name="demos" dirs="{$demo-dirs}">
-        <xsl:copy-of select="$content"/>
-    </compile-subdirs>
-    <compile-subdirs name="contrib" dirs="{$contrib-dirs}">
-        <xsl:copy-of select="$content"/>
-    </compile-subdirs>
-    <compile-subdirs name="tests" dirs="{$test-dirs}" halt="true">
-        <xsl:copy-of select="$content"/>
-    </compile-subdirs>
-</xsl:template>
-
-<!--
-    Helper for compile-all.
-    Returns the directories that need to be built for the various components:
-    wx (the library itself), samples, utils, demos, contrib and tests.
--->
-<xsl:template name="get-dirs">
-    <xsl:param name="contents"/>
-
-    <xsl:param name="gui"/>
-    <xsl:param name="msw"/>
-
-    <xsl:param name="wx"/>
-    <xsl:param name="samples"/>
-    <xsl:param name="utils"/>
-    <xsl:param name="demos"/>
-    <xsl:param name="contrib"/>
-    <xsl:param name="tests"/>
-
-    <xsl:if test="$wx = 'true'">
-        <xsl:choose>
-            <xsl:when test="$msw = 'true'">build/msw</xsl:when>
-            <xsl:otherwise>.</xsl:otherwise>
-        </xsl:choose>
-        <xsl:text> </xsl:text>
-    </xsl:if>
-
-    <xsl:if test="$samples = 'true'">
-        <xsl:choose>
-            <xsl:when test="$gui = 'true'">samples</xsl:when>
-            <xsl:otherwise>samples/console</xsl:otherwise>
-        </xsl:choose>
-        <xsl:text> </xsl:text>
-    </xsl:if>
-
-    <xsl:if test="$utils = 'true' and $gui = 'true'">utils </xsl:if>
-
-    <xsl:if test="$demos = 'true' and $gui = 'true'">demos </xsl:if>
-
-    <xsl:if test="$contrib = 'true' and $gui = 'true'">contrib </xsl:if>
-
-    <xsl:if test="$tests = 'true'">tests</xsl:if>
-</xsl:template>
-
-<!--
-    compile-subdir - build step to compile a subdirectory.
-
-    Usage: as <compile> plus the following attributes,
-           <compile-subdir dir="foobar" [ halt="true" ]/>
-
-    Compiles the named subdirectory 'foobar'. Continues with the next build
-    step on failure, unless the optional attibute 'halt="true"' is given.
-    The make command used is as described for the compile step above.
--->
-<xsl:template name="compile-subdir">
-    <xsl:param name="content"/>
-    <xsl:param name="dir"/>
-    <xsl:param name="halt" select="'false'"/>
-    <compile-subdirs name="{$dir}" dirs="{$dir}" halt="{$halt}">
-        <xsl:copy-of select="$content"/>
-    </compile-subdirs>
-</xsl:template>
-
-<!--
-    compile-subdirs - adds a compile build step for each directory in a list.
-
-    Usage: as <compile> plus the following attributes,
-           <compile-subdir dirs="foobar1 foobar2"
-                           [ name="foobars" ]
-                           [ sep=" " ]
-                           [ halt="true" ]/>
-
-    Compiles the named subdirectories. Continues with the next build
-    step on failure, unless the optional attibute 'halt="true"' is given.
-    The make command used is as described for the compile step above.
-    The 'name' attribute can be used to give a collective name for the
-    subdirectories, and the 'sep' attibute can be used to specify the
-    separator in the 'dirs' list (defaults to space).
--->
-<xsl:template name="compile-subdirs">
-    <xsl:param name="content"/>
-    <xsl:param name="name"/>
-    <xsl:param name="dirs"/>
-    <xsl:param name="sep" select="' '"/>
-    <xsl:param name="halt" select="'false'"/>
-    <xsl:if test="translate($dirs, $sep, '')">
-        <compile>
-            <defaults content="{$content}">
-                <name>
-                    <xsl:value-of select="normalize-space(concat('compile ', $name))"/>
-                </name>
-                <description>
-                    <xsl:value-of select="normalize-space(concat('compiling ', $name))"/>
-                </description>
-                <descriptionDone>
-                    <xsl:value-of select="normalize-space(concat('compile ', $name))"/>
-                </descriptionDone>
-                <haltOnFailure>
-                    <xsl:value-of select="$halt"/>
-                </haltOnFailure>
-                <warnOnFailure/>
-            </defaults>
-            <copy-with-defaults content="{$content}">
-                <command>
-                    <compile-subdirs-cmd dirs="{$dirs}" sep="{$sep}"/>
-                </command>
-            </copy-with-defaults>
-        </compile>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template name="compile-subdirs-cmd">
-    <xsl:param name="content"/>
-    <xsl:param name="dirs"/>
-    <xsl:param name="sep"/>
-    <xsl:choose>
-        <xsl:when test="contains($dirs, $sep)">
-            <xsl:variable name="before" select="substring-before($dirs, $sep)"/>
-            <xsl:variable name="after" select="substring-after($dirs, $sep)"/>
-
-            <xsl:call-template name="compile-subdirs-cmd">
-                <xsl:with-param name="dirs" select="$before"/>
-                <xsl:with-param name="sep" select="$sep"/>
-            </xsl:call-template>
-
-            <xsl:if test="$after and substring($after, 1, 1) != ' '">
-                <xsl:text> &amp;&amp; </xsl:text>
-            </xsl:if>
-
-            <xsl:call-template name="compile-subdirs-cmd">
-                <xsl:with-param name="dirs" select="$after"/>
-                <xsl:with-param name="sep" select="$sep"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="string($dirs)">
-            <xsl:if test="$dirs != '.'">cd <xsl:value-of select="$dirs"/> &amp;&amp; </xsl:if>
-            <get name="make" default="make"/>
-        </xsl:when>
-    </xsl:choose>
-</xsl:template>
-
-<!--
-    run-tests - build step to run the test suites.
-
-    Usage: as <test>
-
-    Typically just:
-        <run-tests/>
--->
-<xsl:template name="run-tests">
-    <xsl:param name="content"/>
-    <xsl:param name="options" select="'-t'"/>
-    <xsl:param name="guioptions" select="$options"/>
-    <xsl:param name="msw"><is-msw/></xsl:param>
-    <test>
-        <defaults content="{$content}">
-            <description>running tests</description>
-            <descriptionDone>run tests</descriptionDone>
-            <warnOnFailure/>
-        </defaults>
-        <copy-with-defaults content="{$content}">
-            <command>
-                <xsl:choose>
-                    <xsl:when test="$msw = 'true'">
-                        <run-tests-win options="{$options}" guioptions="{$guioptions}"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <run-tests-unix options="{$options}" guioptions="{$guioptions}"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </command>
-        </copy-with-defaults>
-    </test>
-</xsl:template>
-
-<xsl:template name="run-tests-win">
-    <xsl:param name="options"/>
-    <xsl:param name="guioptions"/>
-<normalize-space>
-cd tests &amp;&amp; runtests.bat
-</normalize-space>
-</xsl:template>
-
-<xsl:template name="run-tests-unix">
-    <xsl:param name="options"/>
-    <xsl:param name="guioptions"/>
-ERR=0
-cd tests || exit 0
-ulimit -c unlimited
-
-try()
-{
-    rm -f core
-    echo Running: "$@"
-    "$@" || ERR=$?
-
-    if [ -f core -a -x "`which gdb`" ]; then
-        echo Crashed, attempting to display backtrace:
-        gdb -batch -c core -ex 'set pagination off' -ex bt "$1"
-    fi
-
-    echo
-}
-
-try ./test <xsl:value-of select="normalize-space($options)"/>
-
-test -x test_gui || exit $ERR
-
-if [ -z "$DISPLAY" ]; then
-    echo '$DISPLAY is not set, skipping GUI tests.'
-    exit $ERR
-fi
-
-echo 'Checking window manager:'
-WINDOW_MANAGER=$(xprop -root 32x '\n$0\n' _NET_SUPPORTING_WM_CHECK | grep ^0x)
-
-if [ -z "$WINDOW_MANAGER" ]; then
-    echo 'Window manager not present, skipping GUI tests.'
-    exit $ERR
-fi
-
-xprop -id $WINDOW_MANAGER 8s _NET_WM_NAME
-echo
-
-try ./test_gui <xsl:value-of select="normalize-space($guioptions)"/>
-
-exit $ERR
-</xsl:template>
-
-<!--
-    defaults - supply default content for an element.
-
-    Usage: <defaults content="{$content}">
-               <foo>foo</foo>
-               <bar>bar</bar>
-           </defaults>
-
-    Copies those child elements that do not already exist in $content.
--->
-<xsl:template name="defaults">
-    <xsl:param name="defaults"/>
-    <xsl:param name="content"/>
-
-    <xsl:variable name="def-nodes" select="exsl:node-set($defaults)"/>
-    <xsl:variable name="cont-nodes" select="exsl:node-set($content)"/>
-
-    <xsl:for-each select="$def-nodes/*">
-        <xsl:if test="not($cont-nodes/*[name() = name(current())])">
-            <xsl:copy-of select="."/>
-        </xsl:if>
-    </xsl:for-each>
-</xsl:template>
-
-<!--
-    copy-with-defaults - copy elements supplying defaults for any that are
-                         missing or empty.
-
-    Usage: <copy-with-defaults content="{$content}">
-               <foo>foo</foo>
-               <bar>bar</bar>
-           </copy-with-defaults>
-
-    Copies $content plus any child elements that do not exist in $content,
-    substituting empty elements in $content with any child elements of the
-    same name.
--->
-<xsl:template name="copy-with-defaults">
-    <xsl:param name="defaults"/>
-    <xsl:param name="content"/>
-
-    <xsl:variable name="def-nodes" select="exsl:node-set($defaults)"/>
-    <xsl:variable name="cont-nodes" select="exsl:node-set($content)"/>
-
-    <xsl:for-each select="$def-nodes/*">
-        <xsl:if test="not($cont-nodes/*[name() = name(current())])">
-            <xsl:copy-of select="."/>
-        </xsl:if>
-    </xsl:for-each>
-
-    <xsl:for-each select="$cont-nodes/*">
-        <xsl:choose>
-            <xsl:when test="not(node())">
-                <xsl:copy-of select="$def-nodes/*[name() = name(current())]"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy-of select="."/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:for-each>
-</xsl:template>
-
-<!--
-    get - gets the text from a child element of the current build.
-
-    Usage: <get name="foobar" [ default="value" ]/>
-
-    Gets the text from the <foobar> element of the current build, or returns
-    $default if there is not such element.
--->
-<xsl:template name="get">
-    <xsl:param name="content"/>
-    <xsl:param name="build" select="get:build()"/>
-    <xsl:param name="name"/>
-    <xsl:param name="default"/>
-    <xsl:variable name="property" select="get:property($name, $build)"/>
-    <strip>
-        <xsl:choose>
-            <xsl:when test="$property">
-                <xsl:apply-templates select="$property/node()"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$default"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </strip>
-</xsl:template>
-
-<!--
-    Accessors to get builds and their fields. XSLT code should use these
-    instead of traversing the input tree directly.
--->
-<func:function name="get:build">
-    <func:result select="ancestor-or-self::build[last()]"/>
-</func:function>
-
-<func:function name="get:all-builds">
-    <func:result select="//build[not(ancestor::*[name() != name(/*)])]"/>
-</func:function>
-
-<func:function name="get:preceding-builds">
-    <func:result select="get:build()/preceding-sibling::build"/>
-</func:function>
-
-<func:function name="get:property">
-    <xsl:param name="name"/>
-    <xsl:param name="build" select="get:build()"/>
-    <func:result select="$build/*[name() = $name]"/>
-</func:function>
-
-<func:function name="get:step">
-    <xsl:param name="name"/>
-    <xsl:param name="build" select="get:build()"/>
-    <func:result select="get:property('steps', $build)/*[name() = $name]"/>
-</func:function>
-
-<!--
-    Returns true if this is an msw build.
--->
-<xsl:template name="is-msw">
-    <xsl:param name="content"/>
-    <xsl:param name="build" select="get:build()"/>
-    <xsl:value-of select="not(get:step('configure', $build))"/>
-</xsl:template>
-
-<!--
-    Returns true if this a gui build.
--->
-<xsl:template name="is-gui">
-    <xsl:param name="content"/>
-    <xsl:param name="build" select="get:build()"/>
-    <xsl:variable name="make"><get name="make" build="{$build}"/></xsl:variable>
-    <xsl:variable name="configure"><xsl:apply-templates select="get:step('configure', $build)"/></xsl:variable>
-    <xsl:value-of select="not(contains($make, 'USE_GUI=0') or contains($configure, '--disable-gui'))"/>
-</xsl:template>
-
-<!--
-    Returns true if the branch we're building has a contrib subdirectory.
--->
-<xsl:template name="has-contrib">
-    <xsl:param name="content"/>
-    <xsl:param name="build" select="get:build()"/>
-    <xsl:variable name="checkout"><xsl:apply-templates select="get:step('checkout', $build)"/></xsl:variable>
-    <xsl:value-of select="contains($checkout, 'WX_2_') and not(contains($checkout, 'WX_2_9_'))"/>
-</xsl:template>
-
-<!--
-    Returns true if the build should build the test suite.
--->
-<xsl:template name="has-tests">
-    <xsl:param name="content"/>
-    <xsl:param name="build" select="get:build()"/>
-    <xsl:variable name="configure"><xsl:apply-templates select="get:step('configure', $build)"/></xsl:variable>
-    <xsl:value-of select="get:step('run-tests', $build) or contains($configure, '--host=')"/>
-</xsl:template>
-
-<!--
-    strip - strips leading and trailing whitespace
-
-    Usage: <strip>
-               foobar
-           </strip>
-
-    Converts to text and strips leading and trailing whitespace.
--->
-<xsl:template name="strip">
-    <xsl:param name="content"/>
-    <xsl:variable name="len" select="string-length($content)"/>
-    <xsl:variable name="norm" select="normalize-space($content)"/>
-    <xsl:variable name="normlen" select="string-length($norm)"/>
-    <xsl:choose>
-        <xsl:when test="substring($content, 1, 1) != substring($norm, 1, 1)">
-            <xsl:call-template name="strip">
-                <xsl:with-param name="content" select="substring($content, 2)"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="substring($content, $len, 1) != substring($norm, $normlen, 1)">
-            <xsl:call-template name="strip">
-                <xsl:with-param name="content" select="substring($content, 1, $len - 1)"/>
-            </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$content"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!--
-    normalize-space - normalises whitespace.
-
-    Usage: <normalize-space>
-               foobar
-           </normalize-space>
-
-    Converts to text, strips leading and trailing whitespace and replaces
-    sequences of whitespace characters by a single space.
--->
-<xsl:template name="normalize-space">
-    <xsl:param name="content"/>
-    <xsl:value-of select="normalize-space($content)"/>
-</xsl:template>
-
-<!--
-    lower-case - converts to lower case.
-
-    Usage: <lower-case>FooBar</lower-case>
--->
-<xsl:template name="lower-case">
-    <xsl:param name="content"/>
-    <xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable>
-    <xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
-    <xsl:value-of select="translate($content, $upper, $lower)"/>
-</xsl:template>
-
-<!--
-    Helpers to convert between day numbers and names.
--->
-<xsl:template name="day-number">
-    <xsl:param name="content"/>
-    <xsl:param name="name"/>
-    <xsl:choose>
-        <xsl:when test="$name = 'monday'">0</xsl:when>
-        <xsl:when test="$name = 'tuesday'">1</xsl:when>
-        <xsl:when test="$name = 'wednesday'">2</xsl:when>
-        <xsl:when test="$name = 'thursday'">3</xsl:when>
-        <xsl:when test="$name = 'friday'">4</xsl:when>
-        <xsl:when test="$name = 'saturday'">5</xsl:when>
-        <xsl:when test="$name = 'sunday'">6</xsl:when>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="day-name">
-    <xsl:param name="content"/>
-    <xsl:param name="number"/>
-    <xsl:choose>
-        <xsl:when test="$number = '0'">monday</xsl:when>
-        <xsl:when test="$number = '1'">tuesday</xsl:when>
-        <xsl:when test="$number = '2'">wednesday</xsl:when>
-        <xsl:when test="$number = '3'">thursday</xsl:when>
-        <xsl:when test="$number = '4'">friday</xsl:when>
-        <xsl:when test="$number = '5'">saturday</xsl:when>
-        <xsl:when test="$number = '6'">sunday</xsl:when>
-    </xsl:choose>
-</xsl:template>
-
-<!--
-    Helpers to convert between time in the format 'hhmm' and an integer
-    count of the minutes since midnight.
--->
-<xsl:template name="time-minutes">
-    <xsl:param name="content"/>
-    <xsl:param name="hhmm"/>
-    <xsl:if test="string-length($hhmm) = 4 and format-number($hhmm, '0000') = $hhmm">
-        <xsl:variable name="hour" select="substring($hhmm, 1, 2)"/>
-        <xsl:variable name="min" select="substring($hhmm, 3, 2)"/>
-        <xsl:if test="$hour >= 0 and $hour &lt; 24 and $min >= 0 and $min &lt; 60">
-            <xsl:value-of select="$hour * 60 + $min"/>
-        </xsl:if>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template name="time-hhmm">
-    <xsl:param name="content"/>
-    <xsl:param name="minutes"/>
-    <xsl:value-of select="format-number(floor($minutes div 60) * 100 + $minutes mod 60, '0000')"/>
-</xsl:template>
-
-<!--
-    Create schedulers.
--->
-<xsl:template name="nightly-schedulers">
-    <xsl:param name="content"/>
-    <xsl:param name="name"/>
-    <xsl:param name="day"><day-number name="{$name}"/></xsl:param>
-    <xsl:param name="hour" select="0"/>
-    <xsl:param name="minute" select="0"/>
-    <xsl:param name="step" select="30"/>
-
-    <xsl:if test="$hour &lt; 24">
-        <nightly>
-            <name>
-                <xsl:value-of select="concat($name, '_', format-number($hour, '00'), format-number($minute, '00'))"/>
-            </name>
-            <hour>
-                <xsl:value-of select="$hour"/>
-            </hour>
-            <minute>
-                <xsl:value-of select="$minute"/>
-            </minute>
-            <xsl:if test="$day != ''">
-                <dayOfWeek>
-                    <xsl:value-of select="$day"/>
-                </dayOfWeek>
-            </xsl:if>
-        </nightly>
-        <xsl:variable name="next" select="$hour * 60 + $minute + $step"/>
-        <xsl:call-template name="nightly-schedulers">
-            <xsl:with-param name="name" select="$name"/>
-            <xsl:with-param name="day" select="$day"/>
-            <xsl:with-param name="hour" select="floor($next div 60)"/>
-            <xsl:with-param name="minute" select="$next mod 60"/>
-            <xsl:with-param name="step" select="$step"/>
-        </xsl:call-template>
-    </xsl:if>
-</xsl:template>
-
-<!--
-    scheduler - provide default for the <scheduler> build element.
--->
-<xsl:template name="scheduler">
-    <xsl:param name="content"/>
-    <xsl:param name="previous" select="get:property('scheduler', get:preceding-builds()[last()])"/>
-    <xsl:param name="step" select="60"/>
-
-    <xsl:choose>
-        <xsl:when test="exsl:node-set($content)/node()">
-            <scheduler>
-                <xsl:copy-of select="$content"/>
-            </scheduler>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:for-each select="$previous">
-                <xsl:variable name="text">
-                    <xsl:apply-templates select="."/>
-                </xsl:variable>
-                <scheduler>
-                    <scheduler-subst text="{$text}" step="{$step}"/>
-                </scheduler>
-            </xsl:for-each>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="scheduler-subst">
-    <xsl:param name="content"/>
-    <xsl:param name="text"/>
-    <xsl:param name="step"/>
-
-    <xsl:variable name="name" select="substring-before($text, '_')"/>
-    <xsl:variable name="hhmm" select="substring-after($text, '_')"/>
-    <xsl:variable name="day"><day-number name="{$name}"/></xsl:variable>
-    <xsl:variable name="mins"><time-minutes hhmm="{$hhmm}"/></xsl:variable>
-
-    <xsl:choose>
-        <xsl:when test="$mins = ''">
-            <xsl:value-of select="$text"/>
-        </xsl:when>
-        <xsl:when test="$day = ''">
-            <xsl:value-of select="$name"/>
-            <xsl:text>_</xsl:text>
-            <time-hhmm minutes="{$mins + $step}"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:variable name="day-mins" select="24 * 60"/>
-            <xsl:variable name="week-mins" select="7 * $day-mins"/>
-            <xsl:variable name="tmp" select="($day + 1) * $day-mins + $mins"/>
-            <xsl:variable name="next" select="$tmp mod $week-mins + floor($tmp div $week-mins) * $step"/>
-            <day-name number="{floor($next div $day-mins)}"/>
-            <xsl:text>_</xsl:text>
-            <time-hhmm minutes="{$next mod $day-mins}"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!--
-    email - substitute '@' for ' -at- ' in email addresses.
--->
-<xsl:template name="emailfield">
-    <xsl:param name="content"/>
-    <xsl:param name="addr"/>
-    <xsl:variable name="at"> -at- </xsl:variable>
-    <xsl:choose>
-        <xsl:when test="contains($addr, $at)">
-            <xsl:value-of select="substring-before($addr, $at)"/>
-            <xsl:text>@</xsl:text>
-            <xsl:value-of select="substring-after($addr, $at)"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$addr"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<xsl:template name="email">
-    <xsl:param name="content"/>
-    <xsl:param name="id"/>
-    <email id="{$id}"><emailfield addr="{$content}"/></email>
-</xsl:template>
-
-<xsl:template name="fromaddr">
-    <xsl:param name="content"/>
-    <fromaddr><emailfield addr="{$content}"/></fromaddr>
-</xsl:template>
-
-<xsl:template name="extraRecipient">
-    <xsl:param name="content"/>
-    <extraRecipient><emailfield addr="{$content}"/></extraRecipient>
-</xsl:template>
-
-<!--
-    mailnotifier - add a default value for <fromaddr> to <mailnotifier>
--->
-<xsl:template name="mailnotifier">
-    <xsl:param name="content"/>
-    <mailnotifier>
-        <defaults content="{$content}">
-            <fromaddr>noreply -at- wxsite.net</fromaddr>
-        </defaults>
-        <xsl:copy-of select="$content"/>
-    </mailnotifier>
-</xsl:template>
-
-</bot>
diff --git a/build/buildbot/config/include/push.xml b/build/buildbot/config/include/push.xml
deleted file mode 100644
index ed4c682c00..0000000000
--- a/build/buildbot/config/include/push.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       include/push.xml
-    Purpose:    Declarations for the push build slave
-    Author:     Mike Wetherell
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWindows licence
--->
-
-<bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="defs.xml"/>
-
-<!--
-    Usage: <show log="filename" [ name="title" ]/>
-
-    A build step displayed as 'title' in the waterfall display, the output
-    comes from 'filename.log' in the uploaded log tarball, and the exit code
-    comes from 'filename.err'.
-
-    If the name attibute is omitted, it defaults to the filename.
--->
-<xsl:template name="show">
-    <xsl:param name="content"/>
-    <xsl:param name="log"/>
-    <xsl:param name="name" select="$log"/>
-    <shellcommand>
-        <defaults content="{$content}">
-            <name><xsl:value-of select="$name"/></name>
-            <description><xsl:value-of select="$name"/></description>
-            <descriptionDone><xsl:value-of select="$name"/></descriptionDone>
-            <command><xsl:value-of select="$log"/></command>
-        </defaults>
-        <xsl:copy-of select="$content"/>
-    </shellcommand>
-</xsl:template>
-
-</bot>
diff --git a/build/buildbot/config/include/unix.xml b/build/buildbot/config/include/unix.xml
deleted file mode 100644
index 78c9813b43..0000000000
--- a/build/buildbot/config/include/unix.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       include/unix.xml
-    Purpose:    Declarations for unix slaves
-    Author:     Michael Wetherell
-    Copyright:  (c) Michael Wetherell
-    Licence:    wxWindows licence
--->
-
-<bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="defs.xml"/>
-
-<!--
-    build - Override <build> to add a slave lock. This has the effect of
-            serialising all the builds on this machine
--->
-<xsl:template name="build">
-    <xsl:param name="content"/>
-    <build>
-        <lock>slave</lock>
-        <xsl:copy-of select="$content"/>
-    </build>
-</xsl:template>
-
-<!--
-    checkout - checks out to a shared directory
-
-    Checks out to a directory '../$branch' shared between builds. Then creates
-    a directory 'build' for this job to build in, and 'src' which is a link to
-    the shared sources. This relies on all builds for the same branch being
-    serialised with lock so that one build doesn't update the sources while
-    another is building them.
-
-    Usage typically just:
-        <checkout/>
-    for the trunk, or:
-        <checkout branch="branches/WX_3_0_BRANCH"/>
-    to checkout a branch.
--->
-<xsl:template name="checkout">
-    <xsl:param name="content"/>
-    <xsl:param name="branch" select="'trunk'"/>
-    <xsl:variable name="nodes" select="exsl:node-set($content)"/>
-    <svn>
-        <xsl:if test="not($nodes/svnurl)">
-            <xsl:if test="not($nodes/baseURL)">
-                <baseURL><SVN_URL/></baseURL>
-            </xsl:if>
-            <xsl:if test="not($nodes/defaultBranch)">
-                <defaultBranch><xsl:value-of select="$branch"/></defaultBranch>
-            </xsl:if>
-        </xsl:if>
-        <xsl:if test="not($nodes/workdir)">
-            <workdir>../<xsl:value-of select="$branch"/></workdir>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-    </svn>
-    <shellcommand>
-        <description>creating build directory</description>
-        <descriptionDone>create build directory</descriptionDone>
-        <workdir>.</workdir>
-        <command>
-            rm -rf build &amp;&amp;
-            mkdir build &amp;&amp;
-            ln -sf ../<xsl:value-of select="$branch"/> src
-        </command>
-    </shellcommand>
-</xsl:template>
-
-<!--
-    configure - use '../src/configure' as the default configure command,
-                include disable-precomp-headers in the default options and
-                post process the Makefiles to use ccache.
-
-    Usage: <configure options="-with-foobar"/>
--->
-<xsl:template name="configure">
-    <xsl:param name="content"/>
-    <xsl:param name="options"/>
-    <configure>
-        <copy-with-defaults content="{$content}">
-            <command>../src/configure --disable-precomp-headers --disable-compat28 --disable-compat26 <xsl:value-of select="normalize-space($options)"/></command>
-        </copy-with-defaults>
-        <command>find . -name Makefile | xargs perl -pi -e 's/^(?:CC|CXX) = /$&amp;ccache /'</command>
-    </configure>
-</xsl:template>
-
-</bot>
diff --git a/build/buildbot/config/include/wx-devs.xml b/build/buildbot/config/include/wx-devs.xml
deleted file mode 100644
index 08516d43c2..0000000000
--- a/build/buildbot/config/include/wx-devs.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<emaillookup>
-  <email id="ABX">abx -at- abx.art.pl</email>
-  <email id="AG">andrea.gavana -at- gmail.com</email>
-  <email id="AMB">alex -at- alex.org.uk</email>
-  <email id="AVV">cafedetal -at- gmail.com</email>
-  <email id="BBE">bartosz.bekier -at- gmail.com</email>
-  <email id="BIW">bwilliams -at- kirix.com</email>
-  <email id="BP">bryan -at- ibaku.net</email>
-  <email id="BY">techrazy.yang -at- gmail.com</email>
-  <email id="CAD">loafier -at- gmail.com</email>
-  <email id="CE">biol75 -at- york.ac.uk</email>
-  <email id="CHB">Chris.Barker -at- noaa.gov</email>
-  <email id="CJP">admin -at- editra.org</email>
-  <email id="DE">dfe -at- tgwbd.org</email>
-  <email id="DJL">daniel.lauk -at- gmail.com</email>
-  <email id="DMS">diaasami -at- gmail.com</email>
-  <email id="DS">d.schoolwerth -at- xs4all.nl</email>
-  <email id="FM">f18m_cpp217828 -at- yahoo.it</email>
-  <email id="FT">frank.tobia -at- gmail.com</email>
-  <email id="GD">gilles_depeyrot -at- mac.com</email>
-  <email id="JG">jrgadd2 -at- cs.latrobe.edu.au</email>
-  <email id="JJ">joukj -at- hrem.nano.tudelft.nl</email>
-  <email id="JMS">jaakko.salli -at- dnainternet.net</email>
-  <email id="JS">julian -at- anthemion.co.uk</email>
-  <email id="JW">hc.john -at- gmail.com</email>
-  <email id="KH">hockkn -at- yahoo.com</email>
-  <email id="KLB">KendallB -at- scitechsoft.com</email>
-  <email id="KO">kevino -at- theolliviers.com</email>
-  <email id="MBN">mbarbon -at- cpan.org</email>
-  <email id="MJM">mmacleod -at- webmail.co.za</email>
-  <email id="MK">nitro -at- dr-code.org</email>
-  <email id="MMK">MMK -at- Thunder-Power.com</email>
-  <email id="MR">leio -at- gentoo.org</email>
-  <email id="MW">mike.wetherell -at- ntlworld.com</email>
-  <email id="OLS">oliver.schoenborn -at- gmail.com</email>
-  <email id="PC">paulcor -at- bullseye.com</email>
-  <email id="PJC">corsix -at- corsix.org</email>
-  <email id="PMO">Peter_Most -at- gmx.de</email>
-  <email id="RD">robin -at- alldunn.com</email>
-  <email id="RN">wxprojects -at- comcast.net</email>
-  <email id="ROL">rolinsky -at- femagsoft.com</email>
-  <email id="RR">robert -at- roebling.de</email>
-  <email id="SC">csomor -at- advancedconcepts.ch</email>
-  <email id="SN">Stefan.Neis -at- t-online.de</email>
-  <email id="VS">vslavik -at- fastmail.fm</email>
-  <email id="VZ">vadim -at- wxwidgets.org</email>
-</emaillookup>
diff --git a/build/buildbot/config/include/xp_vc.xml b/build/buildbot/config/include/xp_vc.xml
deleted file mode 100644
index 3612902054..0000000000
--- a/build/buildbot/config/include/xp_vc.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       include/xp_vc.xml
-    Purpose:    Declarations for the xp_vc slave
-    Author:     Michael Wetherell
-    Copyright:  (c) 2008 Michael Wetherell
-    Licence:    wxWindows licence
--->
-
-<bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="defs.xml"/>
-
-<!--
-    build - Override <build> to add a slave lock. This has the effect of
-            serialising builds for the same branch on this machine.
--->
-<xsl:template name="build">
-    <xsl:param name="content"/>
-    <xsl:variable name="checkout">
-        <xsl:apply-templates select="get:step('checkout')"/>
-    </xsl:variable>
-    <build>
-        <lock>
-            <xsl:value-of select="exsl:node-set($checkout)/svn/defaultBranch"/>
-        </lock>
-        <xsl:copy-of select="$content"/>
-    </build>
-</xsl:template>
-
-<!--
-    checkout - checks out to a shared directory
-
-    Checks out to a directory '../$branch' shared between builds. Then exports
-    it to a clean 'build' directory for the job to build in. This relies on
-    builds for the same branch being serialised with a lock so that one build
-    doesn't update the shared source while another is exporting them.
-
-    Usage typically just:
-        <checkout/>
-    for the trunk, or:
-        <checkout branch="branches/WX_3_0_BRANCH"/>
-    to checkout a branch.
--->
-<xsl:template name="checkout">
-    <xsl:param name="content"/>
-    <xsl:param name="branch" select="'trunk'"/>
-    <xsl:variable name="nodes" select="exsl:node-set($content)"/>
-    <svn>
-        <xsl:if test="not($nodes/svnurl)">
-            <xsl:if test="not($nodes/baseURL)">
-                <baseURL><SVN_URL/></baseURL>
-            </xsl:if>
-            <xsl:if test="not($nodes/defaultBranch)">
-                <defaultBranch><xsl:value-of select="$branch"/></defaultBranch>
-            </xsl:if>
-        </xsl:if>
-        <xsl:if test="not($nodes/workdir)">
-            <workdir>../<xsl:value-of select="$branch"/></workdir>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-    </svn>
-    <shellcommand>
-        <description>creating build directory</description>
-        <descriptionDone>create build directory</descriptionDone>
-        <workdir>.</workdir>
-        <command>
-            <normalize-space>
-                (if exist build rmdir /s/q build) &amp;&amp;
-                svn export --native-eol CRLF
-                    ..\<xsl:value-of select="$branch"/> build
-            </normalize-space>
-        </command>
-    </shellcommand>
-</xsl:template>
-
-</bot>
diff --git a/build/buildbot/config/push.xml b/build/buildbot/config/push.xml
deleted file mode 100644
index a5c0c59256..0000000000
--- a/build/buildbot/config/push.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       push.xml
-    Purpose:    Configuration for push builds
-    Author:     Mike Wetherell
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWindows licence
-
-    This allows the logs from builds done elsewhere to be included in the
-    buildbot results, see:
-
-    https://wiki.wxwidgets.org/Development:_Buildbot#Sending_in_Logs_from_Builds_Done_Elsewhere
--->
-
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<xi:include href="include/push.xml"/>
-
-<build>
-    <name>Solaris HEAD GTK1</name>
-    <builddir>psh_solaris_hd_gtk1</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="configure"/>
-        <show log="compile"/>
-    </steps>
-</build>
-
-<build>
-    <name>Solaris HEAD X11 with-stl</name>
-    <builddir>psh_solaris_hd_x11</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="configure"/>
-        <show log="compile"/>
-    </steps>
-</build>
-
-<build>
-    <name>Solaris Stable Motif</name>
-    <builddir>psh_solaris_st_motif</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="configure"/>
-        <show log="compile"/>
-    </steps>
-</build>
-
-<build>
-    <name>Solaris Stable GTK2 Unicode</name>
-    <builddir>psh_solaris_st_gtk2u</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="configure"/>
-        <show log="compile"/>
-    </steps>
-</build>
-
-<build>
-    <name>MingW-W64 cross_wxMSW Trunk</name>
-    <builddir>psh_mingw64_trunk</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="configure"/>
-        <show log="compile"/>
-    </steps>
-</build>
-
-<build>
-    <name>MingW-W64 cross_wxMSW Stable</name>
-    <builddir>psh_mingw64_stable</builddir>
-
-    <steps>
-        <extractlogs/>
-        <show log="configure"/>
-        <show log="compile"/>
-    </steps>
-</build>
-</bot>
diff --git a/build/buildbot/config/ravnsgaard.xml b/build/buildbot/config/ravnsgaard.xml
deleted file mode 100644
index 687cce00fd..0000000000
--- a/build/buildbot/config/ravnsgaard.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       ravnsgaard.xml
-    Licence:    wxWindows licence
--->
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:include href="include/unix.xml"/>
-
-<!-- Moved to brandt32 while ranvsgaard is down -->
-<disable>
-    <build>
-        <name>Linux i386 wxGTK stable STL</name>
-        <builddir>ravnsgaard_wxgtk_stable</builddir>
-        <scheduler>stable_quick</scheduler>
-        <steps>
-            <checkout branch="{$STABLE_BRANCH}"/>
-            <configure options="--enable-stl"/>
-            <compile-all utils="false"/>
-            <run-tests/>
-        </steps>
-    </build>
-
-    <build>
-        <name>Linux i386 wxGTK trunk no gui</name>
-        <builddir>ravnsgaard_wxgtk_nogui</builddir>
-        <scheduler>daily_0600</scheduler>
-        <steps>
-            <checkout/>
-            <configure options="--disable-gui --enable-debug"/>
-            <compile-all/>
-            <run-tests/>
-        </steps>
-    </build>
-
-    <build>
-        <name>Linux i386 wxGTK trunk no features</name>
-        <builddir>ravnsgaard_wxgtk_nofeatures</builddir>
-        <scheduler>daily_0600</scheduler>
-        <steps>
-            <checkout/>
-            <configure options="--disable-all-features --enable-debug"/>
-            <compile-all utils="false"/>
-            <run-tests/>
-        </steps>
-    </build>
-</disable>
-</bot>
diff --git a/build/buildbot/config/xp_vc.xml b/build/buildbot/config/xp_vc.xml
deleted file mode 100644
index 06e804a211..0000000000
--- a/build/buildbot/config/xp_vc.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Name:       xp_vc.xml
-    Purpose:    Buildbot xp_vc configuration.
-    Author:     Laurent Humbertclaude
-    Copyright:  (c) 2008 Laurent Humbertclaude
-    Licence:    wxWindows licence
--->
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:include href="include/xp_vc.xml"/>
-    <build>
-        <name>XPSP2 VC9 wxMSW trunk release</name>
-        <builddir>XPSP2_VC9_wxMSW_trunk_release</builddir>
-        <scheduler>trunk_quick</scheduler>
-        <sandbox>VC9</sandbox>
-        <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
-        <steps>
-            <checkout/>
-            <compile-all tests="true"/>
-            <run-tests/>
-        </steps>
-    </build>
-    <build>
-        <name>XPSP2 VC9 wxMSW stable release</name>
-        <builddir>XPSP2_VC9_wxMSW_stable_release</builddir>
-        <scheduler>stable_quick</scheduler>
-        <sandbox>VC9</sandbox>
-        <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
-        <steps>
-            <checkout branch="{$STABLE_BRANCH}"/>
-            <compile-all contrib="false" tests="true"/>
-            <run-tests/>
-        </steps>
-    </build>
-    <build>
-        <name>XPSP2 VC9 wxMSW trunk debug</name>
-        <builddir>XPSP2_VC9_wxMSW_trunk_debug</builddir>
-        <scheduler>daily_0400</scheduler>
-        <sandbox>VC9</sandbox>
-        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
-        <steps>
-            <checkout/>
-            <compile-all tests="true"/>
-            <run-tests/>
-        </steps>
-    </build>
-    <build>
-        <name>XPSP2 VC9 wxMSW stable debug</name>
-        <builddir>XPSP2_VC9_wxMSW_stable_debug</builddir>
-        <scheduler>daily_0500</scheduler>
-        <sandbox>VC9</sandbox>
-        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
-        <steps>
-            <checkout branch="{$STABLE_BRANCH}"/>
-            <compile-all contrib="false" tests="true"/>
-            <run-tests/>
-        </steps>
-    </build>
-    <build>
-        <name>XPSP2 VC6 wxMSW stable release</name>
-        <builddir>XPSP2_VC6_wxMSW_stable_release</builddir>
-        <scheduler>stable_quick</scheduler>
-        <sandbox>VC6</sandbox>
-        <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunit.lib</make>
-        <steps>
-            <checkout branch="{$STABLE_BRANCH}"/>
-            <compile-all contrib="false" tests="true"/>
-            <run-tests/>
-        </steps>
-    </build>
-    <build>
-        <name>XPSP2 VC6 wxMSW stable debug</name>
-        <builddir>XPSP2_VC6_wxMSW_stable_debug</builddir>
-        <scheduler>daily_0700</scheduler>
-        <sandbox>VC6</sandbox>
-        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
-        <steps>
-            <checkout branch="{$STABLE_BRANCH}"/>
-            <compile-all contrib="false" tests="true"/>
-            <run-tests/>
-        </steps>
-    </build>
-</bot>
diff --git a/build/buildbot/tools/bot.xsd b/build/buildbot/tools/bot.xsd
deleted file mode 100644
index 8921fe3c14..0000000000
--- a/build/buildbot/tools/bot.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    Name:       bot.xsd
-    Purpose:    Used by check.sh for offline checking of the configuration.
-    Author:     Mike Wetherell
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWindows licence
--->
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema">
-    <element name="bot">
-        <!-- todo -->
-    </element>
-</schema>
diff --git a/build/buildbot/tools/check.sh b/build/buildbot/tools/check.sh
deleted file mode 100755
index 32ce7ebaa5..0000000000
--- a/build/buildbot/tools/check.sh
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/bin/sh
-#############################################################################
-# Name:        check.sh
-# Purpose:     Offline checker for the buildbot configuration files
-# Author:      Mike Wetherell
-# Copyright:   (c) 2007 Mike Wetherell
-# Licence:     wxWindows licence
-#############################################################################
-
-usage() {
-    echo "Usage: $0 [options] FILE..."
-    echo "Offline checker for the buildbot configuration files"
-    echo
-    echo "Options:"
-    echo "  -g      generate xslt"
-    echo "  -h      show help"
-    echo "  -l N    output only line N"
-    echo "  -p      preprocess"
-    echo "  -v      validate"
-    exit 0
-}
-
-badopt() {
-    echo "try '$0 -h' for more information" >&2
-    exit 1
-}
-
-progcheck() {
-    prog="$1"
-    $prog --version >/dev/null 2>&1 || {
-        echo "$0: requires $prog, not found" >&2
-        exit 1
-    }
-}
-
-GENERATE=1
-PREPROCESS=2
-VALIDATE=3
-
-MODE=$VALIDATE
-FILTER=cat
-
-while getopts ghl:pv opt; do
-    case "$opt" in
-        \?) badopt ;;
-        g)  MODE=$GENERATE ;;
-        h)  usage ;;
-        l)  FILTER="sed -ne ${OPTARG}p" ;;
-        p)  MODE=$PREPROCESS ;;
-        v)  MODE=$VALIDATE ;;
-    esac
-done
-
-if [ $OPTIND -gt 1 ]; then
-    shift `expr $OPTIND - 1`
-fi
-
-if [ $# -eq 0 ]; then
-    usage
-fi
-
-XSLTPROC=xsltproc
-XMLLINT=xmllint
-
-progcheck $XSLTPROC
-progcheck $XMLLINT
-
-DIR="`dirname $0`"
-WORKDIR="${TMPDIR:-/tmp}/wx.$$"
-mkdir "$WORKDIR" || exit
-trap 'rm -rf "$WORKDIR"' EXIT
-WORKPAT=`echo "$WORKDIR" | sed 's|[^A-Za-z0-9]/|.|g'`
-XSLT="$WORKDIR/XSLT"
-PREP="$WORKDIR/PREP"
-STDERR="$WORKDIR/STDERR"
-ERR=0
-
-# Filter to show lines of genertated XSLT when they are mentioned.
-showxslt() {
-    awk '{
-            print;
-            if (sub(/.*generated XSLT line */, "") && sub(/[^0-9].*/, ""))
-            {
-                system("sed -ne "$0"p '$XSLT'");
-            }
-         }'
-}
-
-# Test it works as old version of awk don't have sub or system functions.
-if showxslt </dev/null 2>/dev/null; then
-    SHOWXSLT=showxslt
-else
-    SHOWXSLT=cat
-fi
-
-# Change the names of the temporary files in an error message to something
-# to something more informative
-errout()
-{
-    NAME="$1"
-
-    if [ -s "$STDERR" ]; then
-        sed "s|file ${WORKPAT}|${WORKPAT}|g;\
-             s|${WORKPAT}/XSLT|generated XSLT|g;\
-             s|${WORKPAT}/PREP|$NAME (preprocessed)|g" "$STDERR" | $SHOWXSLT
-    fi
-}
-
-output()
-{
-    $FILTER "$1"
-}
-
-generate()
-{
-    INPUT="$1"
-
-    if $XSLTPROC --xinclude -o "$XSLT" $DIR/embedded.xsl "$INPUT" 2>"$STDERR" &&
-       test \! -s "$STDERR"
-    then
-        if [ $MODE -eq $GENERATE ]; then
-            output "$XSLT"
-        fi
-    else
-        return 1
-    fi
-}
-
-preprocess()
-{
-    INPUT="$1"
-
-    if [ $MODE -lt $PREPROCESS ]; then
-        return 0
-    fi
-
-    if $XSLTPROC --xinclude -o "$PREP" "$XSLT" "$INPUT" 2>"$STDERR" &&
-       test \! -s "$STDERR"
-    then
-        if [ $MODE -eq $PREPROCESS ]; then
-            output "$PREP"
-        fi
-    else
-        return 1
-    fi
-}
-
-validate()
-{
-    NAME="$1"
-
-    if [ $MODE -lt $VALIDATE ]; then
-        return 0
-    fi
-
-    if $XMLLINT --noout --schema $DIR/bot.xsd "$PREP" 2>"$STDERR"
-    then
-        errout "$NAME"
-    else
-        return 1
-    fi
-}
-
-while [ $# -gt 0 ]; do
-    INPUT="$1"
-    NAME="`echo \"$INPUT\" | sed 's/[|\]/\\\&/g'`"
-
-    {
-        generate "$INPUT" &&
-        preprocess "$INPUT" &&
-        validate "$NAME"
-    } || {
-        errout "$NAME" >&2
-        ERR=1
-    }
-
-    rm -f "$XSLT" "$PREP" "$STDERR"
-
-    shift
-done
-
-exit $ERR
diff --git a/build/buildbot/tools/email.xsl b/build/buildbot/tools/email.xsl
deleted file mode 100644
index d7952565ad..0000000000
--- a/build/buildbot/tools/email.xsl
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    Name:       email.xsl
-    Purpose:    Create email address lookup.
-    Author:     Mike Wetherell
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWindows licence
-
-    Usage: xsltproc -html tools/email.xsl http://svn.wxwidgets.org/users.cgi \
-            > config/include/wx-devs.xml
--->
-
-<xsl:transform xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:param name="at"> -at- </xsl:param>
-
-<xsl:output indent="yes"/>
-
-<xsl:template match="/">
-    <emaillookup>
-        <xsl:apply-templates select="//table/tr">
-            <xsl:sort select="normalize-space(td[1])"/>
-        </xsl:apply-templates>
-    </emaillookup>
-</xsl:template>
-
-<xsl:template match="tr">
-    <xsl:variable name="id" select="normalize-space(td[1])"/>
-    <xsl:variable name="email" select="normalize-space(td[3])"/>
-
-    <xsl:if test="$id and not(contains($id, ' ')) and contains($email, $at)">
-        <email id="{$id}">
-            <xsl:value-of select="$email"/>
-        </email>
-    </xsl:if>
-</xsl:template>
-
-</xsl:transform>
diff --git a/build/buildbot/tools/embedded.xsl b/build/buildbot/tools/embedded.xsl
deleted file mode 100644
index c1a0e4c07a..0000000000
--- a/build/buildbot/tools/embedded.xsl
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Name:       embedded.xsl
-    Purpose:    Used by check.sh for offline checking of the configuration.
-    Author:     Mike Wetherell
-    Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWindows licence
--->
-
-<transform xmlns="http://www.w3.org/1999/XSL/Transform"
-           xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-           xmlns:XSL="XSL"
-           version="1.0">
-
-<namespace-alias stylesheet-prefix="XSL" result-prefix="xsl"/>
-
-<output indent="yes"/>
-
-<variable
-    name="root"
-    select="//*[not(ancestor-or-self::*[name() != name(/*)])]"/>
-
-<variable
-    name="includes"
-    select="$root[position() > 1]"/>
-
-<variable
-    xmlns:func="http://exslt.org/functions"
-    name="top-level"
-    select="$root/xsl:import |
-            $root/xsl:include |
-            $root/xsl:attribute-set |
-            $root/xsl:character-map |
-            $root/xsl:decimal-format |
-            $root/xsl:function |
-            $root/xsl:import-schema |
-            $root/xsl:key |
-            $root/xsl:namespace-alias |
-            $root/xsl:output |
-            $root/xsl:param |
-            $root/xsl:preserve-space |
-            $root/xsl:strip-space |
-            $root/xsl:template |
-            $root/xsl:variable |
-            $root/func:function"/>
-
-<template match="/">
-    <XSL:transform>
-        <copy-of select="$root/namespace::*"/>
-
-        <for-each select="$root/@xsl:*">
-            <attribute name="{local-name()}">
-                <value-of select="."/>
-            </attribute>
-        </for-each>
-
-        <for-each select="$top-level">
-            <if test="not(../ancestor::*/*[name() = name(current()) and @name = current()/@name])">
-                <apply-templates mode="copy-xsl" select="."/>
-            </if>
-        </for-each>
-
-        <apply-templates select="*"/>
-    </XSL:transform>
-</template>
-
-<template match="*">
-    <variable name="pattern">
-        <call-template name="coord-pattern"/>
-    </variable>
-
-    <variable name="is-xsl">
-        <call-template name="is-xsl"/>
-    </variable>
-
-    <XSL:template match="*[generate-id() = generate-id(document('', /){$pattern})]">
-        <copy-of select="namespace::*"/>
-        <choose>
-            <when test="$root/xsl:template[@name = name(current())]">
-                <call-template name="expand">
-                    <with-param name="inside-xsl" select="$is-xsl = 'true'"/>
-                </call-template>
-            </when>
-            <when test="count($includes | .) = count($includes)">
-                <if test="node()">
-                    <XSL:apply-templates select="node()"/>
-                </if>
-            </when>
-            <when test="count($top-level | .) != count($top-level)">
-                <call-template name="create-context"/>
-            </when>
-        </choose>
-    </XSL:template>
-
-    <if test="$is-xsl != 'true'">
-        <apply-templates select="node()"/>
-    </if>
-</template>
-
-<template match="text()"/>
-
-<template match="@*">
-    <copy/>
-</template>
-
-<template mode="copy-xsl" match="*[//xsl:template[not(ancestor::*[name() != name(/*)])]/@name = name()]">
-    <choose>
-        <when test="ancestor::xsl:template[@name = name(current())]">
-            <copy>
-                <call-template name="copy-xsl-children"/>
-            </copy>
-        </when>
-        <otherwise>
-            <call-template name="expand">
-                <with-param name="inside-xsl" select="true()"/>
-            </call-template>
-        </otherwise>
-    </choose>
-</template>
-
-<template mode="copy-xsl" match="@*|node()">
-    <copy>
-        <call-template name="copy-xsl-children"/>
-    </copy>
-</template>
-
-<template name="copy-xsl-children">
-    <copy-of select="namespace::*"/>
-    <apply-templates mode="copy-xsl" select="@*|node()"/>
-</template>
-
-<template name="coord-pattern">
-    <param name="element" select="."/>
-
-    <for-each select="$element/ancestor-or-self::*">
-        <text>/*[</text>
-        <value-of select="count(preceding-sibling::*) + 1"/>
-        <text>]</text>
-    </for-each>
-</template>
-
-<template name="is-xsl">
-    <param name="element" select="."/>
-    <choose>
-        <when test="$element/self::xsl:*">
-            <value-of select="true()"/>
-        </when>
-        <otherwise>
-            <variable name="namespace" select="namespace-uri($element)"/>
-            <variable name="extension-namespaces">
-                <for-each select="$element/ancestor-or-self::*/@xsl:extension-element-prefixes">
-                    <variable name="prefixes"
-                              select="concat(' ', normalize-space(.), ' ')"/>
-                    <variable name="namespaces"
-                              select="../namespace::*[contains($prefixes, concat(' ', name(), ' ')) or
-                                                      (name() = '' and contains($prefixes, ' #default '))]"/>
-                    <value-of select="$namespaces[. = $namespace]"/>
-                </for-each>
-            </variable>
-            <value-of select="$extension-namespaces != ''"/>
-        </otherwise>
-    </choose>
-</template>
-
-<template name="expand">
-    <param name="inside-xsl"/>
-    <variable name="params" select="$root/xsl:template[@name = name(current())]/xsl:param"/>
-
-    <XSL:call-template name="{name()}">
-        <if test="node() and $params">
-            <XSL:with-param name="{$params[1]/@name}">
-                <choose>
-                    <when test="$inside-xsl">
-                        <apply-templates mode="copy-xsl" select="node()"/>
-                    </when>
-                    <otherwise>
-                        <variable name="pattern">
-                            <call-template name="coord-pattern"/>
-                        </variable>
-                        <XSL:apply-templates select="{$pattern}/node()"/>
-                    </otherwise>
-                </choose>
-            </XSL:with-param>
-        </if>
-
-        <for-each select="@*">
-            <variable name="len" select="string-length(.)"/>
-            <choose>
-                <when test="substring(., 1, 1) = '{' and
-                            substring(., $len, 1) = '}'">
-                    <XSL:with-param name="{name()}"
-                                    select="{substring(., 2, $len - 2)}"/>
-                </when>
-                <otherwise>
-                    <XSL:with-param name="{name()}">
-                        <call-template name="avt"/>
-                    </XSL:with-param>
-                </otherwise>
-            </choose>
-        </for-each>
-    </XSL:call-template>
-</template>
-
-<template name="create-context">
-    <param name="elements" select="ancestor-or-self::*
-                                   [last() - 1 > position()]
-                                   /preceding-sibling::xsl:variable | ."/>
-
-    <variable name="pattern">
-        <call-template name="coord-pattern">
-            <with-param name="element" select="$elements[1]"/>
-        </call-template>
-    </variable>
-
-    <variable name="parent-pattern">
-        <call-template name="coord-pattern">
-            <with-param name="element" select="$elements[1]/.."/>
-        </call-template>
-    </variable>
-
-    <XSL:for-each select="{$parent-pattern}/*">
-        <XSL:if test="count({$pattern} | .) = 1">
-            <variable name="is-xsl">
-                <call-template name="is-xsl">
-                    <with-param name="element" select="$elements[1]"/>
-                </call-template>
-            </variable>
-            <choose>
-                <when test="$is-xsl = 'true'">
-                    <apply-templates mode="copy-xsl" select="$elements[1]"/>
-                    <if test="$elements[2]">
-                        <call-template name="create-context">
-                            <with-param name="elements" select="$elements[position() > 1]"/>
-                        </call-template>
-                    </if>
-                </when>
-                <otherwise>
-                    <copy>
-                        <apply-templates select="@*"/>
-                        <if test="node()">
-                            <XSL:apply-templates select="node()"/>
-                        </if>
-                    </copy>
-                </otherwise>
-            </choose>
-        </XSL:if>
-    </XSL:for-each>
-</template>
-
-<template name="before">
-    <param name="string"/>
-    <param name="target"/>
-
-    <variable name="apos">'</variable>
-    <variable name="quot">"</variable>
-
-    <variable name="posapos" select="string-length(substring-before(
-                                        concat($string, $apos), $apos))"/>
-    <variable name="posquot" select="string-length(substring-before(
-                                        concat($string, $quot), $quot))"/>
-    <variable name="postarg" select="string-length(substring-before(
-                                        concat($string, $target), $target))"/>
-
-    <choose>
-        <when test="$posapos = $postarg and $posquot = $postarg">
-            <value-of select="$string"/>
-        </when>
-        <when test="$posapos > $postarg and $posquot > $postarg">
-            <value-of select="substring($string, 1, $postarg)"/>
-        </when>
-        <otherwise>
-            <variable name="delim">
-                <choose>
-                    <when test="$posquot > $posapos">'</when>
-                    <otherwise>"</otherwise>
-                </choose>
-            </variable>
-
-            <value-of select="substring-before($string, $delim)"/>
-            <value-of select="$delim"/>
-
-            <variable name="mid" select="substring-after($string, $delim)"/>
-
-            <choose>
-                <when test="contains($mid, $delim)">
-                    <value-of select="substring-before($mid, $delim)"/>
-                    <value-of select="$delim"/>
-
-                    <call-template name="before">
-                        <with-param name="string"
-                                    select="substring-after($mid, $delim)"/>
-                        <with-param name="target"
-                                    select="$target"/>
-                    </call-template>
-                </when>
-                <otherwise>
-                    <value-of select="$mid"/>
-                </otherwise>
-            </choose>
-        </otherwise>
-    </choose>
-</template>
-
-<template name="avt">
-    <param name="string" select="."/>
-
-    <variable name="before1" select="substring-before(concat($string, '{'), '{')"/>
-    <variable name="len1" select="string-length($before1)"/>
-
-    <variable name="before2" select="substring-before(concat($string, '}}'), '}}')"/>
-    <variable name="len2" select="string-length($before2)"/>
-
-    <choose>
-        <when test="$before1 = $string and $before2 = $string">
-            <value-of select="$string"/>
-        </when>
-        <when test="$len2 &lt; $len1">
-            <value-of select="$before2"/>
-            <text>}</text>
-            <call-template name="avt">
-                <with-param name="string" select="substring($string, $len2 + 3)"/>
-            </call-template>
-        </when>
-        <when test="substring($string, $len1 + 2, 1) = '{'">
-            <value-of select="$before1"/>
-            <text>{</text>
-            <call-template name="avt">
-                <with-param name="string" select="substring($string, $len1 + 3)"/>
-            </call-template>
-        </when>
-        <otherwise>
-            <variable name="mid" select="substring($string, $len1 + 2)"/>
-            <variable name="expr">
-                <call-template name="before">
-                    <with-param name="string" select="$mid"/>
-                    <with-param name="target">}</with-param>
-                </call-template>
-            </variable>
-            <value-of select="$before1"/>
-            <XSL:copy-of select="{$expr}"/>
-            <call-template name="avt">
-                <with-param name="string" select="substring($mid, string-length($expr) + 2)"/>
-            </call-template>
-        </otherwise>
-    </choose>
-</template>
-
-</transform>
diff --git a/docs/contributing/how-to-release.md b/docs/contributing/how-to-release.md
index ec9b392dbf..c3e5ff9e1b 100644
--- a/docs/contributing/how-to-release.md
+++ b/docs/contributing/how-to-release.md
@@ -153,8 +153,8 @@ with x.y.z+1 (minor or major versions updates require manual intervention)
 and rerun both `bakefile_gen` and `autoconf` afterwards to update the version
 in the generated files too.
 
-Update the definition of the stable and release branches in
-`build/buildbot/config/include/defs.xml` after a minor version change.
+Update `master.cfg` in [wx/buildbot](https://github.com/wxWidgets/buildbot)
+repository after a minor or major version change.
 
 ## MSW Visual Studio Official Builds
 

From dd2d62c703fd3574ad13126dd845a13fae97f299 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Tue, 20 Feb 2018 17:09:39 +0100
Subject: [PATCH 389/916] Suppress size event when IsMaximized is called on OSX

IsMaximized internally calls [NSWindow isZoomed] which triggers a
windowWillResize call. Resize events will be ignored while calling
isZoomed.

Closes #17407.

See https://github.com/wxWidgets/wxWidgets/pull/740
---
 include/wx/osx/nonownedwnd.h | 3 +++
 src/osx/cocoa/nonownedwnd.mm | 7 ++++++-
 src/osx/nonownedwnd_osx.cpp  | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 9b0d3bea4e..a52eae9922 100644
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -116,6 +116,8 @@ public:
 
     void OSXHandleMiniaturize(double WXUNUSED(timestampsec), bool miniaturized);
 
+    void OSXSetIgnoreResizing(bool value) { m_ignoreResizing = value; }
+
     void WindowWasPainted();
 
     virtual bool Destroy();
@@ -154,6 +156,7 @@ private :
 #if wxUSE_GRAPHICS_CONTEXT
     wxGraphicsPath m_shapePath;
 #endif // wxUSE_GRAPHICS_CONTEXT
+    bool m_ignoreResizing;
 };
 
 // list of all frames and modeless dialogs
diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 9291601699..a5eed3e9bb 100644
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -998,7 +998,12 @@ bool wxNonOwnedWindowCocoaImpl::IsMaximized() const
 {
     if (([m_macWindow styleMask] & NSResizableWindowMask) != 0)
     {
-        return [m_macWindow isZoomed];
+        // isZoomed internally calls windowWillResize which would trigger
+        // an wxEVT_SIZE. Setting ignore resizing supresses the event
+        m_wxPeer->OSXSetIgnoreResizing(true);
+        BOOL result = [m_macWindow isZoomed];
+        m_wxPeer->OSXSetIgnoreResizing(false);
+        return result;
     }
     else
     {
diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index d14c023855..f8b36c26e7 100644
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -97,6 +97,7 @@ void wxNonOwnedWindow::Init()
 {
     m_nowpeer = NULL;
     m_isNativeWindowWrapper = false;
+    m_ignoreResizing = false;
 }
 
 bool wxNonOwnedWindow::Create(wxWindow *parent,
@@ -306,6 +307,9 @@ void wxNonOwnedWindow::HandleResized( double WXUNUSED(timestampsec) )
 
 void wxNonOwnedWindow::HandleResizing( double WXUNUSED(timestampsec), wxRect* rect )
 {
+    if ( m_ignoreResizing )
+        return;
+
     wxRect r = *rect ;
 
     // this is a EVT_SIZING not a EVT_SIZE type !

From 3d427a1af1d1c4e2c22972b1c27ce3088c7fa708 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 21 Feb 2018 21:51:36 +0100
Subject: [PATCH 390/916] Fix wxWebView::RunScript() with string containing
 backslashes

Escape backslashes in wxJSScriptWrapper to allow strings with
backslashes in them to work again -- this was broken while implementing
support for returning values from JavaScript to C++.

See https://github.com/wxWidgets/wxWidgets/pull/741
---
 include/wx/private/jsscriptwrapper.h | 2 +-
 tests/controls/webtest.cpp           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/wx/private/jsscriptwrapper.h b/include/wx/private/jsscriptwrapper.h
index 7fd036302a..4bd061197e 100644
--- a/include/wx/private/jsscriptwrapper.h
+++ b/include/wx/private/jsscriptwrapper.h
@@ -38,7 +38,7 @@ public:
 
         // Adds one escape level if there is a single quote, double quotes or
         // escape characters
-        wxRegEx escapeDoubleQuotes("(\\\\*)(['\"\n\r\v\t\b\f])");
+        wxRegEx escapeDoubleQuotes("(\\\\*)([\\'\"\n\r\v\t\b\f])");
         escapeDoubleQuotes.Replace(&m_escapedCode,"\\1\\1\\\\\\2");
     }
 
diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index b6742e663b..a71db74ef7 100644
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -323,6 +323,9 @@ void WebTestCase::RunScript()
     CPPUNIT_ASSERT(m_browser->RunScript("function f(a){return a;}f('Hello World!');", &result));
     CPPUNIT_ASSERT_EQUAL(_("Hello World!"), result);
 
+    CPPUNIT_ASSERT(m_browser->RunScript("function f(a){return a;}f('a\\\'aa\\n\\rb\vb\\tb\\\\ccc\\\"ddd\\b\\fx');", &result));
+    CPPUNIT_ASSERT_EQUAL(_("a\'aa\n\rb\vb\tb\\ccc\"ddd\b\fx"), result);
+
     CPPUNIT_ASSERT(m_browser->RunScript("function f(a){return a;}f(123);", &result));
     CPPUNIT_ASSERT_EQUAL(123, wxAtoi(result));
 

From 0d5378fb840529e6230ac9329d2ad4a8723a4751 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 23 Feb 2018 14:21:05 +0100
Subject: [PATCH 391/916] Remove unnecessary "list" typedef from wxList
 iterators

This typedef was simply never used and, as it was private, removing it
shouldn't result in any compatibility problems.
---
 include/wx/list.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/wx/list.h b/include/wx/list.h
index 427c0392f6..e370c2885b 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -761,7 +761,6 @@ private:
                                                                             \
         classexp iterator                                                   \
         {                                                                   \
-            typedef name list;                                              \
         public:                                                             \
             typedef nodetype Node;                                          \
             typedef iterator itor;                                          \
@@ -811,7 +810,6 @@ private:
         };                                                                  \
         classexp const_iterator                                             \
         {                                                                   \
-            typedef name list;                                              \
         public:                                                             \
             typedef nodetype Node;                                          \
             typedef T* value_type;                                          \
@@ -864,7 +862,6 @@ private:
         };                                                                  \
         classexp reverse_iterator                                           \
         {                                                                   \
-            typedef name list;                                              \
         public:                                                             \
             typedef nodetype Node;                                          \
             typedef T* value_type;                                          \
@@ -903,7 +900,6 @@ private:
         };                                                                  \
         classexp const_reverse_iterator                                     \
         {                                                                   \
-            typedef name list;                                              \
         public:                                                             \
             typedef nodetype Node;                                          \
             typedef T* value_type;                                          \

From fdbe357e4b3a9f2c2ec658b047232d7f6d30f709 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 23 Feb 2018 15:47:12 +0100
Subject: [PATCH 392/916] Make wxList iterators conform to input iterator
 requirements

Define "pointer", "reference", "difference_type" and "iterator_category"
typedefs to ensure that wxList iterator classes are seen as iterators by
the standard library in C++11 and later, as otherwise standard container
template ctors taking iterators couldn't be used with them because
they're only available if input iterator requirements are satisfied.

This notably fixes creation of std::list from wxList iterators; add a
test which didn't compile before to show it.
---
 docs/changes.txt      |  8 ++++++++
 include/wx/list.h     | 38 ++++++++++++++++++++++++++++++++------
 tests/lists/lists.cpp | 24 ++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 7fc8529dd0..7f91d492bb 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -64,6 +64,14 @@ Changes in behaviour which may result in build errors
   wxGraphicsContext::CreatePen() continues to compile and work as before.
 
 
+3.1.2: (released 2018-??-??)
+----------------------------
+
+All:
+
+- Make wxList iterators conform to input iterator requirements.
+
+
 3.1.1: (released 2018-02-19)
 ----------------------------
 
diff --git a/include/wx/list.h b/include/wx/list.h
index e370c2885b..7cd5205d90 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -599,6 +599,17 @@ private:
 // macros for definition of "template" list type
 // -----------------------------------------------------------------------------
 
+// Helper macro defining common iterator typedefs
+#if wxUSE_STD_CONTAINERS_COMPATIBLY
+    #include <iterator>
+
+    #define WX_DECLARE_LIST_ITER_DIFF_AND_CATEGORY()                          \
+        typedef std::ptrdiff_t difference_type;                               \
+        typedef std::bidirectional_iterator_tag iterator_category;
+#else
+    #define WX_DECLARE_LIST_ITER_DIFF_AND_CATEGORY()
+#endif
+
 // and now some heavy magic...
 
 // declare a list type named 'name' and containing elements of type 'T *'
@@ -762,15 +773,19 @@ private:
         classexp iterator                                                   \
         {                                                                   \
         public:                                                             \
+            WX_DECLARE_LIST_ITER_DIFF_AND_CATEGORY()                        \
+            typedef T* value_type;                                          \
+            typedef value_type* pointer;                                    \
+            typedef value_type& reference;                                  \
+                                                                            \
             typedef nodetype Node;                                          \
             typedef iterator itor;                                          \
-            typedef T* value_type;                                          \
             typedef value_type* ptr_type;                                   \
-            typedef value_type& reference;                                  \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
+            /* Compatibility typedefs, don't use */                         \
             typedef reference reference_type;                               \
             typedef ptr_type pointer_type;                                  \
                                                                             \
@@ -811,8 +826,12 @@ private:
         classexp const_iterator                                             \
         {                                                                   \
         public:                                                             \
-            typedef nodetype Node;                                          \
+            WX_DECLARE_LIST_ITER_DIFF_AND_CATEGORY()                        \
             typedef T* value_type;                                          \
+            typedef const value_type* pointer;                              \
+            typedef const value_type& reference;                            \
+                                                                            \
+            typedef nodetype Node;                                          \
             typedef const value_type& const_reference;                      \
             typedef const_iterator itor;                                    \
             typedef value_type* ptr_type;                                   \
@@ -863,11 +882,14 @@ private:
         classexp reverse_iterator                                           \
         {                                                                   \
         public:                                                             \
-            typedef nodetype Node;                                          \
+            WX_DECLARE_LIST_ITER_DIFF_AND_CATEGORY()                        \
             typedef T* value_type;                                          \
+            typedef value_type* pointer;                                    \
+            typedef value_type& reference;                                  \
+                                                                            \
+            typedef nodetype Node;                                          \
             typedef reverse_iterator itor;                                  \
             typedef value_type* ptr_type;                                   \
-            typedef value_type& reference;                                  \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
@@ -901,8 +923,12 @@ private:
         classexp const_reverse_iterator                                     \
         {                                                                   \
         public:                                                             \
-            typedef nodetype Node;                                          \
+            WX_DECLARE_LIST_ITER_DIFF_AND_CATEGORY()                        \
             typedef T* value_type;                                          \
+            typedef const value_type* pointer;                              \
+            typedef const value_type& reference;                            \
+                                                                            \
+            typedef nodetype Node;                                          \
             typedef const_reverse_iterator itor;                            \
             typedef value_type* ptr_type;                                   \
             typedef const value_type& const_reference;                      \
diff --git a/tests/lists/lists.cpp b/tests/lists/lists.cpp
index f4b1e3472d..d19376e7dd 100644
--- a/tests/lists/lists.cpp
+++ b/tests/lists/lists.cpp
@@ -210,3 +210,27 @@ void ListsTestCase::wxListCtorTest()
     CPPUNIT_ASSERT( Baz::GetNumber() == 0 );
 }
 
+#if wxUSE_STD_CONTAINERS_COMPATIBLY
+
+#include <list>
+
+// Check that we convert wxList to std::list using the latter's ctor taking 2
+// iterators: this used to be broken in C++11 because wxList iterators didn't
+// fully implement input iterator requirements.
+TEST_CASE("wxList::iterator", "[list][std][iterator]")
+{
+    Baz baz1("one"),
+        baz2("two");
+
+    wxListBazs li;
+    li.push_back(&baz1);
+    li.push_back(&baz2);
+
+    std::list<Baz*> stdli(li.begin(), li.end());
+    CHECK( stdli.size() == 2 );
+
+    const wxListBazs cli;
+    CHECK( std::list<Baz*>(cli.begin(), cli.end()).empty() );
+}
+
+#endif // wxUSE_STD_CONTAINERS_COMPATIBLY

From 9edf06794e09427c0f1b8647e0eee154f45ab6c5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 23 Feb 2018 16:00:42 +0100
Subject: [PATCH 393/916] Remove ptr_type typedef from wxList iterator classes

This typedef is completely redundant with pointer_type which had been
also available in these classes since the very beginning and seems to
have been meant to be private originally, so it should be safe to just
remove it, especially because I couldn't find any existing code using
it.

If we do find such code in the wild later, this commit could be reverted
as it's not really indispensable.
---
 include/wx/list.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/wx/list.h b/include/wx/list.h
index 7cd5205d90..8b67ccbd88 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -780,14 +780,13 @@ private:
                                                                             \
             typedef nodetype Node;                                          \
             typedef iterator itor;                                          \
-            typedef value_type* ptr_type;                                   \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
             /* Compatibility typedefs, don't use */                         \
             typedef reference reference_type;                               \
-            typedef ptr_type pointer_type;                                  \
+            typedef pointer pointer_type;                                   \
                                                                             \
             iterator(Node* node, Node* init) : m_node(node), m_init(init) {}\
             iterator() : m_node(NULL), m_init(NULL) { }                     \
@@ -834,13 +833,12 @@ private:
             typedef nodetype Node;                                          \
             typedef const value_type& const_reference;                      \
             typedef const_iterator itor;                                    \
-            typedef value_type* ptr_type;                                   \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
-            typedef const_reference reference_type;                         \
-            typedef const ptr_type pointer_type;                            \
+            typedef reference reference_type;                               \
+            typedef pointer pointer_type;                                   \
                                                                             \
             const_iterator(Node* node, Node* init)                          \
                 : m_node(node), m_init(init) { }                            \
@@ -889,13 +887,12 @@ private:
                                                                             \
             typedef nodetype Node;                                          \
             typedef reverse_iterator itor;                                  \
-            typedef value_type* ptr_type;                                   \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
             typedef reference reference_type;                               \
-            typedef ptr_type pointer_type;                                  \
+            typedef pointer pointer_type;                                   \
                                                                             \
             reverse_iterator(Node* node, Node* init)                        \
                 : m_node(node), m_init(init) { }                            \
@@ -930,14 +927,13 @@ private:
                                                                             \
             typedef nodetype Node;                                          \
             typedef const_reverse_iterator itor;                            \
-            typedef value_type* ptr_type;                                   \
             typedef const value_type& const_reference;                      \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \
         public:                                                             \
-            typedef const_reference reference_type;                         \
-            typedef const ptr_type pointer_type;                            \
+            typedef reference reference_type;                               \
+            typedef pointer pointer_type;                                   \
                                                                             \
             const_reverse_iterator(Node* node, Node* init)                  \
                 : m_node(node), m_init(init) { }                            \

From 7e0ca8357e6e1d04fcd25ab32cbe8ca35ddf0579 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 23 Feb 2018 16:03:36 +0100
Subject: [PATCH 394/916] Also remove wxList::const_iterator::const_reference
 typedef

This typedef is redundant with the "reference" one and doesn't seem to
be used anywhere.

As with the previous commit, this one could be reverted later if it
turns out it does break any existing code, but this seems unlikely.
---
 include/wx/list.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/wx/list.h b/include/wx/list.h
index 8b67ccbd88..22446a2dd4 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -831,7 +831,6 @@ private:
             typedef const value_type& reference;                            \
                                                                             \
             typedef nodetype Node;                                          \
-            typedef const value_type& const_reference;                      \
             typedef const_iterator itor;                                    \
                                                                             \
             Node* m_node;                                                   \
@@ -927,7 +926,6 @@ private:
                                                                             \
             typedef nodetype Node;                                          \
             typedef const_reverse_iterator itor;                            \
-            typedef const value_type& const_reference;                      \
                                                                             \
             Node* m_node;                                                   \
             Node* m_init;                                                   \

From 382a5a156e2f638e4b2414b5d34231ad296dad86 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 23 Feb 2018 16:10:07 +0100
Subject: [PATCH 395/916] Use ptrdiff_t as wxVector::difference_type instead of
 size_t

difference_type must be signed, using size_t was clearly a mistake.
---
 include/wx/vector.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/vector.h b/include/wx/vector.h
index e73b1b9514..49b0840c9f 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -160,7 +160,7 @@ private:
 
 public:
     typedef size_t size_type;
-    typedef size_t difference_type;
+    typedef ptrdiff_t difference_type;
     typedef T value_type;
     typedef value_type* pointer;
     typedef const value_type* const_pointer;

From cc8fccf0bcb445cf8a699fa6a5e3977b9bb516a0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 23 Feb 2018 16:14:03 +0100
Subject: [PATCH 396/916] Make wxVector reverse iterators conform to iterator
 requirements

This is similar to a recent commit adding the missing typedefs to wxList
iterators and defines the types required by the iterator concept in
wxVector::reverse_iterator and const_reverse_iterator classes (simple
iterators are just pointers and are already covered by the standard
iterator_traits specialization).
---
 docs/changes.txt          |  2 +-
 include/wx/vector.h       | 19 +++++++++++++++++++
 tests/vectors/vectors.cpp | 11 +++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 7f91d492bb..f4867d6ac6 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -69,7 +69,7 @@ Changes in behaviour which may result in build errors
 
 All:
 
-- Make wxList iterators conform to input iterator requirements.
+- Make wxList and wxVector iterators conform to input iterator requirements.
 
 
 3.1.1: (released 2018-02-19)
diff --git a/include/wx/vector.h b/include/wx/vector.h
index 49b0840c9f..8a7ae1b228 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -33,6 +33,9 @@ inline void wxVectorSort(wxVector<T>& v)
 #include "wx/meta/if.h"
 
 #include "wx/beforestd.h"
+#if wxUSE_STD_CONTAINERS_COMPATIBLY
+#include <iterator>
+#endif
 #include <new> // for placement new
 #include "wx/afterstd.h"
 
@@ -172,6 +175,14 @@ public:
     class reverse_iterator
     {
     public:
+#if wxUSE_STD_CONTAINERS_COMPATIBLY
+        typedef std::random_access_iterator_tag iterator_category;
+#endif
+        typedef ptrdiff_t difference_type;
+        typedef T value_type;
+        typedef value_type* pointer;
+        typedef value_type& reference;
+
         reverse_iterator() : m_ptr(NULL) { }
         explicit reverse_iterator(iterator it) : m_ptr(it) { }
         reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
@@ -218,6 +229,14 @@ public:
     class const_reverse_iterator
     {
     public:
+#if wxUSE_STD_CONTAINERS_COMPATIBLY
+        typedef std::random_access_iterator_tag iterator_category;
+#endif
+        typedef ptrdiff_t difference_type;
+        typedef T value_type;
+        typedef const value_type* pointer;
+        typedef const value_type& reference;
+
         const_reverse_iterator() : m_ptr(NULL) { }
         explicit const_reverse_iterator(const_iterator it) : m_ptr(it) { }
         const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp
index 25a9a5cdd5..e3f6734c14 100644
--- a/tests/vectors/vectors.cpp
+++ b/tests/vectors/vectors.cpp
@@ -22,6 +22,10 @@
 
 #include "wx/vector.h"
 
+#if wxUSE_STD_CONTAINERS_COMPATIBLY
+    #include <vector>
+#endif // wxUSE_STD_CONTAINERS_COMPATIBLY
+
 // ----------------------------------------------------------------------------
 // simple class capable of detecting leaks of its objects
 // ----------------------------------------------------------------------------
@@ -360,6 +364,13 @@ TEST_CASE("wxVector::reverse_iterator", "[vector][reverse_iterator]")
     ri = rb + 2;
     CHECK( ri - rb == 2 );
     CHECK( re - ri == 8 );
+
+#if wxUSE_STD_CONTAINERS_COMPATIBLY
+    std::vector<int> stdvec(rb, re);
+    REQUIRE( stdvec.size() == 10 );
+    CHECK( stdvec[0] == 10 );
+    CHECK( stdvec[9] == 1 );
+#endif // wxUSE_STD_CONTAINERS_COMPATIBLY
 }
 
 TEST_CASE("wxVector::capacity", "[vector][capacity][shrink_to_fit]")

From b1db1bc0bb3577b604ad7082eb0c2ffd8e93f5b3 Mon Sep 17 00:00:00 2001
From: Xaviou <x.psoud@gmail.com>
Date: Sun, 25 Feb 2018 18:39:59 +0100
Subject: [PATCH 397/916] Wrong method name in wxAddRemoveCtrl documentation
 sample code

---
 interface/wx/addremovectrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/wx/addremovectrl.h b/interface/wx/addremovectrl.h
index a2fcf6e3bb..67d37fb73c 100644
--- a/interface/wx/addremovectrl.h
+++ b/interface/wx/addremovectrl.h
@@ -121,7 +121,7 @@ public:
             virtual wxWindow* GetItemsCtrl() const { return m_lbox; }
 
             virtual bool CanAdd() const { return true; }
-            virtual bool CanRename() const { return m_lbox->GetSelection() != wxNOT_FOUND; }
+            virtual bool CanRemove() const { return m_lbox->GetSelection() != wxNOT_FOUND; }
             virtual void OnAdd() { ... get the new item from user and add it ... }
             virtual void OnRemove() { m_lbox->Delete(m_lbox->GetSelection()); }
 

From 813fdca24cc8a1f12252bca630e3de962f20b5e8 Mon Sep 17 00:00:00 2001
From: Xaviou <x.psoud@gmail.com>
Date: Sun, 25 Feb 2018 18:39:59 +0100
Subject: [PATCH 398/916] Fix Wrong method name in wxAddRemoveCtrl
 documentation

Use the correct CanRemove() instead of the non-existent CanRename().

Closes https://github.com/wxWidgets/wxWidgets/pull/747
---
 interface/wx/addremovectrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/wx/addremovectrl.h b/interface/wx/addremovectrl.h
index a2fcf6e3bb..67d37fb73c 100644
--- a/interface/wx/addremovectrl.h
+++ b/interface/wx/addremovectrl.h
@@ -121,7 +121,7 @@ public:
             virtual wxWindow* GetItemsCtrl() const { return m_lbox; }
 
             virtual bool CanAdd() const { return true; }
-            virtual bool CanRename() const { return m_lbox->GetSelection() != wxNOT_FOUND; }
+            virtual bool CanRemove() const { return m_lbox->GetSelection() != wxNOT_FOUND; }
             virtual void OnAdd() { ... get the new item from user and add it ... }
             virtual void OnRemove() { m_lbox->Delete(m_lbox->GetSelection()); }
 

From d6a284783ae3b22a22caf8ac0f4933d8124c1eb0 Mon Sep 17 00:00:00 2001
From: Kolya Kosenko <kolya.kosenko@gmail.com>
Date: Tue, 27 Feb 2018 23:47:27 +0200
Subject: [PATCH 399/916] Fix wxGTK/Win32 CMake build

---
 build/cmake/functions.cmake         | 37 ++++++++++++++++++++++++++---
 build/cmake/lib/adv/CMakeLists.txt  |  3 +++
 build/cmake/lib/core/CMakeLists.txt |  6 ++++-
 build/cmake/options.cmake           |  2 +-
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 9af05bd939..39e47f2ba4 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -202,8 +202,8 @@ function(wx_set_target_properties target_name is_base)
             PUBLIC ${wxTOOLKIT_INCLUDE_DIRS})
     endif()
 
-    if (WXMSW)
-        set(WXMSW_LIBRARIES
+    if (WIN32)
+        set(WIN32_LIBRARIES
             kernel32
             user32
             gdi32
@@ -225,7 +225,38 @@ function(wx_set_target_properties target_name is_base)
             uxtheme
         )
         target_link_libraries(${target_name}
-            PUBLIC ${WXMSW_LIBRARIES})
+            PUBLIC ${WIN32_LIBRARIES})
+
+        if(WXGTK)
+            if(WXGTK4)
+                set(WXGTK_WIN32_LIBRARIES
+                    libgtk-4.dll.a
+                    libgdk-4.dll.a
+                )
+            elseif(WXGTK3)
+                set(WXGTK_WIN32_LIBRARIES
+                    libgtk-3.dll.a
+                    libgdk-3.dll.a
+                )
+            elseif(WXGTK2)
+                set(WXGTK_WIN32_LIBRARIES
+                    gtk-win32-2.0.lib
+                    gdk-win32-2.0.lib
+                )
+            endif()
+            set(WXGTK_WIN32_LIBRARIES ${WXGTK_WIN32_LIBRARIES}
+                gio-2.0.lib
+                pangocairo-1.0.lib
+                gdk_pixbuf-2.0.lib
+                cairo.lib
+                pango-1.0.lib
+                gobject-2.0.lib
+                gthread-2.0.lib
+                glib-2.0.lib
+            )
+            target_link_libraries(${target_name}
+                PUBLIC ${WXGTK_WIN32_LIBRARIES})
+        endif()
     endif()
 
     if(wxTOOLKIT_LIBRARIES)
diff --git a/build/cmake/lib/adv/CMakeLists.txt b/build/cmake/lib/adv/CMakeLists.txt
index 9db332822c..3fd183975d 100644
--- a/build/cmake/lib/adv/CMakeLists.txt
+++ b/build/cmake/lib/adv/CMakeLists.txt
@@ -20,6 +20,9 @@ elseif(WXOSX_COCOA)
 elseif(WXGTK)
     wx_append_sources(ADV_FILES ADVANCED_GTK2)
     wx_append_sources(ADV_FILES ADVANCED_GTK_NATIVE)
+    if(WIN32)
+        wx_append_sources(ADV_FILES ADVANCED_GTK_WIN32)
+    endif()
 endif()
 
 if(UNIX AND NOT APPLE AND NOT WIN32)
diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt
index 809b50b9b0..a47f517860 100644
--- a/build/cmake/lib/core/CMakeLists.txt
+++ b/build/cmake/lib/core/CMakeLists.txt
@@ -28,7 +28,11 @@ elseif(WXGTK)
     wx_append_sources(CORE_SRC GTK2_LOWLEVEL)
     wx_append_sources(CORE_SRC GTK2)
 
-    wx_append_sources(CORE_SRC XWIN_LOWLEVEL)
+    if(UNIX)
+        wx_append_sources(CORE_SRC XWIN_LOWLEVEL)
+    elseif(WIN32)
+        wx_append_sources(CORE_SRC GTK_WIN32)
+    endif()
 elseif(WXOSX_COCOA)
     wx_append_sources(CORE_SRC BASE_AND_GUI_OSX_COCOA)
     wx_append_sources(CORE_SRC OSX_LOWLEVEL)
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index b01db3261f..2ba39ec50e 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -342,7 +342,7 @@ wx_option(wxUSE_HOTKEY "use wxWindow::RegisterHotKey()")
 wx_option(wxUSE_JOYSTICK "use wxJoystick")
 wx_option(wxUSE_METAFILE "use wxMetaFile")
 wx_option(wxUSE_DRAGIMAGE "use wxDragImage")
-if(WIN32)
+if(WXMSW)
     wx_option(wxUSE_ACCESSIBILITY "enable accessibility support")
 endif()
 wx_option(wxUSE_UIACTIONSIMULATOR "use wxUIActionSimulator (experimental)")

From a7505356a48feaa155f07bdc4d0fcbd2344d5a85 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 28 Feb 2018 16:10:33 +0100
Subject: [PATCH 400/916] supporting Window Menu as Carbon did

---
 include/wx/osx/app.h   |  1 +
 src/osx/carbon/app.cpp |  1 +
 src/osx/cocoa/menu.mm  | 85 ++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index cbd13b41a6..a16b112f1f 100644
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -109,6 +109,7 @@ public:
     static long           s_macPreferencesMenuItemId ;
     static long           s_macExitMenuItemId ;
     static wxString       s_macHelpMenuTitleName ;
+    static wxString       s_macWindowMenuTitleName ;
 
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
 
diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index fec23b9533..52be0397ec 100644
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -68,6 +68,7 @@ long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
 wxString  wxApp::s_macHelpMenuTitleName = wxT("&Help") ;
+wxString  wxApp::s_macWindowMenuTitleName = wxT("&Window") ;
 
 bool      wxApp::sm_isEmbedded = false; // Normally we're not a plugin
 
diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index edccdcdbb8..1629cbc275 100644
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -192,14 +192,13 @@ public :
     {
         [m_osxMenu removeItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem()];
     }
-
-    virtual void MakeRoot() wxOVERRIDE
+    
+    virtual void MacSetupAppleMenu()
     {
         wxMenu* peer = GetWXPeer();
         
-        [NSApp setMainMenu:m_osxMenu];
         [NSApp setAppleMenu:[[m_osxMenu itemAtIndex:0] submenu]];
-
+        
         wxMenuItem *services = peer->FindItem(wxID_OSX_SERVICES);
         if ( services )
             [NSApp setServicesMenu:services->GetSubMenu()->GetHMenu()];
@@ -208,6 +207,11 @@ public :
         else
             [NSApp setServicesMenu:nil];
 #endif
+    }
+    
+    virtual void MacSetupHelpMenu()
+    {
+        wxMenu* peer = GetWXPeer();
         
         NSMenu* helpMenu = nil;
         int helpid = peer->FindItem(wxApp::s_macHelpMenuTitleName);
@@ -225,6 +229,79 @@ public :
             [NSApp setHelpMenu:helpMenu];
         
     }
+    
+    virtual NSMenu* MacCreateOrFindWindowMenu()
+    {
+        wxMenu* peer = GetWXPeer();
+        
+        NSMenu* windowMenu = nil;
+        int windowmenuid = peer->FindItem(wxApp::s_macWindowMenuTitleName);
+        if ( windowmenuid == wxNOT_FOUND )
+            windowmenuid = peer->FindItem(_("&Window"));
+        
+        if ( windowmenuid != wxNOT_FOUND )
+        {
+            wxMenuItem* windowMenuItem = peer->FindItem(windowmenuid);
+            
+            if ( windowMenuItem->IsSubMenu() )
+                windowMenu = windowMenuItem->GetSubMenu()->GetHMenu();
+        }
+
+        if ( windowMenu == nil )
+        {
+            windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
+            NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
+            [windowMenuItem setSubmenu:windowMenu];
+            [windowMenu release];
+            [m_osxMenu addItem:windowMenuItem];
+        }
+        return windowMenu;
+    }
+    
+    virtual void MacSetupWindowMenu()
+    {
+        if ( GetWXPeer()->GetMenuBar()->GetAutoWindowMenu() )
+        {
+            NSMenu* windowMenu = MacCreateOrFindWindowMenu();
+            NSMenuItem* item = nil;
+            bool menuWasEmpty = [windowMenu numberOfItems] == 0;
+            if ( !menuWasEmpty )
+                item = [windowMenu itemAtIndex:0];
+            
+            if ( item == nil || [item action] != @selector(performMiniaturize:) )
+            {
+                item = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+                [windowMenu insertItem:item atIndex:0];
+                [item setEnabled:YES];
+                [item release];
+                
+                item = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""];
+                [windowMenu insertItem:item atIndex:1];
+                [item release];
+                
+                [windowMenu insertItem:[NSMenuItem separatorItem] atIndex:2];
+                
+                item = [[NSMenuItem alloc] initWithTitle:@"Bring All to Front" action:@selector(arrangeInFront:) keyEquivalent:@""];
+                [windowMenu insertItem:item atIndex:3];
+                [item release];
+                
+                if ( !menuWasEmpty )
+                    [windowMenu insertItem:[NSMenuItem separatorItem] atIndex:4];
+            }
+            
+            [NSApp setWindowsMenu:windowMenu];
+        }
+    }
+
+    virtual void MakeRoot() wxOVERRIDE
+    {
+        [NSApp setMainMenu:m_osxMenu];
+
+        MacSetupAppleMenu();
+        MacSetupHelpMenu();
+        MacSetupWindowMenu();
+        
+    }
 
     virtual void Enable( bool WXUNUSED(enable) )
     {

From 6b3b05e5f7a91d1ec80f5512a7d8967abeee6d20 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 28 Feb 2018 16:24:43 +0100
Subject: [PATCH 401/916] fixing classname

---
 include/wx/osx/core/private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 5b012f9048..109f420124 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -198,7 +198,7 @@ public :
 protected :
     wxMenu* m_peer;
 
-    wxDECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
+    wxDECLARE_ABSTRACT_CLASS(wxMenuImpl);
 } ;
 #endif
 

From e87544ae70cb1ab3bb97419b76a45fdce6e33739 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Feb 2018 16:55:16 +0100
Subject: [PATCH 402/916] Fix possible hang after clearing wxTAB_TRAVERSAL
 style in wxMSW

Clearing this style by calling SetWindowStyleFlag() could reset
WS_EX_CONTROLPARENT extended flags bit, breaking the invariant that the
parent of any window with this bit set has it as well and resulting in
hangs due to infinite loops inside Windows own code iterating over the
controls.

Prevent this from happening by always preserving this style bit if it
was previously set in MSWUpdateStyle(). This is a bit ugly, but there
doesn't seem to be any obviously better way to do it.

Closes #18091.
---
 docs/changes.txt   | 4 ++++
 src/msw/window.cpp | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index f4867d6ac6..73471219dd 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -71,6 +71,10 @@ All:
 
 - Make wxList and wxVector iterators conform to input iterator requirements.
 
+wxMSW:
+
+- Fix hang after clearing wxTAB_TRAVERSAL style on a window with children.
+
 
 3.1.1: (released 2018-02-19)
 ----------------------------
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 0082cef587..ca8fccb9da 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1409,7 +1409,14 @@ void wxWindowMSW::MSWUpdateStyle(long flagsOld, long exflagsOld)
                                       WS_SYSMENU) ) != 0;
     }
 
-    // and the extended style
+    // There is one extra complication with the extended style: we must never
+    // reset WS_EX_CONTROLPARENT because it may break the invariant that the
+    // parent of any window with this style bit set has it as well. We enforce
+    // this invariant elsewhere and must not clear it here to avoid the fatal
+    // problems (hangs) which happen if we break it, so ensure it is preserved.
+    if ( exstyleOld & WS_EX_CONTROLPARENT )
+        exstyle |= WS_EX_CONTROLPARENT;
+
     wxMSWWinExStyleUpdater updateExStyle(GetHwnd());
     if ( updateExStyle.TurnOff(exstyleOld).TurnOn(exstyle).Apply() )
     {

From 5e61527c04bcccce67e2cd285581c004595712b3 Mon Sep 17 00:00:00 2001
From: Danny Scott <doscott@doscott.ca>
Date: Wed, 28 Feb 2018 18:48:52 +0100
Subject: [PATCH 403/916] Fix typos and shell syntax in the release
 instructions

Closes #18095.
---
 docs/contributing/how-to-release.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/contributing/how-to-release.md b/docs/contributing/how-to-release.md
index c3e5ff9e1b..eeeeabd7ed 100644
--- a/docs/contributing/how-to-release.md
+++ b/docs/contributing/how-to-release.md
@@ -20,7 +20,7 @@ Add the missing installed folder locations of any executables to your Path.
 For the stable (even) releases only, check that binary compatibility hasn't
 been broken since the last stable release.
 
-### Checking under Unix systems using `abi-complicance-checker` tool.
+### Checking under Unix systems using `abi-compliance-checker` tool.
 
 Instructions:
 
@@ -32,11 +32,11 @@ Instructions:
 1. Create directories for temporary files containing the ABI dumps for the old
    and new libraries: `mkdir -p ../compat/{$old,$new}`.
 1. Run abi-dumper on all libraries: `for l in $old/lib/*.so; do abi-dumper $l
-   -lver $old -o ../compat/$old/$(basename $l).dump` and the same thing with
+   -lver $old -o ../compat/$old/$(basename $l).dump; done` and the same thing with
    the new libraries.
 1. Run abi-compliance-checker on each pair of produced dumps to generate HTML
-   reports: `for l in 3.0.2/*dump; abi-compliance-checker -l $(basename $l
-   .dump) -old $l -new 3.0.3/$(basename $l)`.
+   reports: `for l in 3.0.2/*dump; do abi-compliance-checker -l $(basename $l
+   .dump) -old $l -new 3.0.3/$(basename $l); done`.
 1. Examine these reports, paying attention to the problem summary.
 
 ### Checking under MSW systems.

From 0fc53016a968275306cd9acdbd4c57bd70803d8d Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 28 Feb 2018 21:08:27 +0100
Subject: [PATCH 404/916] making NSString conversion functions available in
 private.h

---
 include/wx/osx/cocoa/private.h     |  5 +++++
 src/html/htmlctrl/webkit/webkit.mm | 24 ------------------------
 src/osx/carbon/utilscocoa.mm       | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 07402e06d1..057ddc8deb 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -500,6 +500,11 @@ extern ClassicCursor gMacCursors[];
 
 extern NSLayoutManager* gNSLayoutManager;
 
+// NSString<->wxString
+
+wxString wxStringWithNSString(NSString *nsstring);
+NSString* wxNSStringWithWxString(const wxString &wxstring);
+
 #endif // wxUSE_GUI
 
 #endif
diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index 5f581671b0..e9a8742a45 100644
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -93,30 +93,6 @@ wxWebKitNewWindowEvent::wxWebKitNewWindowEvent( wxWindow* win )
     }
 }
 
-
-
-//---------------------------------------------------------
-// helper functions for NSString<->wxString conversion
-//---------------------------------------------------------
-
-inline wxString wxStringWithNSString(NSString *nsstring)
-{
-#if wxUSE_UNICODE
-    return wxString([nsstring UTF8String], wxConvUTF8);
-#else
-    return wxString([nsstring lossyCString]);
-#endif // wxUSE_UNICODE
-}
-
-inline NSString* wxNSStringWithWxString(const wxString &wxstring)
-{
-#if wxUSE_UNICODE
-    return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)];
-#else
-    return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
-#endif // wxUSE_UNICODE
-}
-
 inline int wxNavTypeFromWebNavType(int type){
     if (type == WebNavigationTypeLinkClicked)
         return wxWEBKIT_NAV_LINK_CLICKED;
diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index 4c8b13dbbe..4bb4f8fc17 100644
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -562,5 +562,27 @@ void  wxMacCocoaShowCursor()
     [NSCursor unhide];
 }
 
+//---------------------------------------------------------
+// helper functions for NSString<->wxString conversion
+//---------------------------------------------------------
+
+wxString wxStringWithNSString(NSString *nsstring)
+{
+#if wxUSE_UNICODE
+    return wxString([nsstring UTF8String], wxConvUTF8);
+#else
+    return wxString([nsstring lossyCString]);
+#endif // wxUSE_UNICODE
+}
+
+NSString* wxNSStringWithWxString(const wxString &wxstring)
+{
+#if wxUSE_UNICODE
+    return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)];
+#else
+    return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
+#endif // wxUSE_UNICODE
+}
+
 #endif
 

From c4a4d95ad1029eac10678c7076a97a219fa7476e Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 28 Feb 2018 21:09:41 +0100
Subject: [PATCH 405/916] using wx translations for window menu

---
 src/osx/cocoa/menu.mm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 1629cbc275..d5a785c72d 100644
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -233,6 +233,7 @@ public :
     virtual NSMenu* MacCreateOrFindWindowMenu()
     {
         wxMenu* peer = GetWXPeer();
+        wxString windowMenuTitle = wxStripMenuCodes(_("&Window"));
         
         NSMenu* windowMenu = nil;
         int windowmenuid = peer->FindItem(wxApp::s_macWindowMenuTitleName);
@@ -249,8 +250,8 @@ public :
 
         if ( windowMenu == nil )
         {
-            windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
-            NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
+            windowMenu = [[NSMenu alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle)];
+            NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle) action:nil keyEquivalent:@""];
             [windowMenuItem setSubmenu:windowMenu];
             [windowMenu release];
             [m_osxMenu addItem:windowMenuItem];
@@ -270,18 +271,18 @@ public :
             
             if ( item == nil || [item action] != @selector(performMiniaturize:) )
             {
-                item = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+                item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Minimize")) action:@selector(performMiniaturize:) keyEquivalent:@"m"];
                 [windowMenu insertItem:item atIndex:0];
                 [item setEnabled:YES];
                 [item release];
                 
-                item = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""];
+                item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Zoom")) action:@selector(performZoom:) keyEquivalent:@""];
                 [windowMenu insertItem:item atIndex:1];
                 [item release];
                 
                 [windowMenu insertItem:[NSMenuItem separatorItem] atIndex:2];
                 
-                item = [[NSMenuItem alloc] initWithTitle:@"Bring All to Front" action:@selector(arrangeInFront:) keyEquivalent:@""];
+                item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Bring All to Front")) action:@selector(arrangeInFront:) keyEquivalent:@""];
                 [windowMenu insertItem:item atIndex:3];
                 [item release];
                 

From eb3971c199bcd6f781cef52e167b7cb42c816aa5 Mon Sep 17 00:00:00 2001
From: Kolya Kosenko <kolya.kosenko@gmail.com>
Date: Thu, 1 Mar 2018 01:16:06 +0200
Subject: [PATCH 406/916] Move GTK+/Win32 libraries list to toolkit.cmake file

---
 build/cmake/functions.cmake | 31 -------------------------------
 build/cmake/toolkit.cmake   | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 39e47f2ba4..7b900a00c5 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -226,37 +226,6 @@ function(wx_set_target_properties target_name is_base)
         )
         target_link_libraries(${target_name}
             PUBLIC ${WIN32_LIBRARIES})
-
-        if(WXGTK)
-            if(WXGTK4)
-                set(WXGTK_WIN32_LIBRARIES
-                    libgtk-4.dll.a
-                    libgdk-4.dll.a
-                )
-            elseif(WXGTK3)
-                set(WXGTK_WIN32_LIBRARIES
-                    libgtk-3.dll.a
-                    libgdk-3.dll.a
-                )
-            elseif(WXGTK2)
-                set(WXGTK_WIN32_LIBRARIES
-                    gtk-win32-2.0.lib
-                    gdk-win32-2.0.lib
-                )
-            endif()
-            set(WXGTK_WIN32_LIBRARIES ${WXGTK_WIN32_LIBRARIES}
-                gio-2.0.lib
-                pangocairo-1.0.lib
-                gdk_pixbuf-2.0.lib
-                cairo.lib
-                pango-1.0.lib
-                gobject-2.0.lib
-                gthread-2.0.lib
-                glib-2.0.lib
-            )
-            target_link_libraries(${target_name}
-                PUBLIC ${WXGTK_WIN32_LIBRARIES})
-        endif()
     endif()
 
     if(wxTOOLKIT_LIBRARIES)
diff --git a/build/cmake/toolkit.cmake b/build/cmake/toolkit.cmake
index edcf0ebe69..02f9982920 100644
--- a/build/cmake/toolkit.cmake
+++ b/build/cmake/toolkit.cmake
@@ -82,6 +82,35 @@ if(WXGTK)
     list(APPEND wxTOOLKIT_DEFINITIONS ${${gtk_lib}_DEFINITIONS})
     list(APPEND wxTOOLKIT_DEFINITIONS __WXGTK__)
     set(wxTOOLKIT_VERSION ${${gtk_lib}_VERSION})
+
+    if(WIN32 AND MSVC)
+        if(WXGTK4)
+            list(APPEND wxTOOLKIT_LIBRARIES
+                libgtk-4.dll.a
+                libgdk-4.dll.a
+            )
+        elseif(WXGTK3)
+            list(APPEND wxTOOLKIT_LIBRARIES
+                libgtk-3.dll.a
+                libgdk-3.dll.a
+            )
+        elseif(WXGTK2)
+            list(APPEND wxTOOLKIT_LIBRARIES
+                gtk-win32-2.0
+                gdk-win32-2.0
+            )
+        endif()
+        list(APPEND wxTOOLKIT_LIBRARIES
+            gio-2.0
+            pangocairo-1.0
+            gdk_pixbuf-2.0
+            cairo
+            pango-1.0
+            gobject-2.0
+            gthread-2.0
+            glib-2.0
+        )
+    endif()
 endif()
 
 if(APPLE)

From 2881d9875ad6fdbdfbb564b7bfdc27dfcec1e72f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Mar 2018 22:29:13 +0100
Subject: [PATCH 407/916] Fix recently broken (re-)layout in the listctrl
 sample

This completes changes of 0873abb836582db1908e8bec185897ae2da0ca50 which
replaced manual layout code with sizers, but broke layout after
recreating the control in the process.

This change notably fixes the control becoming invisible, due to having
the default too small size, in non-report modes.
---
 samples/listctrl/listtest.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 6eb4eb4544..84d6898b04 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -110,8 +110,6 @@ bool MyApp::OnInit()
 // ----------------------------------------------------------------------------
 
 wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_SIZE(MyFrame::OnSize)
-
     EVT_MENU(LIST_QUIT, MyFrame::OnQuit)
     EVT_MENU(LIST_ABOUT, MyFrame::OnAbout)
     EVT_MENU(LIST_LIST_VIEW, MyFrame::OnListView)
@@ -449,13 +447,23 @@ void MyFrame::RecreateList(long flags, bool withText)
             (m_listCtrl->GetWindowStyleFlag() & wxLC_VIRTUAL)) )
 #endif
     {
-        delete m_listCtrl;
+        wxListCtrl* const old = m_listCtrl;
 
         m_listCtrl = new MyListCtrl(m_panel, LIST_CTRL,
                                     wxDefaultPosition, wxDefaultSize,
                                     flags |
                                     wxBORDER_THEME | wxLC_EDIT_LABELS);
 
+        if ( old )
+        {
+            wxSizer* const sizer = m_panel->GetSizer();
+            sizer->Replace(old, m_listCtrl);
+
+            delete old;
+
+            sizer->Layout();
+        }
+
         switch ( flags & wxLC_MASK_TYPE )
         {
             case wxLC_LIST:

From 1540361e753688632efbaa5a50e4021871b4c75c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Mar 2018 16:00:47 +0100
Subject: [PATCH 408/916] Avoid warnings about conversion to wxUint16 in
 wxUniChar code

This conversion is intentional, so suppress the -Wconversion warning
given by g++ 7 (if this warning is enabled) with an explicit cast.
---
 include/wx/unichar.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index bbd75466bf..5d731754b1 100644
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -93,14 +93,14 @@ public:
     static wxUint16 HighSurrogate(wxUint32 value)
     {
         wxASSERT_MSG(IsSupplementary(value), "wxUniChar::HighSurrogate() must be called on a supplementary character");
-        return 0xD800 | ((value - 0x10000) >> 10);
+        return static_cast<wxUint16>(0xD800 | ((value - 0x10000) >> 10));
     }
 
     // Returns the low surrogate code unit for the supplementary character
     static wxUint16 LowSurrogate(wxUint32 value)
     {
         wxASSERT_MSG(IsSupplementary(value), "wxUniChar::LowSurrogate() must be called on a supplementary character");
-        return 0xDC00 | ((value - 0x10000) & 0x03FF);
+        return static_cast<wxUint16>(0xDC00 | ((value - 0x10000) & 0x03FF));
     }
 
     // Returns true if the character is a BMP character:

From 9774d92e914d39095a9e0b1e8d8d7a147df7275a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Mar 2018 16:01:45 +0100
Subject: [PATCH 409/916] Change wxSize::Scale() to take double, not float

There doesn't seem to be any reason to use float here when double is
used everywhere else.

Moreover, the (implicit) conversion of int to float is not always
lossless, and resulted in -Wconversion warnings from g++ 7, which
disappear when using doubles.
---
 include/wx/gdicmn.h   | 2 +-
 interface/wx/gdicmn.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 14b648b092..10baa55178 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -318,7 +318,7 @@ public:
     void DecBy(int d) { DecBy(d, d); }
 
 
-    wxSize& Scale(float xscale, float yscale)
+    wxSize& Scale(double xscale, double yscale)
         { x = (int)(x*xscale); y = (int)(y*yscale); return *this; }
 
     // accessors
diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h
index 5d18c2aa7a..6e98d29d88 100644
--- a/interface/wx/gdicmn.h
+++ b/interface/wx/gdicmn.h
@@ -1014,7 +1014,7 @@ public:
         @return A reference to this object (so that you can concatenate other
                  operations in the same line).
     */
-    wxSize& Scale(float xscale, float yscale);
+    wxSize& Scale(double xscale, double yscale);
 
     /**
         Sets the width and height members.

From bec7c9a1615b0178e7b0321cb5c6ff26ea4c67ed Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Mar 2018 16:06:35 +0100
Subject: [PATCH 410/916] Don't truncate to int in wxRealPoint::operator*()

wxRealPoint uses double coordinates and it makes no sense to truncate
the result of scaling it to int -- this was almost certainly a
copy-and-paste error due to copying the code of the corresponding
wxPoint method.
---
 include/wx/gdicmn.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 10baa55178..d366d4e664 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -547,12 +547,12 @@ inline wxRealPoint operator*(unsigned long i, const wxRealPoint& s)
 
 inline wxRealPoint operator*(const wxRealPoint& s, double i)
 {
-    return wxRealPoint(int(s.x * i), int(s.y * i));
+    return wxRealPoint(s.x * i, s.y * i);
 }
 
 inline wxRealPoint operator*(double i, const wxRealPoint& s)
 {
-    return wxRealPoint(int(s.x * i), int(s.y * i));
+    return wxRealPoint(s.x * i, s.y * i);
 }
 
 

From 1f7a8a82c35af7273e8bfb639ee115b63ee0d78e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Mar 2018 16:08:01 +0100
Subject: [PATCH 411/916] Round, rather than truncate, in wxSize and wxPoint
 operations

It seems to make more sense to round the result to int rather than to
truncate it when scaling wxSize or wxPoint coordinates by a floating
point number.
---
 include/wx/gdicmn.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index d366d4e664..f7d39c017b 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -292,8 +292,8 @@ public:
     wxSize& operator*=(long i) { x *= i; y *= i; return *this; }
     wxSize& operator/=(unsigned long i) { x /= i; y /= i; return *this; }
     wxSize& operator*=(unsigned long i) { x *= i; y *= i; return *this; }
-    wxSize& operator/=(double i) { x = int(x/i); y = int(y/i); return *this; }
-    wxSize& operator*=(double i) { x = int(x*i); y = int(y*i); return *this; }
+    wxSize& operator/=(double i) { x = wxRound(x/i); y = wxRound(y/i); return *this; }
+    wxSize& operator*=(double i) { x = wxRound(x*i); y = wxRound(y*i); return *this; }
 
     void IncTo(const wxSize& sz)
         { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; }
@@ -319,7 +319,7 @@ public:
 
 
     wxSize& Scale(double xscale, double yscale)
-        { x = (int)(x*xscale); y = (int)(y*yscale); return *this; }
+        { x = wxRound(x*xscale); y = wxRound(y*yscale); return *this; }
 
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
@@ -428,12 +428,12 @@ inline wxSize operator*(unsigned long i, const wxSize& s)
 
 inline wxSize operator*(const wxSize& s, double i)
 {
-    return wxSize(int(s.x * i), int(s.y * i));
+    return wxSize(wxRound(s.x * i), wxRound(s.y * i));
 }
 
 inline wxSize operator*(double i, const wxSize& s)
 {
-    return wxSize(int(s.x * i), int(s.y * i));
+    return wxSize(wxRound(s.x * i), wxRound(s.y * i));
 }
 
 
@@ -567,7 +567,7 @@ public:
 
     wxPoint() : x(0), y(0) { }
     wxPoint(int xx, int yy) : x(xx), y(yy) { }
-    wxPoint(const wxRealPoint& pt) : x(int(pt.x)), y(int(pt.y)) { }
+    wxPoint(const wxRealPoint& pt) : x(wxRound(pt.x)), y(wxRound(pt.y)) { }
 
     // no copy ctor or assignment operator - the defaults are ok
 

From e777f2a253ee9eece60ef1579ad92c2fe8aadc63 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Mar 2018 19:51:31 +0100
Subject: [PATCH 412/916] Document that wxEVT_TREE_ITEM_MENU item is always
 valid

Mention that wxEVT_CONTEXT_MENU can be used to show popup menus that
should be shown even when clicking outside of the client area.
---
 interface/wx/treectrl.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h
index 0a73785bde..c7738861d4 100644
--- a/interface/wx/treectrl.h
+++ b/interface/wx/treectrl.h
@@ -132,7 +132,10 @@
           Processes a @c wxEVT_TREE_ITEM_GETTOOLTIP event type.
     @event{EVT_TREE_ITEM_MENU(id, func)}
           The context menu for the selected item has been requested, either by a
-          right click or by using the menu key.
+          right click or by using the menu key. Notice that these events always
+          carry a valid tree item and so are not generated when (right)
+          clicking outside of the items area. If you need to handle such
+          events, consider using @c wxEVT_CONTEXT_MENU instead.
           Processes a @c wxEVT_TREE_ITEM_MENU event type.
     @event{EVT_TREE_STATE_IMAGE_CLICK(id, func)}
           The state image has been clicked.

From 2c515d730a0841d88f76ee32d368cd8bd4d57f2e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Mar 2018 20:00:54 +0100
Subject: [PATCH 413/916] Regenerate configure after 3.1.2 version update

This was forgotten in 2ec2837f6ddf8b45a76085db058f15772c795215.
---
 configure | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 8cb4a36c68..4c3aff6ac7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.1.
+# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.2.
 #
 # Report bugs to <wx-dev@googlegroups.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='3.1.1'
-PACKAGE_STRING='wxWidgets 3.1.1'
+PACKAGE_VERSION='3.1.2'
+PACKAGE_STRING='wxWidgets 3.1.2'
 PACKAGE_BUGREPORT='wx-dev@googlegroups.com'
 PACKAGE_URL=''
 
@@ -1962,7 +1962,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures wxWidgets 3.1.1 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 3.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2031,7 +2031,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 3.1.1:";;
+     short | recursive ) echo "Configuration of wxWidgets 3.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -2496,7 +2496,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-wxWidgets configure 3.1.1
+wxWidgets configure 3.1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3313,7 +3313,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by wxWidgets $as_me 3.1.1, which was
+It was created by wxWidgets $as_me 3.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3776,7 +3776,7 @@ fi
 
 wx_major_version_number=3
 wx_minor_version_number=1
-wx_release_number=1
+wx_release_number=2
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -42258,7 +42258,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by wxWidgets $as_me 3.1.1, which was
+This file was extended by wxWidgets $as_me 3.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -42324,7 +42324,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-wxWidgets config.status 3.1.1
+wxWidgets config.status 3.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

From 3b9aeaeb2f0b926c5479fb5fcaada3961d915962 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 6 Mar 2018 23:12:19 +0100
Subject: [PATCH 414/916] More use of wxOVERRIDE

---
 include/wx/event.h                      | 14 +++---
 include/wx/propgrid/props.h             |  6 +--
 include/wx/sckaddr.h                    | 10 ++---
 include/wx/window.h                     | 36 +++++++--------
 samples/animate/anitest.h               |  2 +-
 samples/mediaplayer/mediaplayer.cpp     |  2 +-
 samples/memcheck/memcheck.cpp           |  2 +-
 samples/oleauto/oleauto.cpp             |  2 +-
 samples/power/power.cpp                 |  2 +-
 samples/preferences/preferences.cpp     | 18 ++++----
 samples/stc/stctest.cpp                 |  6 +--
 samples/taskbarbutton/taskbarbutton.cpp |  2 +-
 samples/xrc/xrcdemo.h                   |  2 +-
 src/common/event.cpp                    |  4 +-
 src/html/chm.cpp                        | 24 +++++-----
 src/msw/ole/access.cpp                  | 58 ++++++++++++-------------
 src/msw/progdlg.cpp                     |  4 +-
 17 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/include/wx/event.h b/include/wx/event.h
index ae14ebb8a3..a46f11f943 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1893,7 +1893,7 @@ public:
     bool IsGestureEnd() const { return m_isEnd; }
     void SetGestureEnd(bool isEnd = true) { m_isEnd = isEnd; }
 
-    virtual wxEvent *Clone() const { return new wxGestureEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxGestureEvent(*this); }
 
 protected:
     wxPoint m_pos;
@@ -1926,7 +1926,7 @@ public:
     wxPoint GetDelta() const { return m_delta; }
     void SetDelta(const wxPoint& delta) { m_delta = delta; }
 
-    virtual wxEvent *Clone() const { return new wxPanGestureEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxPanGestureEvent(*this); }
 
 private:
     wxPoint m_delta;
@@ -1955,7 +1955,7 @@ public:
     double GetZoomFactor() const { return m_zoomFactor; }
     void SetZoomFactor(double zoomFactor) { m_zoomFactor = zoomFactor; }
 
-    virtual wxEvent *Clone() const { return new wxZoomGestureEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxZoomGestureEvent(*this); }
 
 private:
     double m_zoomFactor;
@@ -1984,7 +1984,7 @@ public:
     double GetRotationAngle() const { return m_rotationAngle; }
     void SetRotationAngle(double rotationAngle) { m_rotationAngle = rotationAngle; }
 
-    virtual wxEvent *Clone() const { return new wxRotateGestureEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxRotateGestureEvent(*this); }
 
 private:
     double m_rotationAngle;
@@ -2008,7 +2008,7 @@ public:
     wxTwoFingerTapEvent(const wxTwoFingerTapEvent& event) : wxGestureEvent(event)
     { }
 
-    virtual wxEvent *Clone() const { return new wxTwoFingerTapEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxTwoFingerTapEvent(*this); }
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTwoFingerTapEvent);
@@ -2030,7 +2030,7 @@ public:
     wxLongPressEvent(const wxLongPressEvent& event) : wxGestureEvent(event)
     { }
 
-    virtual wxEvent *Clone() const { return new wxLongPressEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxLongPressEvent(*this); }
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxLongPressEvent);
 };
@@ -2051,7 +2051,7 @@ public:
     wxPressAndTapEvent(const wxPressAndTapEvent& event) : wxGestureEvent(event)
     { }
 
-    virtual wxEvent *Clone() const { return new wxPressAndTapEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxPressAndTapEvent(*this); }
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPressAndTapEvent);
 };
diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 8fba42ea23..d7d674848a 100644
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -746,9 +746,9 @@ public: \
               const wxArrayString& value = wxArrayString() ); \
     ~PROPNAME(); \
     virtual bool OnEvent( wxPropertyGrid* propgrid, \
-                          wxWindow* primary, wxEvent& event ); \
-    virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value ); \
-    virtual wxValidator* DoGetValidator() const; \
+                          wxWindow* primary, wxEvent& event ) wxOVERRIDE; \
+    virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value ) wxOVERRIDE; \
+    virtual wxValidator* DoGetValidator() const wxOVERRIDE; \
 };
 
 #define WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAM) \
diff --git a/include/wx/sckaddr.h b/include/wx/sckaddr.h
index 5a568c3adc..45fde87625 100644
--- a/include/wx/sckaddr.h
+++ b/include/wx/sckaddr.h
@@ -159,14 +159,14 @@ public:
     wxIPV6address(const wxIPV6address& other) : wxIPaddress(other) { }
 
     // implement wxSockAddress pure virtuals:
-    virtual Family Type() { return IPV6; }
-    virtual wxSockAddress *Clone() const { return new wxIPV6address(*this); }
+    virtual Family Type() wxOVERRIDE { return IPV6; }
+    virtual wxSockAddress *Clone() const wxOVERRIDE { return new wxIPV6address(*this); }
 
 
     // implement wxIPaddress pure virtuals:
-    virtual bool IsLocalHost() const;
+    virtual bool IsLocalHost() const wxOVERRIDE;
 
-    virtual wxString IPAddress() const;
+    virtual wxString IPAddress() const wxOVERRIDE;
 
     // IPv6-specific methods:
     bool Hostname(unsigned char addr[16]);
@@ -174,7 +174,7 @@ public:
     using wxIPaddress::Hostname;
 
 private:
-    virtual void DoInitImpl();
+    virtual void DoInitImpl() wxOVERRIDE;
 
     wxDECLARE_DYNAMIC_CLASS(wxIPV6address);
 };
diff --git a/include/wx/window.h b/include/wx/window.h
index b2375b2db5..3aa36a9fa4 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -2079,35 +2079,35 @@ public:
 
         // Can return either a child object, or an integer
         // representing the child element, starting from 1.
-    virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject);
+    virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) wxOVERRIDE;
 
         // Returns the rectangle for this object (id = 0) or a child element (id > 0).
-    virtual wxAccStatus GetLocation(wxRect& rect, int elementId);
+    virtual wxAccStatus GetLocation(wxRect& rect, int elementId) wxOVERRIDE;
 
         // Navigates from fromId to toId/toObject.
     virtual wxAccStatus Navigate(wxNavDir navDir, int fromId,
-                int* toId, wxAccessible** toObject);
+                int* toId, wxAccessible** toObject) wxOVERRIDE;
 
         // Gets the name of the specified object.
-    virtual wxAccStatus GetName(int childId, wxString* name);
+    virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE;
 
         // Gets the number of children.
-    virtual wxAccStatus GetChildCount(int* childCount);
+    virtual wxAccStatus GetChildCount(int* childCount) wxOVERRIDE;
 
         // Gets the specified child (starting from 1).
         // If *child is NULL and return value is wxACC_OK,
         // this means that the child is a simple element and
         // not an accessible object.
-    virtual wxAccStatus GetChild(int childId, wxAccessible** child);
+    virtual wxAccStatus GetChild(int childId, wxAccessible** child) wxOVERRIDE;
 
         // Gets the parent, or NULL.
-    virtual wxAccStatus GetParent(wxAccessible** parent);
+    virtual wxAccStatus GetParent(wxAccessible** parent) wxOVERRIDE;
 
         // Performs the default action. childId is 0 (the action for this object)
         // or > 0 (the action for a child).
         // Return wxACC_NOT_SUPPORTED if there is no default action for this
         // window (e.g. an edit control).
-    virtual wxAccStatus DoDefaultAction(int childId);
+    virtual wxAccStatus DoDefaultAction(int childId) wxOVERRIDE;
 
         // Gets the default action for this object (0) or > 0 (the action for a child).
         // Return wxACC_OK even if there is no action. actionName is the action, or the empty
@@ -2115,36 +2115,36 @@ public:
         // The retrieved string describes the action that is performed on an object,
         // not what the object does as a result. For example, a toolbar button that prints
         // a document has a default action of "Press" rather than "Prints the current document."
-    virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName);
+    virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) wxOVERRIDE;
 
         // Returns the description for this object or a child.
-    virtual wxAccStatus GetDescription(int childId, wxString* description);
+    virtual wxAccStatus GetDescription(int childId, wxString* description) wxOVERRIDE;
 
         // Returns help text for this object or a child, similar to tooltip text.
-    virtual wxAccStatus GetHelpText(int childId, wxString* helpText);
+    virtual wxAccStatus GetHelpText(int childId, wxString* helpText) wxOVERRIDE;
 
         // Returns the keyboard shortcut for this object or child.
         // Return e.g. ALT+K
-    virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut);
+    virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) wxOVERRIDE;
 
         // Returns a role constant.
-    virtual wxAccStatus GetRole(int childId, wxAccRole* role);
+    virtual wxAccStatus GetRole(int childId, wxAccRole* role) wxOVERRIDE;
 
         // Returns a state constant.
-    virtual wxAccStatus GetState(int childId, long* state);
+    virtual wxAccStatus GetState(int childId, long* state) wxOVERRIDE;
 
         // Returns a localized string representing the value for the object
         // or child.
-    virtual wxAccStatus GetValue(int childId, wxString* strValue);
+    virtual wxAccStatus GetValue(int childId, wxString* strValue) wxOVERRIDE;
 
         // Selects the object or child.
-    virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags);
+    virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) wxOVERRIDE;
 
         // Gets the window with the keyboard focus.
         // If childId is 0 and child is NULL, no object in
         // this subhierarchy has the focus.
         // If this object has the focus, child should be 'this'.
-    virtual wxAccStatus GetFocus(int* childId, wxAccessible** child);
+    virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE;
 
 #if wxUSE_VARIANT
         // Gets a variant representing the selected children
@@ -2155,7 +2155,7 @@ public:
         // - an integer representing the selected child element,
         //   or 0 if this object is selected (GetType() == wxT("long")
         // - a "void*" pointer to a wxAccessible child object
-    virtual wxAccStatus GetSelections(wxVariant* selections);
+    virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE;
 #endif // wxUSE_VARIANT
 };
 
diff --git a/samples/animate/anitest.h b/samples/animate/anitest.h
index d56b20caa4..330d10acd5 100644
--- a/samples/animate/anitest.h
+++ b/samples/animate/anitest.h
@@ -14,7 +14,7 @@
 class MyApp : public wxApp
 {
 public:
-    bool OnInit();
+    bool OnInit() wxOVERRIDE;
 };
 
 // Define a new frame
diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index 6293bde936..1708dbb78e 100644
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -141,7 +141,7 @@ class wxMediaPlayerApp : public wxApp
 {
 public:
 #ifdef __WXMAC__
-    virtual void MacOpenFiles(const wxArrayString & fileNames );
+    virtual void MacOpenFiles(const wxArrayString & fileNames ) wxOVERRIDE;
 #endif
 
 #if wxUSE_CMDLINE_PARSER
diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 0673227c6e..29704ea09a 100644
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -38,7 +38,7 @@
 // Define a new application type
 class MyApp: public wxApp
 { public:
-    bool OnInit(void);
+    bool OnInit(void) wxOVERRIDE;
 };
 
 // Define a new frame type
diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 0e2973133c..a8c178ff38 100644
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -57,7 +57,7 @@ public:
     // this one is called on application startup and is a good place for the app
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)
-    virtual bool OnInit();
+    virtual bool OnInit() wxOVERRIDE;
 };
 
 // Define a new frame type: this is going to be our main frame
diff --git a/samples/power/power.cpp b/samples/power/power.cpp
index 2821b0853a..14a0e3eea4 100644
--- a/samples/power/power.cpp
+++ b/samples/power/power.cpp
@@ -266,7 +266,7 @@ wxEND_EVENT_TABLE()
 class MyApp : public wxApp
 {
 public:
-    virtual bool OnInit()
+    virtual bool OnInit() wxOVERRIDE
     {
         new MyFrame;
 
diff --git a/samples/preferences/preferences.cpp b/samples/preferences/preferences.cpp
index 865aac5ecc..47b8659154 100644
--- a/samples/preferences/preferences.cpp
+++ b/samples/preferences/preferences.cpp
@@ -50,7 +50,7 @@ struct MySettings
 class MyApp : public wxApp
 {
 public:
-    virtual bool OnInit();
+    virtual bool OnInit() wxOVERRIDE;
 
     void ShowPreferencesEditor(wxWindow* parent);
     void DismissPreferencesEditor();
@@ -156,7 +156,7 @@ public:
                            this);
     }
 
-    virtual bool TransferDataToWindow()
+    virtual bool TransferDataToWindow() wxOVERRIDE
     {
         m_settingsCurrent = wxGetApp().GetSettings();
         m_useMarkdown->SetValue(m_settingsCurrent.m_useMarkdown);
@@ -164,7 +164,7 @@ public:
         return true;
     }
 
-    virtual bool TransferDataFromWindow()
+    virtual bool TransferDataFromWindow() wxOVERRIDE
     {
         // Called on platforms with modal preferences dialog to save and apply
         // the changes.
@@ -211,7 +211,7 @@ class PrefsPageGeneral : public wxStockPreferencesPage
 {
 public:
     PrefsPageGeneral() : wxStockPreferencesPage(Kind_General) {}
-    virtual wxWindow *CreateWindow(wxWindow *parent)
+    virtual wxWindow *CreateWindow(wxWindow *parent) wxOVERRIDE
         { return new PrefsPageGeneralPanel(parent); }
 };
 
@@ -239,7 +239,7 @@ public:
         }
     }
 
-    virtual bool TransferDataToWindow()
+    virtual bool TransferDataToWindow() wxOVERRIDE
     {
         // This is the place where you can initialize values, e.g. from wxConfig.
         // For demonstration purposes, we just set hardcoded values.
@@ -248,7 +248,7 @@ public:
         return true;
     }
 
-    virtual bool TransferDataFromWindow()
+    virtual bool TransferDataFromWindow() wxOVERRIDE
     {
         // Called on platforms with modal preferences dialog to save and apply
         // the changes.
@@ -270,10 +270,10 @@ private:
 class PrefsPageTopics : public wxPreferencesPage
 {
 public:
-    virtual wxString GetName() const { return "Topics"; }
-    virtual wxBitmap GetLargeIcon() const
+    virtual wxString GetName() const wxOVERRIDE { return "Topics"; }
+    virtual wxBitmap GetLargeIcon() const wxOVERRIDE
         { return wxArtProvider::GetBitmap(wxART_HELP, wxART_TOOLBAR); }
-    virtual wxWindow *CreateWindow(wxWindow *parent)
+    virtual wxWindow *CreateWindow(wxWindow *parent) wxOVERRIDE
         { return new PrefsPageTopicsPanel(parent); }
 };
 
diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 34ab8a87b5..e60c04cd97 100644
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -95,10 +95,10 @@ class App: public wxApp {
 
 public:
     //! the main function called during application start
-    virtual bool OnInit ();
+    virtual bool OnInit () wxOVERRIDE;
 
     //! application exit function
-    virtual int OnExit ();
+    virtual int OnExit () wxOVERRIDE;
 
 private:
     //! frame window
@@ -762,7 +762,7 @@ public:
         SetWrapMode(wxSTC_WRAP_WORD);
         SetWrapVisualFlags(wxSTC_WRAPVISUALFLAG_END);
     }
-    virtual bool SetFont(const wxFont& font)
+    virtual bool SetFont(const wxFont& font) wxOVERRIDE
     {
         StyleSetFont(wxSTC_STYLE_DEFAULT, (wxFont&)font);
         return wxStyledTextCtrl::SetFont(font);
diff --git a/samples/taskbarbutton/taskbarbutton.cpp b/samples/taskbarbutton/taskbarbutton.cpp
index 5fc078d09e..bbca20d60d 100644
--- a/samples/taskbarbutton/taskbarbutton.cpp
+++ b/samples/taskbarbutton/taskbarbutton.cpp
@@ -98,7 +98,7 @@ wxIcon CreateRandomIcon()
 class MyApp : public wxApp
 {
 public:
-    virtual bool OnInit();
+    virtual bool OnInit() wxOVERRIDE;
 };
 
 class MyFrame : public wxFrame
diff --git a/samples/xrc/xrcdemo.h b/samples/xrc/xrcdemo.h
index a7de5ef00a..5b6ce2f808 100644
--- a/samples/xrc/xrcdemo.h
+++ b/samples/xrc/xrcdemo.h
@@ -34,7 +34,7 @@ public:
     // for the app initialization (doing it here and not in the ctor
     // allows to have an error return: if OnInit() returns false, the
     // application terminates)
-    virtual bool OnInit();
+    virtual bool OnInit() wxOVERRIDE;
 
 };
 
diff --git a/src/common/event.cpp b/src/common/event.cpp
index 867871a348..14721de2d6 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -140,8 +140,8 @@ class wxEventTableEntryModule: public wxModule
 {
 public:
     wxEventTableEntryModule() { }
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxEventHashTable::ClearAll(); }
+    virtual bool OnInit() wxOVERRIDE { return true; }
+    virtual void OnExit() wxOVERRIDE { wxEventHashTable::ClearAll(); }
 
     wxDECLARE_DYNAMIC_CLASS(wxEventTableEntryModule);
 };
diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index e38bb6c4ac..1ae32fb805 100644
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -366,19 +366,19 @@ public:
     virtual ~wxChmInputStream();
 
     /// Return the size of the accessed file in archive
-    virtual size_t GetSize() const { return m_size; }
+    virtual size_t GetSize() const wxOVERRIDE { return m_size; }
     /// End of Stream?
-    virtual bool Eof() const;
+    virtual bool Eof() const wxOVERRIDE;
     /// Set simulation-mode of HHP-File (if non is found)
     void SimulateHHP(bool sim) { m_simulateHHP = sim; }
 
 protected:
     /// See wxInputStream
-    virtual size_t OnSysRead(void *buffer, size_t bufsize);
+    virtual size_t OnSysRead(void *buffer, size_t bufsize) wxOVERRIDE;
     /// See wxInputStream
-    virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
+    virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode) wxOVERRIDE;
     /// See wxInputStream
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
+    virtual wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
 
 private:
     size_t m_size;
@@ -761,16 +761,16 @@ class wxChmFSHandler : public wxFileSystemHandler
 public:
     /// Constructor and Destructor
     wxChmFSHandler();
-    virtual ~wxChmFSHandler();
+    virtual ~wxChmFSHandler() wxOVERRIDE;
 
     /// Is able to open location?
-    virtual bool CanOpen(const wxString& location);
+    virtual bool CanOpen(const wxString& location) wxOVERRIDE;
     /// Open a file
-    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
     /// Find first occurrence of spec
-    virtual wxString FindFirst(const wxString& spec, int flags = 0);
+    virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
     /// Find next occurrence of spec
-    virtual wxString FindNext();
+    virtual wxString FindNext() wxOVERRIDE;
 
 private:
     int m_lasterror;
@@ -912,12 +912,12 @@ class wxChmSupportModule : public wxModule
     wxDECLARE_DYNAMIC_CLASS(wxChmSupportModule);
 
 public:
-    virtual bool OnInit()
+    virtual bool OnInit() wxOVERRIDE
     {
         wxFileSystem::AddHandler(new wxChmFSHandler);
         return true;
     }
-    virtual void OnExit() {}
+    virtual void OnExit() wxOVERRIDE {}
 }
 ;
 
diff --git a/src/msw/ole/access.cpp b/src/msw/ole/access.cpp
index 6620f74e6e..db54fb6d78 100644
--- a/src/msw/ole/access.cpp
+++ b/src/msw/ole/access.cpp
@@ -69,10 +69,10 @@ public:
     DECLARE_IUNKNOWN_METHODS;
 
     // IEnumVARIANT
-    STDMETHODIMP Next(ULONG celt, VARIANT *rgelt, ULONG *pceltFetched);
-    STDMETHODIMP Skip(ULONG celt);
-    STDMETHODIMP Reset();
-    STDMETHODIMP Clone(IEnumVARIANT **ppenum);
+    STDMETHODIMP Next(ULONG celt, VARIANT *rgelt, ULONG *pceltFetched) wxOVERRIDE;
+    STDMETHODIMP Skip(ULONG celt) wxOVERRIDE;
+    STDMETHODIMP Reset() wxOVERRIDE;
+    STDMETHODIMP Clone(IEnumVARIANT **ppenum) wxOVERRIDE;
 
 private:
     wxVariant m_variant;  // List of further variants
@@ -191,86 +191,86 @@ public:
         // Retrieves the child element or child object at a given point on the screen.
         // All visual objects support this method; sound objects do not support it.
 
-    STDMETHODIMP accHitTest(LONG xLeft, LONG yLeft, VARIANT* pVarID);
+    STDMETHODIMP accHitTest(LONG xLeft, LONG yLeft, VARIANT* pVarID) wxOVERRIDE;
 
         // Retrieves the specified object's current screen location. All visual objects must
         // support this method; sound objects do not support it.
 
-    STDMETHODIMP accLocation ( LONG* pxLeft, LONG* pyTop, LONG* pcxWidth, LONG* pcyHeight, VARIANT varID);
+    STDMETHODIMP accLocation ( LONG* pxLeft, LONG* pyTop, LONG* pcxWidth, LONG* pcyHeight, VARIANT varID) wxOVERRIDE;
 
         // Traverses to another user interface element within a container and retrieves the object.
         // All visual objects must support this method.
 
-    STDMETHODIMP accNavigate ( LONG navDir, VARIANT varStart, VARIANT* pVarEnd);
+    STDMETHODIMP accNavigate ( LONG navDir, VARIANT varStart, VARIANT* pVarEnd) wxOVERRIDE;
 
         // Retrieves the address of an IDispatch interface for the specified child.
         // All objects must support this property.
 
-    STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild);
+    STDMETHODIMP get_accChild ( VARIANT varChildID, IDispatch** ppDispChild) wxOVERRIDE;
 
         // Retrieves the number of children that belong to this object.
         // All objects must support this property.
 
-    STDMETHODIMP get_accChildCount ( LONG* pCountChildren);
+    STDMETHODIMP get_accChildCount ( LONG* pCountChildren) wxOVERRIDE;
 
         // Retrieves the IDispatch interface of the object's parent.
         // All objects support this property.
 
-    STDMETHODIMP get_accParent ( IDispatch** ppDispParent);
+    STDMETHODIMP get_accParent ( IDispatch** ppDispParent) wxOVERRIDE;
 
 // Descriptive Properties and Methods
 
         // Performs the object's default action. Not all objects have a default
         // action.
 
-    STDMETHODIMP accDoDefaultAction(VARIANT varID);
+    STDMETHODIMP accDoDefaultAction(VARIANT varID) wxOVERRIDE;
 
         // Retrieves a string that describes the object's default action.
         // Not all objects have a default action.
 
-    STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction);
+    STDMETHODIMP get_accDefaultAction ( VARIANT varID, BSTR* pszDefaultAction) wxOVERRIDE;
 
         // Retrieves a string that describes the visual appearance of the specified object.
         // Not all objects have a description.
 
-    STDMETHODIMP get_accDescription ( VARIANT varID, BSTR* pszDescription);
+    STDMETHODIMP get_accDescription ( VARIANT varID, BSTR* pszDescription) wxOVERRIDE;
 
         // Retrieves an object's Help property string.
         // Not all objects support this property.
 
-    STDMETHODIMP get_accHelp ( VARIANT varID, BSTR* pszHelp);
+    STDMETHODIMP get_accHelp ( VARIANT varID, BSTR* pszHelp) wxOVERRIDE;
 
         // Retrieves the full path of the WinHelp file associated with the specified
         // object and the identifier of the appropriate topic within that file.
         // Not all objects support this property.
 
-    STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, LONG* pidTopic);
+    STDMETHODIMP get_accHelpTopic ( BSTR* pszHelpFile, VARIANT varChild, LONG* pidTopic) wxOVERRIDE;
 
         // Retrieves the specified object's shortcut key or access key, also known as
         // the mnemonic. All objects that have a shortcut key or access key support
         // this property.
 
-    STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut);
+    STDMETHODIMP get_accKeyboardShortcut ( VARIANT varID, BSTR* pszKeyboardShortcut) wxOVERRIDE;
 
         // Retrieves the name of the specified object.
         // All objects support this property.
 
-    STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName);
+    STDMETHODIMP get_accName ( VARIANT varID, BSTR* pszName) wxOVERRIDE;
 
         // Retrieves information that describes the role of the specified object.
         // All objects support this property.
 
-    STDMETHODIMP get_accRole ( VARIANT varID, VARIANT* pVarRole);
+    STDMETHODIMP get_accRole ( VARIANT varID, VARIANT* pVarRole) wxOVERRIDE;
 
         // Retrieves the current state of the specified object.
         // All objects support this property.
 
-    STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState);
+    STDMETHODIMP get_accState ( VARIANT varID, VARIANT* pVarState) wxOVERRIDE;
 
         // Retrieves the value of the specified object.
         // Not all objects have a value.
 
-    STDMETHODIMP get_accValue ( VARIANT varID, BSTR* pszValue);
+    STDMETHODIMP get_accValue ( VARIANT varID, BSTR* pszValue) wxOVERRIDE;
 
 // Selection and Focus
 
@@ -278,44 +278,44 @@ public:
         // specified object. All objects that select or receive the
         // keyboard focus must support this method.
 
-    STDMETHODIMP accSelect ( LONG flagsSelect, VARIANT varID );
+    STDMETHODIMP accSelect ( LONG flagsSelect, VARIANT varID ) wxOVERRIDE;
 
         // Retrieves the object that has the keyboard focus. All objects
         // that receive the keyboard focus must support this property.
 
-    STDMETHODIMP get_accFocus ( VARIANT* pVarID);
+    STDMETHODIMP get_accFocus ( VARIANT* pVarID) wxOVERRIDE;
 
         // Retrieves the selected children of this object. All objects
         // selected must support this property.
 
-    STDMETHODIMP get_accSelection ( VARIANT * pVarChildren);
+    STDMETHODIMP get_accSelection ( VARIANT * pVarChildren) wxOVERRIDE;
 
 // Obsolete
 
-    STDMETHODIMP put_accName(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) { return E_FAIL; }
-    STDMETHODIMP put_accValue(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) { return E_FAIL; }
+    STDMETHODIMP put_accName(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) wxOVERRIDE { return E_FAIL; }
+    STDMETHODIMP put_accValue(VARIANT WXUNUSED(varChild), BSTR WXUNUSED(szName)) wxOVERRIDE { return E_FAIL; }
 
 // IDispatch
 
         // Get type info
 
-    STDMETHODIMP GetTypeInfo(unsigned int typeInfo, LCID lcid, ITypeInfo** ppTypeInfo);
+    STDMETHODIMP GetTypeInfo(unsigned int typeInfo, LCID lcid, ITypeInfo** ppTypeInfo) wxOVERRIDE;
 
         // Get type info count
 
-    STDMETHODIMP GetTypeInfoCount(unsigned int* typeInfoCount);
+    STDMETHODIMP GetTypeInfoCount(unsigned int* typeInfoCount) wxOVERRIDE;
 
         // Get ids of names
 
     STDMETHODIMP GetIDsOfNames(REFIID riid, OLECHAR** names, unsigned int cNames,
-        LCID lcid, DISPID* dispId);
+        LCID lcid, DISPID* dispId) wxOVERRIDE;
 
         // Invoke
 
     STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid, LCID lcid,
                         WORD wFlags, DISPPARAMS *pDispParams,
                         VARIANT *pVarResult, EXCEPINFO *pExcepInfo,
-                        unsigned int *puArgErr );
+                        unsigned int *puArgErr ) wxOVERRIDE;
 
 // Helpers
 
diff --git a/src/msw/progdlg.cpp b/src/msw/progdlg.cpp
index 46416402c5..8525a85dba 100644
--- a/src/msw/progdlg.cpp
+++ b/src/msw/progdlg.cpp
@@ -164,7 +164,7 @@ public:
 private:
     wxProgressDialogSharedData m_sharedData;
 
-    virtual void* Entry();
+    virtual void* Entry() wxOVERRIDE;
 
     static HRESULT CALLBACK TaskDialogCallbackProc(HWND hwnd,
                                                    UINT uNotification,
@@ -187,7 +187,7 @@ public:
     }
 
 protected:
-    virtual void OnNextIteration()
+    virtual void OnNextIteration() wxOVERRIDE
     {
         wxCriticalSectionLocker locker(m_data.m_cs);
 

From ef539a68d7151017f75d61c963bdad76075e21e2 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 6 Mar 2018 23:13:35 +0100
Subject: [PATCH 415/916] Prevent use of uninitialized variable

---
 src/osx/cocoa/window.mm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index e7f5e4fc58..d0f90d0545 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -1741,6 +1741,7 @@ void wxWidgetCocoaImpl::ZoomGestureEvent(NSMagnificationGestureRecognizer* magni
              gestureState = NSGestureRecognizerStateBegan;
              break;
         case NSGestureRecognizerStateChanged:
+             gestureState = NSGestureRecognizerStateChanged;
              break;
         case NSGestureRecognizerStateEnded:
         case NSGestureRecognizerStateCancelled:
@@ -1789,6 +1790,7 @@ void wxWidgetCocoaImpl::RotateGestureEvent(NSRotationGestureRecognizer* rotation
              gestureState = NSGestureRecognizerStateBegan;
              break;
         case NSGestureRecognizerStateChanged:
+             gestureState = NSGestureRecognizerStateChanged;
              break;
         case NSGestureRecognizerStateEnded:
         case NSGestureRecognizerStateCancelled:
@@ -1840,6 +1842,7 @@ void wxWidgetCocoaImpl::LongPressEvent(NSPressGestureRecognizer* pressGestureRec
             gestureState = NSGestureRecognizerStateBegan;
             break;
         case NSGestureRecognizerStateChanged:
+            gestureState = NSGestureRecognizerStateChanged;
             break;
         case NSGestureRecognizerStateEnded:
         case NSGestureRecognizerStateCancelled:

From b3c25e57bc8d72e9de082e06bf48bfe14aa977f9 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 6 Mar 2018 23:16:19 +0100
Subject: [PATCH 416/916] Fix warning for missing field initializers

---
 samples/console/console.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 05f70a6a07..0b7e3d6ee5 100644
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -40,12 +40,13 @@ static const wxCmdLineEntryDesc cmdLineDesc[] =
 {
     { wxCMD_LINE_SWITCH, "h", "help", "show this help message",
         wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
-    { wxCMD_LINE_SWITCH, "d", "dummy", "a dummy switch" },
+    { wxCMD_LINE_SWITCH, "d", "dummy", "a dummy switch",
+        wxCMD_LINE_VAL_NONE, 0 },
     { wxCMD_LINE_SWITCH, "s", "secret", "a secret switch",
         wxCMD_LINE_VAL_NONE, wxCMD_LINE_HIDDEN },
     // ... your other command line options here...
 
-    { wxCMD_LINE_NONE }
+    wxCMD_LINE_DESC_END
 };
 
 int main(int argc, char **argv)

From f99d3df9c053f57c522a0e8bc89fdd381311073c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 7 Mar 2018 14:57:08 +0100
Subject: [PATCH 417/916] Fix harmless gcc -Wconversion-null warning in menu
 unit test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don't compare with NULL inside CPPUNIT_ASSERT() to avoid

	warning: passing NULL to non-pointer argument 1 of
	‘Catch::BinaryExpression<T, (Catch::Internal::Operator)0u, const
	RhsT&> Catch::ExpressionLhs<T>::operator==(const RhsT&) [with
	RhsT = long int, T = wxMenuItem* const&]’ [-Wconversion-null]

gcc warning.
---
 tests/menu/menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp
index d7c26f3260..bf700ec508 100644
--- a/tests/menu/menu.cpp
+++ b/tests/menu/menu.cpp
@@ -254,7 +254,7 @@ void MenuTestCase::FindInMenu()
 
     // Find by id:
     CPPUNIT_ASSERT( menuHelp->FindItem(MenuTestCase_Bar) );
-    CPPUNIT_ASSERT( menuHelp->FindItem(MenuTestCase_Foo) == NULL );
+    CPPUNIT_ASSERT( !menuHelp->FindItem(MenuTestCase_Foo) );
 
     for (n=0; n < menuHelp->GetMenuItemCount(); ++n)
     {

From 66fdf49ed88ba6025ffce328c5a9e508853b6c29 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 7 Mar 2018 15:12:21 +0100
Subject: [PATCH 418/916] Work around a Wine bug in wxDateTimePickerCtrl sizing

Don't assume that all Vista and later systems support DTM_GETIDEALSIZE,
this is not the case under Wine even when it's emulating a Vista+
Windows version and trusting DTM_GETIDEALSIZE to always return the right
value resulted in these controls having 0 size and not being shown at
all when running wxWidgets programs under Wine.

See https://bugs.winehq.org/show_bug.cgi?id=44680
---
 src/msw/datetimectrl.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/msw/datetimectrl.cpp b/src/msw/datetimectrl.cpp
index 9b8fa66bdf..18eed3d105 100644
--- a/src/msw/datetimectrl.cpp
+++ b/src/msw/datetimectrl.cpp
@@ -117,11 +117,18 @@ wxSize wxDateTimePickerCtrl::DoGetBestSize() const
     if ( wxGetWinVersion() >= wxWinVersion_Vista )
     {
         SIZE idealSize;
-        ::SendMessage(m_hWnd, DTM_GETIDEALSIZE, 0, (LPARAM)&idealSize);
 
-        size = wxSize(idealSize.cx, idealSize.cy);
+        // Work around https://bugs.winehq.org/show_bug.cgi?id=44680 by
+        // checking for the return value: even if all "real" MSW systems do
+        // support this message, Wine does not, even when it's configured to
+        // return Vista or later version to the application.
+        if ( ::SendMessage(m_hWnd, DTM_GETIDEALSIZE, 0, (LPARAM)&idealSize) )
+        {
+            size = wxSize(idealSize.cx, idealSize.cy);
+        }
     }
-    else // Windows XP
+
+    if ( !size.x || !size.y )
     {
         wxClientDC dc(const_cast<wxDateTimePickerCtrl *>(this));
 

From 6037718fef803a16e655135885bd2603f35c938d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 8 Mar 2018 23:20:05 +0100
Subject: [PATCH 419/916] Don't try building universal macOS binaries for PPC

Support for this architecture is not present in any of the still
supported SDK versions anyhow.
---
 configure    | 2 +-
 configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 4c3aff6ac7..a8b1da5c05 100755
--- a/configure
+++ b/configure
@@ -20103,7 +20103,7 @@ $as_echo "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-univers
 
     if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
         OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
-    else         OSX_ARCH_OPTS="ppc,i386"
+    else         OSX_ARCH_OPTS="i386"
         if test "$wxUSE_OSX_COCOA" = 1; then
             OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
         fi
diff --git a/configure.in b/configure.in
index 9104bfc8d3..0919436ef2 100644
--- a/configure.in
+++ b/configure.in
@@ -1154,7 +1154,7 @@ if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
     if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
         OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
     else dnl Use all architectures supported
-        OSX_ARCH_OPTS="ppc,i386"
+        OSX_ARCH_OPTS="i386"
         if test "$wxUSE_OSX_COCOA" = 1; then
             OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
         fi

From 78ad6ef561b11dae26a7b5f05ca652fd6bb5f55d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 11 Mar 2018 22:02:44 +0100
Subject: [PATCH 420/916] Fix and extend persistent objects overview in the
 manual

Give the example of saving the frame geometry, which is undoubtedly the
most common use case of these classes, and simplify the existing
example with wxNotebook.
---
 docs/doxygen/overviews/persistence.h | 49 ++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/docs/doxygen/overviews/persistence.h b/docs/doxygen/overviews/persistence.h
index c055ccfc27..f6ad3e46f5 100644
--- a/docs/doxygen/overviews/persistence.h
+++ b/docs/doxygen/overviews/persistence.h
@@ -56,9 +56,10 @@ Currently the following classes are supported:
 To automatically save and restore the properties of the windows of classes
 listed above you need to:
 
--# Set a unique name for the window using wxWindow::SetName(): this step is
-   important as the name is used in the configuration file and so must be
-   unique among all windows of the same class.
+-# Set a unique name for the window by either using this name in its
+   constructor or calling wxWindow::SetName(): this step is important as the
+   name is used in the configuration file and so must be unique among all
+   windows of the same class.
 -# Call wxPersistenceManager::Register() at any moment after creating the
    window and then wxPersistenceManager::Restore() when the settings may be
    restored (which can't be always done immediately, e.g. often the window
@@ -72,8 +73,37 @@ listed above you need to:
    Otherwise the settings will be automatically saved when the control itself
    is destroyed.
 
-Example of using a notebook control which automatically remembers the last open
-page:
+A convenient wxPersistentRegisterAndRestore() helper function can be used to
+perform the first steps at once, e.g. to automatically save and restore the
+position of a @c MyFrame window in your application, you need to only do the
+following:
+
+@code
+#include <wx/persist/toplevel.h>
+
+...
+
+MyFrame::MyFrame(wxWindow* parent, ...)
+       : wxFrame(parent, ...)
+{
+    ... all the other initialization ...
+
+    // Restore the previously saved geometry, if any, and register this frame
+    // for its geometry to be saved when it is closed using the given wxConfig
+    // key name.
+    if ( !wxPersistentRegisterAndRestore(this, "my_frame_name") )
+    {
+        // Choose some custom default size for the first run -- or don't do
+        // anything at all and let the system use the default initial size.
+        SetClientSize(FromDIP(wxSize(800, 600)));
+    }
+
+    Show(true);
+}
+@endcode
+
+And here is an example of using a notebook control which automatically
+remembers the last open page without using the helper function:
 
 @code
     wxNotebook *book = new wxNotebook(parent, wxID_ANY);
@@ -81,11 +111,10 @@ page:
     book->AddPage(...);
     book->AddPage(...);
     book->AddPage(...);
-    if ( !wxPersistenceManager::RegisterAndRestore(book) )
-    {
-        // nothing was restored, so choose the default page ourselves
-        book->SetSelection(0);
-    }
+
+    // We don't check for the return value here as the first page is selected
+    // by default anyhow and we just keep this selection in this case.
+    wxPersistenceManager::Get().RegisterAndRestore(book);
 @endcode
 
 

From e5a1a29e77884c8617f1c23efb2f374743097d6f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 11 Mar 2018 14:18:28 +0100
Subject: [PATCH 421/916] Fix wxGTK build with glib < 2.32 and streamline the
 code a bit

Define g_signal_handlers_disconnect_by_data() if it's not available,
i.e. when using glib older than 2.32 where it was added, to fix the
build under old systems such as CentOS 6 broken by the changes of
8278f7b618af03ef9fdba6a9eab58f560c084961 (see #18084).

Also use it elsewhere instead of g_signal_handlers_disconnect_matched()
as it's more readable.

Closes https://github.com/wxWidgets/wxWidgets/pull/760
---
 docs/changes.txt                     | 4 ++++
 include/wx/gtk/private/gtk2-compat.h | 8 ++++++++
 src/gtk/menu.cpp                     | 6 ++----
 src/gtk/webview_webkit2.cpp          | 5 ++---
 src/gtk/window.cpp                   | 3 +--
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 73471219dd..423d79f114 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -71,6 +71,10 @@ All:
 
 - Make wxList and wxVector iterators conform to input iterator requirements.
 
+wxGTK:
+
+- Fix the build with glib < 2.32 (e.g. CentOS 6).
+
 wxMSW:
 
 - Fix hang after clearing wxTAB_TRAVERSAL style on a window with children.
diff --git a/include/wx/gtk/private/gtk2-compat.h b/include/wx/gtk/private/gtk2-compat.h
index cbdf38a392..e26938e40d 100644
--- a/include/wx/gtk/private/gtk2-compat.h
+++ b/include/wx/gtk/private/gtk2-compat.h
@@ -425,6 +425,14 @@ static inline void wx_gdk_cairo_set_source_window(cairo_t* cr, GdkWindow* window
 #define gdk_cairo_set_source_window wx_gdk_cairo_set_source_window
 #endif
 
+// ----------------------------------------------------------------------------
+// the following were introduced in Glib 2.32
+
+#ifndef g_signal_handlers_disconnect_by_data
+#define g_signal_handlers_disconnect_by_data(instance, data) \
+      g_signal_handlers_disconnect_matched ((instance), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, (data))
+#endif
+
 // ----------------------------------------------------------------------------
 // the following were introduced in GTK+ 3.0
 
diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 1b84b76807..9d164d06df 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -808,8 +808,7 @@ wxMenu::~wxMenu()
     // Destroying a menu generates a "hide" signal even if it's not shown
     // currently, so disconnect it to avoid dummy wxEVT_MENU_CLOSE events
     // generation.
-    g_signal_handlers_disconnect_matched(m_menu,
-        GSignalMatchType(G_SIGNAL_MATCH_DATA), 0, 0, NULL, NULL, this);
+    g_signal_handlers_disconnect_by_data(m_menu, this);
 
     if (m_owner)
     {
@@ -993,8 +992,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 
     GtkWidget * const mitem = item->GetMenuItem();
 
-    g_signal_handlers_disconnect_matched(mitem,
-        GSignalMatchType(G_SIGNAL_MATCH_DATA), 0, 0, NULL, NULL, item);
+    g_signal_handlers_disconnect_by_data(mitem, item);
 
 #ifdef __WXGTK3__
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
diff --git a/src/gtk/webview_webkit2.cpp b/src/gtk/webview_webkit2.cpp
index cc495dea75..81f9a9a667 100644
--- a/src/gtk/webview_webkit2.cpp
+++ b/src/gtk/webview_webkit2.cpp
@@ -589,9 +589,8 @@ wxWebViewWebKit::~wxWebViewWebKit()
     if (m_dbusServer)
     {
         g_dbus_server_stop(m_dbusServer);
-        g_signal_handlers_disconnect_matched(
-            webkit_web_context_get_default(), G_SIGNAL_MATCH_DATA,
-            0, 0, NULL, NULL, m_dbusServer);
+        g_signal_handlers_disconnect_by_data(
+            webkit_web_context_get_default(), m_dbusServer);
     }
     g_clear_object(&m_dbusServer);
     g_clear_object(&m_extension);
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 1f1c6244ec..e9397a2e42 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2675,8 +2675,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
 
 void wxWindowGTK::GTKDisconnect(void* instance)
 {
-    g_signal_handlers_disconnect_matched(instance,
-        GSignalMatchType(G_SIGNAL_MATCH_DATA), 0, 0, NULL, NULL, this);
+    g_signal_handlers_disconnect_by_data(instance, this);
 }
 
 wxWindowGTK::~wxWindowGTK()

From 05454e778c14fa579cfc87b14b8541f52c61a855 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Mon, 12 Mar 2018 10:06:23 -0700
Subject: [PATCH 422/916] Build fix for GTK+ < 2.18

Broken by 986f61f33ea
---
 include/wx/gtk/private/gtk2-compat.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/wx/gtk/private/gtk2-compat.h b/include/wx/gtk/private/gtk2-compat.h
index e26938e40d..15052403c8 100644
--- a/include/wx/gtk/private/gtk2-compat.h
+++ b/include/wx/gtk/private/gtk2-compat.h
@@ -256,6 +256,11 @@ inline void wx_gtk_widget_set_can_focus(GtkWidget *widget, gboolean can)
 }
 #define gtk_widget_set_can_focus wx_gtk_widget_set_can_focus
 
+static inline gboolean wx_gtk_widget_has_focus(GtkWidget* widget)
+{
+    return GTK_WIDGET_HAS_FOCUS(widget);
+}
+#define gtk_widget_has_focus wx_gtk_widget_has_focus
 
 inline gboolean wx_gtk_widget_get_can_default(GtkWidget *widget)
 {

From aee46e075fe646dd7953061e3e8f424b2bde99ff Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Mon, 12 Mar 2018 20:45:03 -0700
Subject: [PATCH 423/916] Build fix for GLib < 2.16

GIO did not exist before 2.16, broken by 4dfde501dfb
---
 src/gtk/mimetype.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gtk/mimetype.cpp b/src/gtk/mimetype.cpp
index 8af6b8813a..7031c1ea52 100644
--- a/src/gtk/mimetype.cpp
+++ b/src/gtk/mimetype.cpp
@@ -13,7 +13,6 @@
 
 #include "wx/gtk/mimetype.h"
 
-#include <gio/gio.h>
 #include <gtk/gtk.h>
 
 #include "wx/gtk/private/string.h"

From 5d6ba5d33554caf88920e0162dbaa144df06cf00 Mon Sep 17 00:00:00 2001
From: Max Maisel <max.maisel@posteo.de>
Date: Wed, 14 Mar 2018 16:46:49 +0100
Subject: [PATCH 424/916] wxRibbonButtonBarButton: Added SetButtonIcon()

Added new function SetButtonIcon() which modifies
button bitmaps of existing ribbon button bar buttons.
---
 include/wx/ribbon/buttonbar.h   | 12 +++++
 interface/wx/ribbon/buttonbar.h | 27 ++++++++++
 src/ribbon/buttonbar.cpp        | 89 +++++++++++++++++++++------------
 3 files changed, 96 insertions(+), 32 deletions(-)

diff --git a/include/wx/ribbon/buttonbar.h b/include/wx/ribbon/buttonbar.h
index 2f3693cb2c..ed21e55d09 100644
--- a/include/wx/ribbon/buttonbar.h
+++ b/include/wx/ribbon/buttonbar.h
@@ -139,6 +139,13 @@ public:
     virtual void EnableButton(int button_id, bool enable = true);
     virtual void ToggleButton(int button_id, bool checked);
 
+    virtual void SetButtonIcon(
+                int button_id,
+                const wxBitmap& bitmap,
+                const wxBitmap& bitmap_small = wxNullBitmap,
+                const wxBitmap& bitmap_disabled = wxNullBitmap,
+                const wxBitmap& bitmap_small_disabled = wxNullBitmap);
+
     virtual wxRibbonButtonBarButtonBase *GetActiveItem() const;
     virtual wxRibbonButtonBarButtonBase *GetHoveredItem() const;
 
@@ -172,6 +179,11 @@ protected:
     void CommonInit(long style);
     void MakeLayouts();
     bool TryCollapseLayout(wxRibbonButtonBarLayout* original, size_t first_btn, size_t* last_button);
+    void MakeBitmaps(wxRibbonButtonBarButtonBase* base,
+                     const wxBitmap& bitmap_large,
+                     const wxBitmap& bitmap_large_disabled,
+                     const wxBitmap& bitmap_small,
+                     const wxBitmap& bitmap_small_disabled);
     static wxBitmap MakeResizedBitmap(const wxBitmap& original, wxSize size);
     static wxBitmap MakeDisabledBitmap(const wxBitmap& original);
     void FetchButtonSizeInfo(wxRibbonButtonBarButtonBase* button,
diff --git a/interface/wx/ribbon/buttonbar.h b/interface/wx/ribbon/buttonbar.h
index 27ea3d46ce..b01a9af5f5 100644
--- a/interface/wx/ribbon/buttonbar.h
+++ b/interface/wx/ribbon/buttonbar.h
@@ -476,6 +476,33 @@ public:
     */
     virtual void ToggleButton(int button_id, bool checked);
 
+    /**
+        Changes the bitmap of an existing button.
+
+        @param button_id
+            ID of the button to manipulate.
+        @param bitmap
+            Large bitmap of the new button. Must be the same size as all other
+            large bitmaps used on the button bar.
+        @param bitmap_small
+            Small bitmap of the new button. If left as null, then a small
+            bitmap will be automatically generated. Must be the same size as
+            all other small bitmaps used on the button bar.
+        @param bitmap_disabled
+            Large bitmap of the new button when it is disabled. If left as
+            null, then a bitmap will be automatically generated from @a bitmap.
+        @param bitmap_small_disabled
+            Small bitmap of the new button when it is disabled. If left as
+            null, then a bitmap will be automatically generated from @a
+            bitmap_small.
+    */
+    virtual void SetButtonIcon(
+                int button_id,
+                const wxBitmap& bitmap,
+                const wxBitmap& bitmap_small = wxNullBitmap,
+                const wxBitmap& bitmap_disabled = wxNullBitmap,
+                const wxBitmap& bitmap_small_disabled = wxNullBitmap);
+
     /**
         Returns the active item of the button bar or NULL if there is none.
         The active button is the one being clicked.
diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index 4fecb0e647..8e32d63cd2 100644
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -323,38 +323,8 @@ wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
     wxRibbonButtonBarButtonBase* base = new wxRibbonButtonBarButtonBase;
     base->id = button_id;
     base->label = label;
-    base->bitmap_large = bitmap;
-    if(!base->bitmap_large.IsOk())
-    {
-        base->bitmap_large = MakeResizedBitmap(base->bitmap_small,
-            m_bitmap_size_large);
-    }
-    else if(base->bitmap_large.GetScaledSize() != m_bitmap_size_large)
-    {
-        base->bitmap_large = MakeResizedBitmap(base->bitmap_large,
-            m_bitmap_size_large);
-    }
-    base->bitmap_small = bitmap_small;
-    if(!base->bitmap_small.IsOk())
-    {
-        base->bitmap_small = MakeResizedBitmap(base->bitmap_large,
-            m_bitmap_size_small);
-    }
-    else if(base->bitmap_small.GetScaledSize() != m_bitmap_size_small)
-    {
-        base->bitmap_small = MakeResizedBitmap(base->bitmap_small,
-            m_bitmap_size_small);
-    }
-    base->bitmap_large_disabled = bitmap_disabled;
-    if(!base->bitmap_large_disabled.IsOk())
-    {
-        base->bitmap_large_disabled = MakeDisabledBitmap(base->bitmap_large);
-    }
-    base->bitmap_small_disabled = bitmap_small_disabled;
-    if(!base->bitmap_small_disabled.IsOk())
-    {
-        base->bitmap_small_disabled = MakeDisabledBitmap(base->bitmap_small);
-    }
+    MakeBitmaps(base, bitmap, bitmap_disabled,
+                bitmap_small, bitmap_small_disabled);
     base->kind = kind;
     base->help_string = help_string;
     base->state = 0;
@@ -595,6 +565,21 @@ void wxRibbonButtonBar::ToggleButton(int button_id, bool checked)
     }
 }
 
+void wxRibbonButtonBar::SetButtonIcon(
+                int button_id,
+                const wxBitmap& bitmap,
+                const wxBitmap& bitmap_small,
+                const wxBitmap& bitmap_disabled,
+                const wxBitmap& bitmap_small_disabled)
+{
+    wxRibbonButtonBarButtonBase* base = GetItemById(button_id);
+    if(base == NULL)
+        return;
+    MakeBitmaps(base, bitmap, bitmap_small,
+                bitmap_disabled, bitmap_small_disabled);
+    Refresh();
+}
+
 void wxRibbonButtonBar::SetArtProvider(wxRibbonArtProvider* art)
 {
     if(art == m_art)
@@ -997,6 +982,46 @@ bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
     return true;
 }
 
+void wxRibbonButtonBar::MakeBitmaps(wxRibbonButtonBarButtonBase* base,
+                                    const wxBitmap& bitmap_large,
+                                    const wxBitmap& bitmap_large_disabled,
+                                    const wxBitmap& bitmap_small,
+                                    const wxBitmap& bitmap_small_disabled)
+{
+    base->bitmap_large = bitmap_large;
+    if(!base->bitmap_large.IsOk())
+    {
+        base->bitmap_large = MakeResizedBitmap(base->bitmap_small,
+            m_bitmap_size_large);
+    }
+    else if(base->bitmap_large.GetScaledSize() != m_bitmap_size_large)
+    {
+        base->bitmap_large = MakeResizedBitmap(base->bitmap_large,
+            m_bitmap_size_large);
+    }
+    base->bitmap_small = bitmap_small;
+    if(!base->bitmap_small.IsOk())
+    {
+        base->bitmap_small = MakeResizedBitmap(base->bitmap_large,
+            m_bitmap_size_small);
+    }
+    else if(base->bitmap_small.GetScaledSize() != m_bitmap_size_small)
+    {
+        base->bitmap_small = MakeResizedBitmap(base->bitmap_small,
+            m_bitmap_size_small);
+    }
+    base->bitmap_large_disabled = bitmap_large_disabled;
+    if(!base->bitmap_large_disabled.IsOk())
+    {
+        base->bitmap_large_disabled = MakeDisabledBitmap(base->bitmap_large);
+    }
+    base->bitmap_small_disabled = bitmap_small_disabled;
+    if(!base->bitmap_small_disabled.IsOk())
+    {
+        base->bitmap_small_disabled = MakeDisabledBitmap(base->bitmap_small);
+    }
+}
+
 void wxRibbonButtonBar::OnMouseMove(wxMouseEvent& evt)
 {
     wxPoint cursor(evt.GetPosition());

From 7aed0e547bff49b16e2754f465d8106115ed9b2f Mon Sep 17 00:00:00 2001
From: Max Maisel <max.maisel@posteo.de>
Date: Wed, 14 Mar 2018 16:55:58 +0100
Subject: [PATCH 425/916] wxRibbonButtonBarButton: Implemented mutable lables
 and minimum label width

Added new function SetButtonText() which modifies labels of
existing ribbon button bar buttons.
The new function SetButtonTextMinWidth() is used to specify the
label width in advance so that lables can be changed without
recalculating the layout.
wxRibbonArtProvider is modified to support these operation.
---
 include/wx/ribbon/art.h         | 12 ++++++
 include/wx/ribbon/buttonbar.h   |  5 +++
 interface/wx/ribbon/art.h       | 31 ++++++++++++++++
 interface/wx/ribbon/buttonbar.h | 65 +++++++++++++++++++++++++++++++++
 src/ribbon/art_msw.cpp          | 52 +++++++++++++++++++++++++-
 src/ribbon/buttonbar.cpp        | 61 +++++++++++++++++++++++++++++--
 6 files changed, 221 insertions(+), 5 deletions(-)

diff --git a/include/wx/ribbon/art.h b/include/wx/ribbon/art.h
index 5dc3ebf2d6..ad3b3c6532 100644
--- a/include/wx/ribbon/art.h
+++ b/include/wx/ribbon/art.h
@@ -381,12 +381,18 @@ public:
                         wxRibbonButtonKind kind,
                         wxRibbonButtonBarButtonState size,
                         const wxString& label,
+                        wxCoord text_min_width,
                         wxSize bitmap_size_large,
                         wxSize bitmap_size_small,
                         wxSize* button_size,
                         wxRect* normal_region,
                         wxRect* dropdown_region) = 0;
 
+    virtual wxCoord GetButtonBarButtonTextWidth(
+                        wxDC& dc, const wxString& label,
+                        wxRibbonButtonKind kind,
+                        wxRibbonButtonBarButtonState size) = 0;
+
     virtual wxSize GetMinimisedPanelMinimumSize(
                         wxDC& dc,
                         const wxRibbonPanel* wnd,
@@ -584,12 +590,18 @@ public:
                         wxRibbonButtonKind kind,
                         wxRibbonButtonBarButtonState size,
                         const wxString& label,
+                        wxCoord text_min_width,
                         wxSize bitmap_size_large,
                         wxSize bitmap_size_small,
                         wxSize* button_size,
                         wxRect* normal_region,
                         wxRect* dropdown_region) wxOVERRIDE;
 
+    wxCoord GetButtonBarButtonTextWidth(
+                        wxDC& dc, const wxString& label,
+                        wxRibbonButtonKind kind,
+                        wxRibbonButtonBarButtonState size) wxOVERRIDE;
+
     wxSize GetMinimisedPanelMinimumSize(
                         wxDC& dc,
                         const wxRibbonPanel* wnd,
diff --git a/include/wx/ribbon/buttonbar.h b/include/wx/ribbon/buttonbar.h
index ed21e55d09..8bc27d74ef 100644
--- a/include/wx/ribbon/buttonbar.h
+++ b/include/wx/ribbon/buttonbar.h
@@ -146,6 +146,11 @@ public:
                 const wxBitmap& bitmap_disabled = wxNullBitmap,
                 const wxBitmap& bitmap_small_disabled = wxNullBitmap);
 
+    virtual void SetButtonText(int button_id, const wxString& label);
+    virtual void SetButtonTextMinWidth(int button_id,
+                int min_width_medium, int min_width_large);
+    virtual void SetButtonTextMinWidth(int button_id, const wxString& label);
+
     virtual wxRibbonButtonBarButtonBase *GetActiveItem() const;
     virtual wxRibbonButtonBarButtonBase *GetHoveredItem() const;
 
diff --git a/interface/wx/ribbon/art.h b/interface/wx/ribbon/art.h
index e22d092fea..b233eb403b 100644
--- a/interface/wx/ribbon/art.h
+++ b/interface/wx/ribbon/art.h
@@ -934,6 +934,9 @@ public:
             be returned.
         @param label
             The label of the button.
+        @param text_min_width
+            The minimum width of the button label.
+            Set this to 0 if it is not used.
         @param bitmap_size_large
             The size of all "large" bitmaps on the button bar.
         @param bitmap_size_small
@@ -953,11 +956,38 @@ public:
                         wxRibbonButtonKind kind,
                         wxRibbonButtonBarButtonState size,
                         const wxString& label,
+                        wxCoord text_min_width,
                         wxSize bitmap_size_large,
                         wxSize bitmap_size_small,
                         wxSize* button_size,
                         wxRect* normal_region,
                         wxRect* dropdown_region) = 0;
+
+    /**
+        Gets the width of the string if it is used as
+        a wxRibbonButtonBar button label.
+
+        @param dc
+            A device context to use when one is required for size calculations.
+        @param label
+            The string whose width shall be calculated.
+        @param kind
+            The kind of button.
+        @param size
+            The size-class to calculate the size for. Buttons on a button bar
+            can have three distinct sizes: wxRIBBON_BUTTONBAR_BUTTON_SMALL,
+            wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, and wxRIBBON_BUTTONBAR_BUTTON_LARGE.
+            If the requested size-class is not applicable, then NULL should
+            be returned.
+
+        @return Width of the given label text in pixel.
+
+        @note This function only works with single-line strings.
+    */
+    virtual wxCoord GetButtonBarButtonTextWidth(
+                        wxDC& dc, const wxString& label,
+                        wxRibbonButtonKind kind,
+                        wxRibbonButtonBarButtonState size) = 0;
     
     /**
         Calculate the size of a minimised ribbon panel.
@@ -1208,6 +1238,7 @@ public:
                         wxRibbonButtonKind kind,
                         wxRibbonButtonBarButtonState size,
                         const wxString& label,
+                        wxCoord text_min_width,
                         wxSize bitmap_size_large,
                         wxSize bitmap_size_small,
                         wxSize* button_size,
diff --git a/interface/wx/ribbon/buttonbar.h b/interface/wx/ribbon/buttonbar.h
index b01a9af5f5..a0e95396af 100644
--- a/interface/wx/ribbon/buttonbar.h
+++ b/interface/wx/ribbon/buttonbar.h
@@ -503,6 +503,71 @@ public:
                 const wxBitmap& bitmap_disabled = wxNullBitmap,
                 const wxBitmap& bitmap_small_disabled = wxNullBitmap);
 
+    /**
+        Changes the label text of an existing button.
+
+        @param button_id
+            ID of the button to manipulate.
+        @param label
+            New label of the button.
+
+        @remarks
+            If text size has changed, Realize() must be called
+            on the top level wxRibbonBar object to recalculate panel sizes.
+            Use SetButtonTextMinWidth() to avoid calling Realize()
+            after every change.
+
+        @see SetButtonTextMinWidth
+    */
+    virtual void SetButtonText(int button_id, const wxString& label);
+
+    /**
+        Sets the minimum width of the button label, to indicate to
+        the wxRibbonArtProvider layout mechanism that this is the
+        minimum required size.
+
+        You have to call Realize() after calling this function to
+        apply the given minimum width.
+
+        @param button_id
+            ID of the button to manipulate.
+        @param min_width_medium
+            Requested minimum width of the button text in pixel
+            if the button is medium size.
+        @param min_width_medium
+            Requested minimum width of the button text in pixel
+            if the button is large size.
+
+        @remarks
+            This function is used together with SetButtonText() to change
+            button labels on the fly without modifying the button bar layout.
+
+        @see SetButtonText()
+    */
+    virtual void SetButtonTextMinWidth(int button_id,
+                int min_width_medium, int min_width_large);
+
+    /**
+        Sets the minimum width of the button label, to indicate to
+        the wxRibbonArtProvider layout mechanism that this is the
+        minimum required size.
+
+        You have to call Realize() after calling this function to
+        apply the given minimum width.
+
+        @param button_id
+            ID of the button to manipulate.
+        @param label
+            The minimum width is set to the width of this label.
+
+        @remarks
+            This function is used together with SetButtonText() to change
+            button labels on the fly without modifying the button bar layout.
+
+        @see SetButtonText()
+    */
+    virtual void SetButtonTextMinWidth(int button_id, const wxString& label);
+
     /**
         Returns the active item of the button bar or NULL if there is none.
         The active button is the one being clicked.
diff --git a/src/ribbon/art_msw.cpp b/src/ribbon/art_msw.cpp
index 2baddeef67..f2a85811cd 100644
--- a/src/ribbon/art_msw.cpp
+++ b/src/ribbon/art_msw.cpp
@@ -3036,6 +3036,7 @@ bool wxRibbonMSWArtProvider::GetButtonBarButtonSize(
                         wxRibbonButtonKind kind,
                         wxRibbonButtonBarButtonState size,
                         const wxString& label,
+                        wxCoord text_min_width,
                         wxSize bitmap_size_large,
                         wxSize bitmap_size_small,
                         wxSize* button_size,
@@ -3074,9 +3075,11 @@ bool wxRibbonMSWArtProvider::GetButtonBarButtonSize(
         // Small bitmap, with label to the right
         {
             GetButtonBarButtonSize(dc, wnd, kind, wxRIBBON_BUTTONBAR_BUTTON_SMALL,
-                label, bitmap_size_large, bitmap_size_small, button_size,
-                normal_region, dropdown_region);
+                label, text_min_width, bitmap_size_large, bitmap_size_small,
+                button_size, normal_region, dropdown_region);
             int text_size = dc.GetTextExtent(label).GetWidth();
+            if(text_size < text_min_width)
+                text_size = text_min_width;
             button_size->SetWidth(button_size->GetWidth() + text_size);
             switch(kind)
             {
@@ -3101,6 +3104,8 @@ bool wxRibbonMSWArtProvider::GetButtonBarButtonSize(
             wxCoord label_height;
             wxCoord best_width;
             dc.GetTextExtent(label, &best_width, &label_height);
+            if(best_width < text_min_width)
+                best_width = text_min_width;
             int last_line_extra_width = 0;
             if(kind != wxRIBBON_BUTTON_NORMAL && kind != wxRIBBON_BUTTON_TOGGLE)
             {
@@ -3114,6 +3119,8 @@ bool wxRibbonMSWArtProvider::GetButtonBarButtonSize(
                     int width = wxMax(
                         dc.GetTextExtent(label.Left(i)).GetWidth(),
                         dc.GetTextExtent(label.Mid(i + 1)).GetWidth() + last_line_extra_width);
+                    if(best_width < text_min_width)
+                        best_width = text_min_width;
                     if(width < best_width)
                     {
                         best_width = width;
@@ -3149,6 +3156,47 @@ bool wxRibbonMSWArtProvider::GetButtonBarButtonSize(
     return true;
 }
 
+wxCoord wxRibbonMSWArtProvider::GetButtonBarButtonTextWidth(
+                        wxDC& dc, const wxString& label,
+                        wxRibbonButtonKind kind,
+                        wxRibbonButtonBarButtonState size)
+{
+    wxCoord best_width = 0;
+    dc.SetFont(m_button_bar_label_font);
+
+    if((size & wxRIBBON_BUTTONBAR_BUTTON_SIZE_MASK)
+       == wxRIBBON_BUTTONBAR_BUTTON_LARGE)
+    {
+        best_width = dc.GetTextExtent(label).GetWidth();
+        int last_line_extra_width = 0;
+        if(kind != wxRIBBON_BUTTON_NORMAL && kind != wxRIBBON_BUTTON_TOGGLE)
+        {
+            last_line_extra_width += 8;
+        }
+        size_t i;
+        for(i = 0; i < label.Len(); ++i)
+        {
+            if(wxRibbonCanLabelBreakAtPosition(label, i))
+            {
+                int width = wxMax(
+                    dc.GetTextExtent(label.Left(i)).GetWidth(),
+                    dc.GetTextExtent(label.Mid(i + 1)).GetWidth() + last_line_extra_width);
+                if(width < best_width)
+                {
+                    best_width = width;
+                }
+            }
+        }
+    }
+    else if((size & wxRIBBON_BUTTONBAR_BUTTON_SIZE_MASK)
+       == wxRIBBON_BUTTONBAR_BUTTON_MEDIUM)
+    {
+        best_width = dc.GetTextExtent(label).GetWidth();
+    }
+
+    return best_width;
+}
+
 wxSize wxRibbonMSWArtProvider::GetMinimisedPanelMinimumSize(
                         wxDC& dc,
                         const wxRibbonPanel* wnd,
diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index 8e32d63cd2..5b18727d07 100644
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -118,6 +118,7 @@ public:
     wxBitmap bitmap_large_disabled;
     wxBitmap bitmap_small;
     wxBitmap bitmap_small_disabled;
+    wxCoord text_min_width[3];
     wxRibbonButtonBarButtonSizeInfo sizes[3];
     wxClientDataContainer client_data;
     int id;
@@ -328,6 +329,9 @@ wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
     base->kind = kind;
     base->help_string = help_string;
     base->state = 0;
+    base->text_min_width[0] = 0;
+    base->text_min_width[1] = 0;
+    base->text_min_width[2] = 0;
 
     wxClientDC temp_dc(this);
     FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);
@@ -427,9 +431,9 @@ void wxRibbonButtonBar::FetchButtonSizeInfo(wxRibbonButtonBarButtonBase* button,
     if(m_art)
     {
         info.is_supported = m_art->GetButtonBarButtonSize(dc, this,
-            button->kind, size, button->label, m_bitmap_size_large,
-            m_bitmap_size_small, &info.size, &info.normal_region,
-            &info.dropdown_region);
+            button->kind, size, button->label, button->text_min_width[size],
+            m_bitmap_size_large, m_bitmap_size_small, &info.size,
+            &info.normal_region, &info.dropdown_region);
     }
     else
         info.is_supported = false;
@@ -580,6 +584,57 @@ void wxRibbonButtonBar::SetButtonIcon(
     Refresh();
 }
 
+void wxRibbonButtonBar::SetButtonText(int button_id, const wxString& label)
+{
+    wxRibbonButtonBarButtonBase* base = GetItemById(button_id);
+    if(base == NULL)
+        return;
+    base->label = label;
+
+    wxClientDC temp_dc(this);
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, temp_dc);
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_LARGE, temp_dc);
+    m_layouts_valid = false;
+    Refresh();
+}
+
+void wxRibbonButtonBar::SetButtonTextMinWidth(int button_id,
+                int min_width_medium, int min_width_large)
+{
+    wxRibbonButtonBarButtonBase* base = GetItemById(button_id);
+    if(base == NULL)
+        return;
+    base->text_min_width[0] = 0;
+    base->text_min_width[1] = min_width_medium;
+    base->text_min_width[2] = min_width_large;
+    wxClientDC temp_dc(this);
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, temp_dc);
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_LARGE, temp_dc);
+    m_layouts_valid = false;
+}
+
+void wxRibbonButtonBar::SetButtonTextMinWidth(
+                int button_id, const wxString& label)
+{
+    wxRibbonButtonBarButtonBase* base = GetItemById(button_id);
+    if(base == NULL)
+        return;
+    wxClientDC temp_dc(this);
+    base->text_min_width[wxRIBBON_BUTTONBAR_BUTTON_MEDIUM] =
+        m_art->GetButtonBarButtonTextWidth(
+        temp_dc, label, base->kind, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
+    base->text_min_width[wxRIBBON_BUTTONBAR_BUTTON_LARGE] =
+        m_art->GetButtonBarButtonTextWidth(
+        temp_dc, label, base->kind, wxRIBBON_BUTTONBAR_BUTTON_LARGE);
+
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, temp_dc);
+    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_LARGE, temp_dc);
+    m_layouts_valid = false;
+}
+
 void wxRibbonButtonBar::SetArtProvider(wxRibbonArtProvider* art)
 {
     if(art == m_art)

From 655f9c7c4e9f47b50f9c5154aa72fa294c2b01bd Mon Sep 17 00:00:00 2001
From: David Howland <dhowland@gmail.com>
Date: Thu, 15 Mar 2018 17:46:57 -0400
Subject: [PATCH 426/916] Fix wxID_SAVEAS label to meet design guidelines

This bug was introduced way back in Aug 2011 by
73d1308b85df21aa1d69b74a37c4f88c53fe661f

This fixes the code to match the exsiting documentation in
docs/doxygen/mainpages/const_stockitems.h
---
 src/common/stockitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 900a77eb84..763a403d87 100644
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -188,7 +188,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
         STOCKITEM(wxID_REPLACE,             _("Rep&lace"),            _("Replace"));
         STOCKITEM(wxID_REVERT_TO_SAVED,     _("Revert to Saved"),     _("Revert to Saved"));
         STOCKITEM(wxID_SAVE,                _("&Save"),               _("Save"));
-        STOCKITEM(wxID_SAVEAS,              _("&Save as"),            _("Save as"));
+        STOCKITEM(wxID_SAVEAS,              _("Save &as..."),         _("Save as..."));
         STOCKITEM(wxID_SELECTALL,           _("Select &All"),         _("Select All"));
         STOCKITEM(wxID_SELECT_COLOR,        _("&Color"),              _("Color"));
         STOCKITEM(wxID_SELECT_FONT,         _("&Font"),               _("Font"));

From e733c5ce75db5a64ac3245b130e84ff23dda9a25 Mon Sep 17 00:00:00 2001
From: David Howland <dhowland@gmail.com>
Date: Fri, 16 Mar 2018 08:29:45 -0400
Subject: [PATCH 427/916] Use more aesthetic "Save As..."

---
 src/common/stockitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 763a403d87..967b1383ed 100644
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -188,7 +188,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
         STOCKITEM(wxID_REPLACE,             _("Rep&lace"),            _("Replace"));
         STOCKITEM(wxID_REVERT_TO_SAVED,     _("Revert to Saved"),     _("Revert to Saved"));
         STOCKITEM(wxID_SAVE,                _("&Save"),               _("Save"));
-        STOCKITEM(wxID_SAVEAS,              _("Save &as..."),         _("Save as..."));
+        STOCKITEM(wxID_SAVEAS,              _("Save &As..."),         _("Save As..."));
         STOCKITEM(wxID_SELECTALL,           _("Select &All"),         _("Select All"));
         STOCKITEM(wxID_SELECT_COLOR,        _("&Color"),              _("Color"));
         STOCKITEM(wxID_SELECT_FONT,         _("&Font"),               _("Font"));

From 1f30c8ccc92c1c2cb807b6d3c8edf0861f400458 Mon Sep 17 00:00:00 2001
From: David Howland <dhowland@gmail.com>
Date: Fri, 16 Mar 2018 10:26:56 -0400
Subject: [PATCH 428/916] Bring stock Find and Replace in line with standards

Find and Replace would typically require user input to receive the
search string from the user, therefore their labels should end with an
elipsis.  Also, these functions operate on documents, not selections.
Finally, Ctrl-H is the commonly used shortcut for Replace, rather than
Help (which is usually F1)
---
 docs/doxygen/mainpages/const_stockitems.h |  4 ++--
 src/common/stockitem.cpp                  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/doxygen/mainpages/const_stockitems.h b/docs/doxygen/mainpages/const_stockitems.h
index 0e3c33b6b9..0733eb03de 100644
--- a/docs/doxygen/mainpages/const_stockitems.h
+++ b/docs/doxygen/mainpages/const_stockitems.h
@@ -39,7 +39,7 @@ Also note that you can retrieve stock bitmaps using wxArtProvider.
 @stock{wxID_EXECUTE,execute,&Execute}
 @stock{wxID_EXIT,quit,&Quit}
 @stock{wxID_FILE,file,&File}
-@stock{wxID_FIND,find,&Find}
+@stock{wxID_FIND,find,&Find...}
 @stock{wxID_FIRST,goto-first-ltr,&First}
 @stock{wxID_FLOPPY,floppy,&Floppy}
 @stock{wxID_FORWARD,go-forward-ltr,&Forward}
@@ -69,7 +69,7 @@ Also note that you can retrieve stock bitmaps using wxArtProvider.
 @stock{wxID_REDO,redo-ltr,&Redo}
 @stock{wxID_REFRESH,refresh,Refresh}
 @stock{wxID_REMOVE,remove,Remove}
-@stock{wxID_REPLACE,find-and-replace,Rep&lace}
+@stock{wxID_REPLACE,find-and-replace,Rep&lace...}
 @stock{wxID_REVERT_TO_SAVED,revert-to-saved-ltr,Revert to Saved}
 @stock{wxID_SAVE,save,&Save}
 @stock{wxID_SAVEAS,save-as,Save &As...}
diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 967b1383ed..0498cf3c36 100644
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -155,7 +155,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
         STOCKITEM(wxID_EXECUTE,             _("&Execute"),            _("Execute"));
         STOCKITEM(wxID_EXIT,                _("&Quit"),               _("Quit"));
         STOCKITEM(wxID_FILE,                _("&File"),               _("File"));
-        STOCKITEM(wxID_FIND,                _("&Find"),               _("Find"));
+        STOCKITEM(wxID_FIND,                _("&Find..."),            _("Find..."));
         STOCKITEM(wxID_FIRST,               _("&First"),              _("First"));
         STOCKITEM(wxID_FLOPPY,              _("&Floppy"),             _("Floppy"));
         STOCKITEM(wxID_FORWARD,             _("&Forward"),            _("Forward"));
@@ -185,7 +185,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
         STOCKITEM(wxID_REDO,                _("&Redo"),               _("Redo"));
         STOCKITEM(wxID_REFRESH,             _("Refresh"),             _("Refresh"));
         STOCKITEM(wxID_REMOVE,              _("Remove"),              _("Remove"));
-        STOCKITEM(wxID_REPLACE,             _("Rep&lace"),            _("Replace"));
+        STOCKITEM(wxID_REPLACE,             _("Rep&lace..."),         _("Replace..."));
         STOCKITEM(wxID_REVERT_TO_SAVED,     _("Revert to Saved"),     _("Revert to Saved"));
         STOCKITEM(wxID_SAVE,                _("&Save"),               _("Save"));
         STOCKITEM(wxID_SAVEAS,              _("Save &As..."),         _("Save As..."));
@@ -258,7 +258,8 @@ wxString wxGetStockHelpString(wxWindowID id, wxStockHelpStringClient client)
         STOCKITEM(wxID_COPY,     wxSTOCK_MENU, _("Copy selection"))
         STOCKITEM(wxID_CUT,      wxSTOCK_MENU, _("Cut selection"))
         STOCKITEM(wxID_DELETE,   wxSTOCK_MENU, _("Delete selection"))
-        STOCKITEM(wxID_REPLACE,  wxSTOCK_MENU, _("Replace selection"))
+        STOCKITEM(wxID_FIND,     wxSTOCK_MENU, _("Find in document"))
+        STOCKITEM(wxID_REPLACE,  wxSTOCK_MENU, _("Find and replace in document"))
         STOCKITEM(wxID_PASTE,    wxSTOCK_MENU, _("Paste selection"))
         STOCKITEM(wxID_EXIT,     wxSTOCK_MENU, _("Quit this program"))
         STOCKITEM(wxID_REDO,     wxSTOCK_MENU, _("Redo last action"))
@@ -293,13 +294,12 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
         STOCKITEM(wxID_COPY,                wxACCEL_CTRL,'C')
         STOCKITEM(wxID_CUT,                 wxACCEL_CTRL,'X')
         STOCKITEM(wxID_FIND,                wxACCEL_CTRL,'F')
-        STOCKITEM(wxID_HELP,                wxACCEL_CTRL,'H')
         STOCKITEM(wxID_NEW,                 wxACCEL_CTRL,'N')
         STOCKITEM(wxID_OPEN,                wxACCEL_CTRL,'O')
         STOCKITEM(wxID_PASTE,               wxACCEL_CTRL,'V')
         STOCKITEM(wxID_PRINT,               wxACCEL_CTRL,'P')
         STOCKITEM(wxID_REDO,                wxACCEL_CTRL | wxACCEL_SHIFT,'Z')
-        STOCKITEM(wxID_REPLACE,             wxACCEL_CTRL,'R')
+        STOCKITEM(wxID_REPLACE,             wxACCEL_CTRL,'H')
         STOCKITEM(wxID_SAVE,                wxACCEL_CTRL,'S')
         STOCKITEM(wxID_SELECTALL,           wxACCEL_CTRL,'A')
         STOCKITEM(wxID_UNDO,                wxACCEL_CTRL,'Z')

From c841e78083d3ef201c7b461ddda10c5956a38f6a Mon Sep 17 00:00:00 2001
From: David Howland <dhowland@gmail.com>
Date: Fri, 16 Mar 2018 10:52:28 -0400
Subject: [PATCH 429/916] Fill out help strings for menu items

---
 src/common/stockitem.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 0498cf3c36..399e998342 100644
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -264,6 +264,8 @@ wxString wxGetStockHelpString(wxWindowID id, wxStockHelpStringClient client)
         STOCKITEM(wxID_EXIT,     wxSTOCK_MENU, _("Quit this program"))
         STOCKITEM(wxID_REDO,     wxSTOCK_MENU, _("Redo last action"))
         STOCKITEM(wxID_UNDO,     wxSTOCK_MENU, _("Undo last action"))
+        STOCKITEM(wxID_NEW,      wxSTOCK_MENU, _("Create new document"))
+        STOCKITEM(wxID_OPEN,     wxSTOCK_MENU, _("Open an existing document"))
         STOCKITEM(wxID_CLOSE,    wxSTOCK_MENU, _("Close current document"))
         STOCKITEM(wxID_SAVE,     wxSTOCK_MENU, _("Save current document"))
         STOCKITEM(wxID_SAVEAS,   wxSTOCK_MENU, _("Save current document with a different filename"))

From b97ea90f4fe1a1635bb51f233bab780d7f2f77e0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Mar 2018 17:17:05 +0100
Subject: [PATCH 430/916] Add default value for MakeConfigFileName() 2nd
 argument

Make it possible to call wxStandardPaths::MakeConfigFileName() without
explicitly specifying the convention to use, to make it conform to the
documentation (previously this only worked when calling the
wxStandardPathsBase version of the method).

Closes #18106.
---
 include/wx/msw/stdpaths.h       | 3 ++-
 include/wx/osx/cocoa/stdpaths.h | 3 ++-
 include/wx/stdpaths.h           | 9 ++++++---
 include/wx/unix/stdpaths.h      | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/wx/msw/stdpaths.h b/include/wx/msw/stdpaths.h
index 3f733bc67f..154ab40e97 100644
--- a/include/wx/msw/stdpaths.h
+++ b/include/wx/msw/stdpaths.h
@@ -30,7 +30,8 @@ public:
     virtual wxString GetPluginsDir() const wxOVERRIDE;
     virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
     virtual wxString MakeConfigFileName(const wxString& basename,
-                                        ConfigFileConv conv) const wxOVERRIDE;
+                                        ConfigFileConv conv = ConfigFileConv_Ext
+                                        ) const wxOVERRIDE;
 
 
     // MSW-specific methods
diff --git a/include/wx/osx/cocoa/stdpaths.h b/include/wx/osx/cocoa/stdpaths.h
index c77713da12..1500c88dc9 100644
--- a/include/wx/osx/cocoa/stdpaths.h
+++ b/include/wx/osx/cocoa/stdpaths.h
@@ -33,7 +33,8 @@ public:
                              ResourceCat category = ResourceCat_None) const wxOVERRIDE;
     virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
     virtual wxString MakeConfigFileName(const wxString& basename,
-                                        ConfigFileConv conv) const wxOVERRIDE;
+                                        ConfigFileConv conv = ConfigFileConv_Ext
+                                        ) const wxOVERRIDE;
 
 protected:
     // Ctor is protected, use wxStandardPaths::Get() instead of instantiating
diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index bbb5b72dcd..e7ce24bec4 100644
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -252,9 +252,12 @@ public:
     virtual wxString GetUserDataDir() const { return m_prefix; }
     virtual wxString GetPluginsDir() const { return m_prefix; }
     virtual wxString GetUserDir(Dir WXUNUSED(userDir)) const { return m_prefix; }
-    virtual wxString MakeConfigFileName(const wxString& basename,
-                                        ConfigFileConv WXUNUSED(conv)) const
-                         { return m_prefix + wxS("/") + basename; }
+    virtual wxString
+    MakeConfigFileName(const wxString& basename,
+                       ConfigFileConv WXUNUSED(conv) = ConfigFileConv_Ext) const
+    {
+        return m_prefix + wxS("/") + basename;
+    }
 
 protected:
     // Ctor is protected because wxStandardPaths::Get() should always be used
diff --git a/include/wx/unix/stdpaths.h b/include/wx/unix/stdpaths.h
index e67d9c6ea2..c6400326d4 100644
--- a/include/wx/unix/stdpaths.h
+++ b/include/wx/unix/stdpaths.h
@@ -50,7 +50,8 @@ public:
     virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
 #endif
     virtual wxString MakeConfigFileName(const wxString& basename,
-                                        ConfigFileConv conv) const wxOVERRIDE;
+                                        ConfigFileConv conv = ConfigFileConv_Ext
+                                        ) const wxOVERRIDE;
 
 protected:
     // Ctor is protected, use wxStandardPaths::Get() instead of instantiating

From 0acb119ccbefe1c5f8ba08a290cf0f58b6e79acd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Mar 2018 17:24:07 +0100
Subject: [PATCH 431/916] Remove unnecessary empty dtors from the widgets
 sample

No real changes, just remove completely unnecessary lines and trailing
semicolons after them.
---
 samples/widgets/button.cpp     | 1 -
 samples/widgets/checkbox.cpp   | 1 -
 samples/widgets/clrpicker.cpp  | 1 -
 samples/widgets/datepick.cpp   | 1 -
 samples/widgets/dirpicker.cpp  | 1 -
 samples/widgets/filepicker.cpp | 1 -
 samples/widgets/fontpicker.cpp | 1 -
 samples/widgets/radiobox.cpp   | 1 -
 samples/widgets/slider.cpp     | 1 -
 samples/widgets/spinbtn.cpp    | 1 -
 samples/widgets/static.cpp     | 1 -
 samples/widgets/textctrl.cpp   | 1 -
 samples/widgets/timepick.cpp   | 1 -
 samples/widgets/toggle.cpp     | 1 -
 14 files changed, 14 deletions(-)

diff --git a/samples/widgets/button.cpp b/samples/widgets/button.cpp
index 6f2dc125af..54bb5db6e5 100644
--- a/samples/widgets/button.cpp
+++ b/samples/widgets/button.cpp
@@ -89,7 +89,6 @@ class ButtonWidgetsPage : public WidgetsPage
 {
 public:
     ButtonWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~ButtonWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_button; }
     virtual void RecreateWidget() wxOVERRIDE { CreateButton(); }
diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp
index ba884b1f32..09b21b6238 100644
--- a/samples/widgets/checkbox.cpp
+++ b/samples/widgets/checkbox.cpp
@@ -73,7 +73,6 @@ class CheckBoxWidgetsPage : public WidgetsPage
 {
 public:
     CheckBoxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~CheckBoxWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_checkbox; }
     virtual void RecreateWidget() wxOVERRIDE { CreateCheckbox(); }
diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp
index 89f0125a98..1ce4e6bf7f 100644
--- a/samples/widgets/clrpicker.cpp
+++ b/samples/widgets/clrpicker.cpp
@@ -63,7 +63,6 @@ class ColourPickerWidgetsPage : public WidgetsPage
 {
 public:
     ColourPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~ColourPickerWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_clrPicker; }
     virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
diff --git a/samples/widgets/datepick.cpp b/samples/widgets/datepick.cpp
index 0f4ca9cf36..d4c3619d91 100644
--- a/samples/widgets/datepick.cpp
+++ b/samples/widgets/datepick.cpp
@@ -68,7 +68,6 @@ class DatePickerWidgetsPage : public WidgetsPage
 {
 public:
     DatePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~DatePickerWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_datePicker; }
     virtual void RecreateWidget() wxOVERRIDE { CreateDatePicker(); }
diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp
index 6f4849b804..6173bf297e 100644
--- a/samples/widgets/dirpicker.cpp
+++ b/samples/widgets/dirpicker.cpp
@@ -65,7 +65,6 @@ class DirPickerWidgetsPage : public WidgetsPage
 {
 public:
     DirPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~DirPickerWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_dirPicker; }
     virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp
index 23c4d4b047..8948a8bb1b 100644
--- a/samples/widgets/filepicker.cpp
+++ b/samples/widgets/filepicker.cpp
@@ -72,7 +72,6 @@ class FilePickerWidgetsPage : public WidgetsPage
 {
 public:
     FilePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~FilePickerWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_filePicker; }
     virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp
index 8121ae6eb7..4ca5add712 100644
--- a/samples/widgets/fontpicker.cpp
+++ b/samples/widgets/fontpicker.cpp
@@ -63,7 +63,6 @@ class FontPickerWidgetsPage : public WidgetsPage
 {
 public:
     FontPickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~FontPickerWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_fontPicker; }
     virtual void RecreateWidget() wxOVERRIDE { RecreatePicker(); }
diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp
index 1becd098e8..04d5721009 100644
--- a/samples/widgets/radiobox.cpp
+++ b/samples/widgets/radiobox.cpp
@@ -83,7 +83,6 @@ class RadioWidgetsPage : public WidgetsPage
 {
 public:
     RadioWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~RadioWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_radio; }
     virtual void RecreateWidget() wxOVERRIDE { CreateRadio(); }
diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index 890e9fd73c..e5a3b454d6 100644
--- a/samples/widgets/slider.cpp
+++ b/samples/widgets/slider.cpp
@@ -94,7 +94,6 @@ class SliderWidgetsPage : public WidgetsPage
 {
 public:
     SliderWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~SliderWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_slider; }
     virtual void RecreateWidget() wxOVERRIDE { CreateSlider(); }
diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index e947ebef35..391160fff6 100644
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -84,7 +84,6 @@ class SpinBtnWidgetsPage : public WidgetsPage
 {
 public:
     SpinBtnWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~SpinBtnWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_spinbtn; }
     virtual Widgets GetWidgets() const wxOVERRIDE
diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 71b42b59b4..ed5fc8d04b 100644
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -91,7 +91,6 @@ class StaticWidgetsPage : public WidgetsPage
 {
 public:
     StaticWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~StaticWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_statText; }
     virtual Widgets GetWidgets() const wxOVERRIDE
diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index f903b8d267..d6e2d54f28 100644
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -151,7 +151,6 @@ class TextWidgetsPage : public WidgetsPage
 public:
     // ctor(s) and dtor
     TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~TextWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_text; }
     virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_text; }
diff --git a/samples/widgets/timepick.cpp b/samples/widgets/timepick.cpp
index a25ea0cba7..fe457a7603 100644
--- a/samples/widgets/timepick.cpp
+++ b/samples/widgets/timepick.cpp
@@ -64,7 +64,6 @@ class TimePickerWidgetsPage : public WidgetsPage
 {
 public:
     TimePickerWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~TimePickerWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_timePicker; }
     virtual void RecreateWidget() wxOVERRIDE { CreateTimePicker(); }
diff --git a/samples/widgets/toggle.cpp b/samples/widgets/toggle.cpp
index 6ac8c99850..1bbdcab0ef 100644
--- a/samples/widgets/toggle.cpp
+++ b/samples/widgets/toggle.cpp
@@ -87,7 +87,6 @@ class ToggleWidgetsPage : public WidgetsPage
 {
 public:
     ToggleWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~ToggleWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_toggle; }
     virtual void RecreateWidget() wxOVERRIDE { CreateToggle(); }

From 7e8fb1e29417fc0a7e36832c3c335293b5c150c0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Mar 2018 17:50:56 +0100
Subject: [PATCH 432/916] Use border style consistently in the widgets sample

Use GetAttrs().m_defaultFlags everywhere when creating the widgets, it
was done for some but not all of them before, without any apparent
reason.

This should make setting various border styles work (for the widgets
supporting them).
---
 samples/widgets/clrpicker.cpp  | 16 ++++------------
 samples/widgets/datepick.cpp   |  2 +-
 samples/widgets/dirctrl.cpp    | 21 +++++++++++++++------
 samples/widgets/dirpicker.cpp  | 18 +++++-------------
 samples/widgets/editlbox.cpp   |  2 +-
 samples/widgets/filectrl.cpp   | 13 ++++++++-----
 samples/widgets/filepicker.cpp | 22 +++++++---------------
 samples/widgets/fontpicker.cpp | 20 ++++++--------------
 samples/widgets/hyperlnk.cpp   | 21 ++++++++++++++++-----
 samples/widgets/searchctrl.cpp |  3 +--
 samples/widgets/statbmp.cpp    | 15 +++++++++++++--
 samples/widgets/timepick.cpp   |  6 +++++-
 samples/widgets/widgets.h      |  2 +-
 13 files changed, 83 insertions(+), 78 deletions(-)

diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp
index 1ce4e6bf7f..eff222e606 100644
--- a/samples/widgets/clrpicker.cpp
+++ b/samples/widgets/clrpicker.cpp
@@ -81,9 +81,6 @@ protected:
     // restore the checkboxes state to the initial values
     void Reset();
 
-    // get the initial style for the picker of the given kind
-    long GetPickerStyle();
-
 
     void OnColourChange(wxColourPickerEvent &ev);
     void OnCheckBox(wxCommandEvent &ev);
@@ -175,14 +172,7 @@ void ColourPickerWidgetsPage::CreatePicker()
 {
     delete m_clrPicker;
 
-    m_clrPicker = new wxColourPickerCtrl(this, PickerPage_Colour, *wxRED,
-                                            wxDefaultPosition, wxDefaultSize,
-                                            GetPickerStyle());
-}
-
-long ColourPickerWidgetsPage::GetPickerStyle()
-{
-    long style = 0;
+    long style = GetAttrs().m_defaultFlags;
 
     if ( m_chkColourTextCtrl->GetValue() )
         style |= wxCLRP_USE_TEXTCTRL;
@@ -193,7 +183,9 @@ long ColourPickerWidgetsPage::GetPickerStyle()
     if ( m_chkColourShowAlpha->GetValue() )
         style |= wxCLRP_SHOW_ALPHA;
 
-    return style;
+    m_clrPicker = new wxColourPickerCtrl(this, PickerPage_Colour, *wxRED,
+                                         wxDefaultPosition, wxDefaultSize,
+                                         style);
 }
 
 void ColourPickerWidgetsPage::RecreatePicker()
diff --git a/samples/widgets/datepick.cpp b/samples/widgets/datepick.cpp
index d4c3619d91..88dd3c8bea 100644
--- a/samples/widgets/datepick.cpp
+++ b/samples/widgets/datepick.cpp
@@ -243,7 +243,7 @@ void DatePickerWidgetsPage::CreateDatePicker()
 
     delete m_datePicker;
 
-    long style = 0;
+    long style = GetAttrs().m_defaultFlags;
     switch ( m_radioKind->GetSelection() )
     {
         case 0:
diff --git a/samples/widgets/dirctrl.cpp b/samples/widgets/dirctrl.cpp
index c9a4640229..5944a62ff0 100644
--- a/samples/widgets/dirctrl.cpp
+++ b/samples/widgets/dirctrl.cpp
@@ -246,18 +246,27 @@ void DirCtrlWidgetsPage::CreateDirCtrl()
 {
     wxWindowUpdateLocker noUpdates(this);
 
+    long style = GetAttrs().m_defaultFlags;
+    if ( m_chkDirOnly->IsChecked() )
+        style |= wxDIRCTRL_DIR_ONLY;
+    if ( m_chk3D->IsChecked() )
+        style |= wxDIRCTRL_3D_INTERNAL;
+    if ( m_chkFirst->IsChecked() )
+        style |= wxDIRCTRL_SELECT_FIRST;
+    if ( m_chkFilters->IsChecked() )
+        style |= wxDIRCTRL_SHOW_FILTERS;
+    if ( m_chkLabels->IsChecked() )
+        style |= wxDIRCTRL_EDIT_LABELS;
+    if ( m_chkMulti->IsChecked() )
+        style |= wxDIRCTRL_MULTIPLE;
+
     wxGenericDirCtrl *dirCtrl = new wxGenericDirCtrl(
         this,
         DirCtrlPage_Ctrl,
         wxDirDialogDefaultFolderStr,
         wxDefaultPosition,
         wxDefaultSize,
-        ( m_chkDirOnly->IsChecked() ? wxDIRCTRL_DIR_ONLY : 0 ) |
-        ( m_chk3D->IsChecked() ? wxDIRCTRL_3D_INTERNAL : 0 ) |
-        ( m_chkFirst->IsChecked() ? wxDIRCTRL_SELECT_FIRST : 0 ) |
-        ( m_chkFilters->IsChecked() ? wxDIRCTRL_SHOW_FILTERS : 0 ) |
-        ( m_chkLabels->IsChecked() ? wxDIRCTRL_EDIT_LABELS : 0 ) |
-        ( m_chkMulti->IsChecked() ? wxDIRCTRL_MULTIPLE : 0)
+        style
     );
 
     wxString filter;
diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp
index 6173bf297e..ab4a9b5cd1 100644
--- a/samples/widgets/dirpicker.cpp
+++ b/samples/widgets/dirpicker.cpp
@@ -83,9 +83,6 @@ protected:
     // restore the checkboxes state to the initial values
     void Reset();
 
-    // get the initial style for the picker of the given kind
-    long GetPickerStyle();
-
 
     void OnDirChange(wxFileDirPickerEvent &ev);
     void OnCheckBox(wxCommandEvent &ev);
@@ -194,15 +191,7 @@ void DirPickerWidgetsPage::CreatePicker()
 {
     delete m_dirPicker;
 
-    m_dirPicker = new wxDirPickerCtrl(this, PickerPage_Dir,
-                                        wxGetHomeDir(), wxT("Hello!"),
-                                        wxDefaultPosition, wxDefaultSize,
-                                        GetPickerStyle());
-}
-
-long DirPickerWidgetsPage::GetPickerStyle()
-{
-    long style = 0;
+    long style = GetAttrs().m_defaultFlags;
 
     if ( m_chkDirTextCtrl->GetValue() )
         style |= wxDIRP_USE_TEXTCTRL;
@@ -216,7 +205,10 @@ long DirPickerWidgetsPage::GetPickerStyle()
     if ( m_chkSmall->GetValue() )
         style |= wxDIRP_SMALL;
 
-    return style;
+    m_dirPicker = new wxDirPickerCtrl(this, PickerPage_Dir,
+                                      wxGetHomeDir(), wxT("Hello!"),
+                                      wxDefaultPosition, wxDefaultSize,
+                                      style);
 }
 
 void DirPickerWidgetsPage::RecreatePicker()
diff --git a/samples/widgets/editlbox.cpp b/samples/widgets/editlbox.cpp
index d71aa88740..383fb981aa 100644
--- a/samples/widgets/editlbox.cpp
+++ b/samples/widgets/editlbox.cpp
@@ -178,7 +178,7 @@ void EditableListboxWidgetsPage::Reset()
 
 void EditableListboxWidgetsPage::CreateLbox()
 {
-    int flags = 0;
+    long flags = GetAttrs().m_defaultFlags;
 
     if ( m_chkAllowNew->GetValue() )
         flags |= wxEL_ALLOW_NEW;
diff --git a/samples/widgets/filectrl.cpp b/samples/widgets/filectrl.cpp
index 27d5a5bc17..9790fd78dd 100644
--- a/samples/widgets/filectrl.cpp
+++ b/samples/widgets/filectrl.cpp
@@ -227,11 +227,14 @@ void FileCtrlWidgetsPage::CreateFileCtrl()
 {
     wxWindowUpdateLocker noUpdates( this );
 
-    const int style =
-        ( m_radioFileCtrlMode->GetSelection() == FileCtrlMode_Open ?
-          wxFC_OPEN : wxFC_SAVE ) |
-        ( m_chkMultiple->IsChecked() ? wxFC_MULTIPLE : 0 ) |
-        ( m_chkNoShowHidden->IsChecked() ? wxFC_NOSHOWHIDDEN : 0 );
+    long style = GetAttrs().m_defaultFlags;
+    style |= m_radioFileCtrlMode->GetSelection() == FileCtrlMode_Open
+                ? wxFC_OPEN
+                : wxFC_SAVE;
+    if ( m_chkMultiple->IsChecked() )
+        style |= wxFC_MULTIPLE;
+    if ( m_chkNoShowHidden->IsChecked() )
+        style |= wxFC_NOSHOWHIDDEN;
 
     wxFileCtrl *fileCtrl = new wxFileCtrl(
                                this,
diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp
index 8948a8bb1b..bfb0b4fca9 100644
--- a/samples/widgets/filepicker.cpp
+++ b/samples/widgets/filepicker.cpp
@@ -90,9 +90,6 @@ protected:
     // restore the checkboxes state to the initial values
     void Reset();
 
-    // get the initial style for the picker of the given kind
-    long GetPickerStyle();
-
     // update filepicker radiobox
     void UpdateFilePickerMode();
 
@@ -223,17 +220,7 @@ void FilePickerWidgetsPage::CreatePicker()
 {
     delete m_filePicker;
 
-    // pass an empty string as initial file
-    m_filePicker = new wxFilePickerCtrl(this, PickerPage_File,
-                                        wxEmptyString,
-                                        wxT("Hello!"), wxT("*"),
-                                        wxDefaultPosition, wxDefaultSize,
-                                        GetPickerStyle());
-}
-
-long FilePickerWidgetsPage::GetPickerStyle()
-{
-    long style = 0;
+    long style = GetAttrs().m_defaultFlags;
 
     if ( m_chkFileTextCtrl->GetValue() )
         style |= wxFLP_USE_TEXTCTRL;
@@ -255,7 +242,12 @@ long FilePickerWidgetsPage::GetPickerStyle()
     else
         style |= wxFLP_SAVE;
 
-    return style;
+    // pass an empty string as initial file
+    m_filePicker = new wxFilePickerCtrl(this, PickerPage_File,
+                                        wxEmptyString,
+                                        wxT("Hello!"), wxT("*"),
+                                        wxDefaultPosition, wxDefaultSize,
+                                        style);
 }
 
 void FilePickerWidgetsPage::RecreatePicker()
diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp
index 4ca5add712..6afb19ba04 100644
--- a/samples/widgets/fontpicker.cpp
+++ b/samples/widgets/fontpicker.cpp
@@ -81,9 +81,6 @@ protected:
     // restore the checkboxes state to the initial values
     void Reset();
 
-    // get the initial style for the picker of the given kind
-    long GetPickerStyle();
-
 
     void OnFontChange(wxFontPickerEvent &ev);
     void OnCheckBox(wxCommandEvent &ev);
@@ -175,15 +172,7 @@ void FontPickerWidgetsPage::CreatePicker()
 {
     delete m_fontPicker;
 
-    m_fontPicker = new wxFontPickerCtrl(this, PickerPage_Font,
-                                        *wxSWISS_FONT,
-                                        wxDefaultPosition, wxDefaultSize,
-                                        GetPickerStyle());
-}
-
-long FontPickerWidgetsPage::GetPickerStyle()
-{
-    long style = 0;
+    long style = GetAttrs().m_defaultFlags;
 
     if ( m_chkFontTextCtrl->GetValue() )
         style |= wxFNTP_USE_TEXTCTRL;
@@ -192,9 +181,12 @@ long FontPickerWidgetsPage::GetPickerStyle()
         style |= wxFNTP_USEFONT_FOR_LABEL;
 
     if ( m_chkFontDescAsLabel->GetValue() )
-            style |= wxFNTP_FONTDESC_AS_LABEL;
+        style |= wxFNTP_FONTDESC_AS_LABEL;
 
-    return style;
+    m_fontPicker = new wxFontPickerCtrl(this, PickerPage_Font,
+                                        *wxSWISS_FONT,
+                                        wxDefaultPosition, wxDefaultSize,
+                                        style);
 }
 
 void FontPickerWidgetsPage::RecreatePicker()
diff --git a/samples/widgets/hyperlnk.cpp b/samples/widgets/hyperlnk.cpp
index 96553651c1..d3d7baba44 100644
--- a/samples/widgets/hyperlnk.cpp
+++ b/samples/widgets/hyperlnk.cpp
@@ -99,7 +99,7 @@ protected:
 
     // (re)create the hyperctrl
     void CreateHyperlink();
-    void CreateHyperlinkLong(long);
+    void CreateHyperlinkLong(long align);
 
     // the controls
     // ------------
@@ -259,6 +259,9 @@ void HyperlinkWidgetsPage::CreateHyperlink()
 {
     const wxString label = m_hyperlink->GetLabel();
     const wxString url = m_hyperlink->GetURL();
+    long style = GetAttrs().m_defaultFlags;
+
+    style |= wxHL_DEFAULT_STYLE & ~wxBORDER_MASK;
 
     wxGenericHyperlinkCtrl *hyp;
     if (m_checkGeneric->IsChecked())
@@ -266,14 +269,20 @@ void HyperlinkWidgetsPage::CreateHyperlink()
         hyp = new wxGenericHyperlinkCtrl(this,
                                   HyperlinkPage_Ctrl,
                                   label,
-                                  url);
+                                  url,
+                                  wxDefaultPosition,
+                                  wxDefaultSize,
+                                  style);
     }
     else
     {
         hyp = new wxHyperlinkCtrl(this,
                                   HyperlinkPage_Ctrl,
                                   label,
-                                  url);
+                                  url,
+                                  wxDefaultPosition,
+                                  wxDefaultSize,
+                                  style);
     }
 
     // update sizer's child window
@@ -287,9 +296,11 @@ void HyperlinkWidgetsPage::CreateHyperlink()
     GetSizer()->Layout();
 }
 
-void HyperlinkWidgetsPage::CreateHyperlinkLong(long style)
+void HyperlinkWidgetsPage::CreateHyperlinkLong(long align)
 {
-    style = (wxHL_DEFAULT_STYLE & ~wxHL_ALIGN_CENTRE)|style;
+    long style = GetAttrs().m_defaultFlags;
+    style |= align;
+    style |= wxHL_DEFAULT_STYLE & ~(wxHL_ALIGN_CENTRE | wxBORDER_MASK);
 
     wxGenericHyperlinkCtrl *hyp;
     if (m_checkGeneric->IsChecked())
diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 7252ab078d..28bfbde471 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -68,7 +68,6 @@ class SearchCtrlWidgetsPage : public WidgetsPage
 {
 public:
     SearchCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
-    virtual ~SearchCtrlWidgetsPage(){};
 
     virtual wxWindow *GetWidget() const wxOVERRIDE { return m_srchCtrl; }
     virtual wxTextEntryBase *GetTextEntry() const wxOVERRIDE { return m_srchCtrl; }
@@ -176,7 +175,7 @@ void SearchCtrlWidgetsPage::CreateControl()
     if (m_srchCtrl)
         m_srchCtrl->Destroy();
 
-    int style = 0;
+    long style = GetAttrs().m_defaultFlags;
 
     m_srchCtrl = new wxSearchCtrl(this, -1, wxEmptyString, wxDefaultPosition,
                                   wxSize(150, -1), style);
diff --git a/samples/widgets/statbmp.cpp b/samples/widgets/statbmp.cpp
index a0954e6cb1..ad100b0df8 100644
--- a/samples/widgets/statbmp.cpp
+++ b/samples/widgets/statbmp.cpp
@@ -132,10 +132,21 @@ void StatBmpWidgetsPage::RecreateWidget()
         wxLogMessage("Reading image from file '%s' failed.", filepath.c_str());
         return;
     }
+
+    long style = GetAttrs().m_defaultFlags;
+
     if (m_radio->GetSelection() == 0)
-        m_statbmp = new wxStaticBitmap(this, wxID_ANY, wxBitmap(image));
+    {
+        m_statbmp = new wxStaticBitmap(this, wxID_ANY, wxBitmap(image),
+                                       wxDefaultPosition, wxDefaultSize,
+                                       style);
+    }
     else
-        m_statbmp = new wxGenericStaticBitmap(this, wxID_ANY, wxBitmap(image));
+    {
+        m_statbmp = new wxGenericStaticBitmap(this, wxID_ANY, wxBitmap(image),
+                                              wxDefaultPosition, wxDefaultSize,
+                                              style);
+    }
 
     wxStaticBitmapBase::ScaleMode scaleMode = (wxStaticBitmapBase::ScaleMode) m_scaleRadio->GetSelection();
     m_statbmp->SetScaleMode(scaleMode);
diff --git a/samples/widgets/timepick.cpp b/samples/widgets/timepick.cpp
index fe457a7603..b8c0572b9a 100644
--- a/samples/widgets/timepick.cpp
+++ b/samples/widgets/timepick.cpp
@@ -195,7 +195,11 @@ void TimePickerWidgetsPage::CreateTimePicker()
 
     delete m_timePicker;
 
-    m_timePicker = new wxTimePickerCtrl(this, TimePickerPage_Picker, value);
+    long style = GetAttrs().m_defaultFlags;
+
+    m_timePicker = new wxTimePickerCtrl(this, TimePickerPage_Picker, value,
+                                        wxDefaultPosition, wxDefaultSize,
+                                        style);
 
     m_sizerTimePicker->Add(0, 0, 1, wxCENTRE);
     m_sizerTimePicker->Add(m_timePicker, 1, wxCENTRE);
diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index 0f159ba49e..b228fe110b 100644
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -115,7 +115,7 @@ struct WidgetAttributes
     wxWindowVariant m_variant;
     wxCursor m_cursor;
     // the default flags, currently only contains border flags
-    int m_defaultFlags;
+    long m_defaultFlags;
 };
 
 class WidgetsPage : public wxPanel

From d3b722944bcdcbce9f16eafb646790a51e5d44e9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 Mar 2018 18:10:08 +0100
Subject: [PATCH 433/916] Allow creating generic wxSearchCtrl without border

Just remove the code manipulating the style from wxSearchCtrl::Create(),
there doesn't seem to be any need to force anything for "more native
appearance" as the control appears just fine by default under both wxMSW
and wxGTK without doing anything here (and is not used under macOS).

As a (desired) side effect, specifying wxBORDER_NONE now works as it's
not overridden by the control itself any more.

Closes #18105.
---
 src/generic/srchctlg.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 074bee8722..0bc04c38e0 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -300,19 +300,6 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
             const wxValidator& validator,
             const wxString& name)
 {
-    // force border style for more native appearance
-    style &= ~wxBORDER_MASK;
-#ifdef __WXGTK__
-    style |= wxBORDER_SUNKEN;
-#elif defined(__WXMSW__)
-    // Don't set the style explicitly, let GetDefaultBorder() work it out, unless
-    // we will get a sunken border (e.g. on Windows 200) in which case we must
-    // override with a simple border.
-    if (GetDefaultBorder() == wxBORDER_SUNKEN)
-        style |= wxBORDER_SIMPLE;
-#else
-    style |= wxBORDER_SIMPLE;
-#endif
     if ( !wxSearchCtrlBaseBaseClass::Create(parent, id, pos, size,
                                             style, validator, name) )
     {

From 2cbcf939df38a65d294b2a3bd775f97ec7d8e42c Mon Sep 17 00:00:00 2001
From: Max Maisel <max.maisel@posteo.de>
Date: Thu, 15 Mar 2018 16:29:35 +0100
Subject: [PATCH 434/916] wxRibbonButtonBarButton: Implemented manual button
 size class control

Added new functions SetButtonMinSizeClass() and
SetButtonMaxSizeClass() that set a button's minimum
and maximum allowed size class during ribbon layout collapsing.
Size classes are values from wxRibbonButtonBarButtonState enum.

wxRibbonButtonBar::MakeLayouts() and
wxRibbonButtonBar::TryCollapseLayout() are modified to support
this new behaviour.

The modified wxRibbonButtonBar provate layout routines are
aware of wxRIBBON_BUTTONBAR_BUTTON_SMALL which is not implemented
yet in MSW wxRibbonMSWArtProvider::DrawButtonBarButtonForeground.
---
 include/wx/ribbon/buttonbar.h   |   8 +-
 interface/wx/ribbon/buttonbar.h |  32 +++++
 src/ribbon/buttonbar.cpp        | 199 +++++++++++++++++++++++++-------
 3 files changed, 197 insertions(+), 42 deletions(-)

diff --git a/include/wx/ribbon/buttonbar.h b/include/wx/ribbon/buttonbar.h
index 8bc27d74ef..17ba124e57 100644
--- a/include/wx/ribbon/buttonbar.h
+++ b/include/wx/ribbon/buttonbar.h
@@ -150,6 +150,10 @@ public:
     virtual void SetButtonTextMinWidth(int button_id,
                 int min_width_medium, int min_width_large);
     virtual void SetButtonTextMinWidth(int button_id, const wxString& label);
+    virtual void SetButtonMinSizeClass(int button_id,
+                wxRibbonButtonBarButtonState min_size_class);
+    virtual void SetButtonMaxSizeClass(int button_id,
+                wxRibbonButtonBarButtonState max_size_class);
 
     virtual wxRibbonButtonBarButtonBase *GetActiveItem() const;
     virtual wxRibbonButtonBarButtonBase *GetHoveredItem() const;
@@ -183,7 +187,9 @@ protected:
 
     void CommonInit(long style);
     void MakeLayouts();
-    bool TryCollapseLayout(wxRibbonButtonBarLayout* original, size_t first_btn, size_t* last_button);
+    void TryCollapseLayout(wxRibbonButtonBarLayout* original,
+                     size_t first_btn, size_t* last_button,
+                     wxRibbonButtonBarButtonState target_size);
     void MakeBitmaps(wxRibbonButtonBarButtonBase* base,
                      const wxBitmap& bitmap_large,
                      const wxBitmap& bitmap_large_disabled,
diff --git a/interface/wx/ribbon/buttonbar.h b/interface/wx/ribbon/buttonbar.h
index a0e95396af..f95455943b 100644
--- a/interface/wx/ribbon/buttonbar.h
+++ b/interface/wx/ribbon/buttonbar.h
@@ -568,6 +568,38 @@ public:
     */
     virtual void SetButtonTextMinWidth(int button_id, const wxString& label);
 
+    /**
+        Sets the minimum size class of a ribbon button.
+
+        You have to call Realize() after calling this function to
+        apply the given minimum size.
+
+        @param button_id
+            ID of the button to manipulate.
+        @param min_size_class
+            The minimum size-class of the button. Buttons on a button bar
+            can have three distinct sizes: wxRIBBON_BUTTONBAR_BUTTON_SMALL,
+            wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, and wxRIBBON_BUTTONBAR_BUTTON_LARGE.
+    */
+    virtual void SetButtonMinSizeClass(int button_id,
+                wxRibbonButtonBarButtonState min_size_class);
+
+    /**
+        Sets the maximum size class of a ribbon button.
+
+        You have to call Realize() after calling this function to
+        apply the given maximum size.
+
+        @param button_id
+            ID of the button to manipulate.
+        @param max_size_class
+            The maximum size-class of the button. Buttons on a button bar
+            can have three distinct sizes: wxRIBBON_BUTTONBAR_BUTTON_SMALL,
+            wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, and wxRIBBON_BUTTONBAR_BUTTON_LARGE.
+    */
+    virtual void SetButtonMaxSizeClass(int button_id,
+                wxRibbonButtonBarButtonState max_size_class);
+
     /**
         Returns the active item of the button bar or NULL if there is none.
         The active button is the one being clicked.
diff --git a/src/ribbon/buttonbar.cpp b/src/ribbon/buttonbar.cpp
index 5b18727d07..5be028a710 100644
--- a/src/ribbon/buttonbar.cpp
+++ b/src/ribbon/buttonbar.cpp
@@ -75,10 +75,16 @@ public:
 
     wxRibbonButtonBarButtonState GetLargestSize()
     {
-        if(sizes[wxRIBBON_BUTTONBAR_BUTTON_LARGE].is_supported)
+        if(sizes[wxRIBBON_BUTTONBAR_BUTTON_LARGE].is_supported
+           && max_size_class >= wxRIBBON_BUTTONBAR_BUTTON_LARGE)
+        {
             return wxRIBBON_BUTTONBAR_BUTTON_LARGE;
-        if(sizes[wxRIBBON_BUTTONBAR_BUTTON_MEDIUM].is_supported)
+        }
+        if(sizes[wxRIBBON_BUTTONBAR_BUTTON_MEDIUM].is_supported
+           && max_size_class >= wxRIBBON_BUTTONBAR_BUTTON_MEDIUM)
+        {
             return wxRIBBON_BUTTONBAR_BUTTON_MEDIUM;
+        }
         wxASSERT(sizes[wxRIBBON_BUTTONBAR_BUTTON_SMALL].is_supported);
         return wxRIBBON_BUTTONBAR_BUTTON_SMALL;
     }
@@ -91,14 +97,16 @@ public:
             switch(*size)
             {
             case wxRIBBON_BUTTONBAR_BUTTON_LARGE:
-                if(sizes[wxRIBBON_BUTTONBAR_BUTTON_MEDIUM].is_supported)
+                if(sizes[wxRIBBON_BUTTONBAR_BUTTON_MEDIUM].is_supported
+                   && min_size_class <= wxRIBBON_BUTTONBAR_BUTTON_MEDIUM)
                 {
                     *size = wxRIBBON_BUTTONBAR_BUTTON_MEDIUM;
                     break;
                 }
                 wxFALLTHROUGH;
             case wxRIBBON_BUTTONBAR_BUTTON_MEDIUM:
-                if(sizes[wxRIBBON_BUTTONBAR_BUTTON_SMALL].is_supported)
+                if(sizes[wxRIBBON_BUTTONBAR_BUTTON_SMALL].is_supported
+                   && min_size_class <= wxRIBBON_BUTTONBAR_BUTTON_SMALL)
                 {
                     *size = wxRIBBON_BUTTONBAR_BUTTON_SMALL;
                     break;
@@ -120,6 +128,8 @@ public:
     wxBitmap bitmap_small_disabled;
     wxCoord text_min_width[3];
     wxRibbonButtonBarButtonSizeInfo sizes[3];
+    wxRibbonButtonBarButtonState min_size_class;
+    wxRibbonButtonBarButtonState max_size_class;
     wxClientDataContainer client_data;
     int id;
     wxRibbonButtonKind kind;
@@ -332,6 +342,8 @@ wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
     base->text_min_width[0] = 0;
     base->text_min_width[1] = 0;
     base->text_min_width[2] = 0;
+    base->min_size_class = wxRIBBON_BUTTONBAR_BUTTON_SMALL;
+    base->max_size_class = wxRIBBON_BUTTONBAR_BUTTON_LARGE;
 
     wxClientDC temp_dc(this);
     FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);
@@ -635,6 +647,36 @@ void wxRibbonButtonBar::SetButtonTextMinWidth(
     m_layouts_valid = false;
 }
 
+void wxRibbonButtonBar::SetButtonMinSizeClass(int button_id,
+                wxRibbonButtonBarButtonState min_size_class)
+{
+    wxRibbonButtonBarButtonBase* base = GetItemById(button_id);
+    if(base == NULL)
+        return;
+    if(base->max_size_class < min_size_class)
+    {
+        wxFAIL_MSG("Button minimum size is larger than maximum size");
+        return;
+    }
+    base->min_size_class = min_size_class;
+    m_layouts_valid = false;
+}
+
+void wxRibbonButtonBar::SetButtonMaxSizeClass(int button_id,
+                wxRibbonButtonBarButtonState max_size_class)
+{
+    wxRibbonButtonBarButtonBase* base = GetItemById(button_id);
+    if(base == NULL)
+        return;
+    if(base->min_size_class > max_size_class)
+    {
+        wxFAIL_MSG("Button maximum size is smaller than minimum size");
+        return;
+    }
+    base->max_size_class = max_size_class;
+    m_layouts_valid = false;
+}
+
 void wxRibbonButtonBar::SetArtProvider(wxRibbonArtProvider* art)
 {
     if(art == m_art)
@@ -905,8 +947,27 @@ void wxRibbonButtonBar::MakeLayouts()
     }
     size_t btn_count = m_buttons.Count();
     size_t btn_i;
+
+    // Determine available height:
+    // 1 large button or, if not found, 3 medium or small buttons
+    int available_height = 0;
+    bool large_button_found = false;
+    for(btn_i = 0; btn_i < btn_count; ++btn_i)
     {
-        // Best layout : all buttons large, stacking horizontally
+        wxRibbonButtonBarButtonBase* button = m_buttons.Item(btn_i);
+        wxRibbonButtonBarButtonState size_class = button->GetLargestSize();
+        available_height = wxMax(available_height,
+                                 button->sizes[size_class].size.GetHeight());
+        if(size_class == wxRIBBON_BUTTONBAR_BUTTON_LARGE)
+            large_button_found = true;
+    }
+    if(!large_button_found)
+        available_height *= 3;
+
+    int stacked_width = 0;
+    {
+        // Best layout : all buttons large, stacking horizontally,
+        //               small buttons small, stacked vertically
         wxRibbonButtonBarLayout* layout = new wxRibbonButtonBarLayout;
         wxPoint cursor(0, 0);
         layout->overall_size.SetHeight(0);
@@ -917,54 +978,111 @@ void wxRibbonButtonBar::MakeLayouts()
             instance.position = cursor;
             instance.size = button->GetLargestSize();
             wxSize& size = button->sizes[instance.size].size;
-            cursor.x += size.GetWidth();
-            layout->overall_size.SetHeight(wxMax(layout->overall_size.GetHeight(),
-                size.GetHeight()));
+
+            if(instance.size < wxRIBBON_BUTTONBAR_BUTTON_LARGE)
+            {
+                stacked_width = wxMax(stacked_width, size.GetWidth());
+                if(cursor.y + size.GetHeight() >= available_height)
+                {
+                    cursor.y = 0;
+                    cursor.x += stacked_width;
+                    stacked_width = 0;
+                }
+                else
+                {
+                    cursor.y += size.GetHeight();
+                }
+            }
+            else
+            {
+                if(cursor.y != 0)
+                {
+                    cursor.y = 0;
+                    cursor.x += stacked_width;
+                    stacked_width = 0;
+                    instance.position = cursor;
+                }
+                cursor.x += size.GetWidth();
+            }
             layout->buttons.Add(instance);
         }
-        layout->overall_size.SetWidth(cursor.x);
+        layout->overall_size.SetHeight(available_height);
+        layout->overall_size.SetWidth(cursor.x + stacked_width);
         m_layouts.Add(layout);
     }
     if(btn_count >= 2)
     {
         // Collapse the rightmost buttons and stack them vertically
-        size_t iLast = btn_count - 1;
-        while(TryCollapseLayout(m_layouts.Last(), iLast, &iLast) && iLast > 0)
+        // if they are not already small. If rightmost buttons can't
+        // be collapsed because "min_size_class" is set, try it again
+        // starting from second rightmost button and so on.
+        size_t iLast = btn_count;
+        while(iLast-- > 0)
         {
-            --iLast;
+            TryCollapseLayout(m_layouts.Last(), iLast, &iLast,
+                              wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
         }
+
+        // TODO: small buttons are not implemented yet in 
+        //       art_msw.cpp:2581 and will be invisible
+        /*iLast = btn_count;
+        while(iLast-- > 0)
+        {
+            TryCollapseLayout(m_layouts.Last(), iLast, &iLast,
+                              wxRIBBON_BUTTONBAR_BUTTON_SMALL);
+        }*/
     }
 }
 
-bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
-                                          size_t first_btn, size_t* last_button)
+void wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
+                                          size_t first_btn, size_t* last_button,
+                                          wxRibbonButtonBarButtonState target_size)
 {
     size_t btn_count = m_buttons.Count();
     size_t btn_i;
     int used_height = 0;
     int used_width = 0;
+    int original_column_width = 0;
     int available_width = 0;
-    int available_height = 0;
+    int available_height = original->overall_size.GetHeight();
 
+    // Search for button range from right which should be
+    // collapsed into a column of small buttons.
     for(btn_i = first_btn + 1; btn_i > 0; /* decrement is inside loop */)
     {
         --btn_i;
         wxRibbonButtonBarButtonBase* button = m_buttons.Item(btn_i);
         wxRibbonButtonBarButtonState large_size_class = button->GetLargestSize();
         wxSize large_size = button->sizes[large_size_class].size;
-        int t_available_height = wxMax(available_height,
-            large_size.GetHeight());
-        int t_available_width = available_width + large_size.GetWidth();
-        wxRibbonButtonBarButtonState small_size_class = large_size_class;
-        if(!button->GetSmallerSize(&small_size_class))
+        int t_available_width = available_width;
+
+        original_column_width = wxMax(original_column_width,
+                                      large_size.GetWidth());
+
+        // Top button in column: add column width to available width
+        if(original->buttons.Item(btn_i).position.y == 0)
         {
-            return false;
+            t_available_width += original_column_width;
+            original_column_width = 0;
+        }
+
+        wxRibbonButtonBarButtonState small_size_class = large_size_class;
+        if(large_size_class > target_size)
+        {
+            if(!button->GetSmallerSize(&small_size_class,
+                                       small_size_class - target_size))
+            {
+                // Large button that cannot shrink: stop search
+                ++btn_i;
+                break;
+            }
         }
         wxSize small_size = button->sizes[small_size_class].size;
         int t_used_height = used_height + small_size.GetHeight();
         int t_used_width = wxMax(used_width, small_size.GetWidth());
 
-        if(t_used_height > t_available_height)
+        // Height is full: stop search
+        if(t_used_height > available_height)
         {
             ++btn_i;
             break;
@@ -974,13 +1092,13 @@ bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
             used_height = t_used_height;
             used_width = t_used_width;
             available_width = t_available_width;
-            available_height = t_available_height;
         }
     }
 
+    // Layout got wider than before or no suitable button found: abort
     if(btn_i >= first_btn || used_width >= available_width)
     {
-        return false;
+        return;
     }
     if(last_button != NULL)
     {
@@ -990,27 +1108,23 @@ bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
     wxRibbonButtonBarLayout* layout = new wxRibbonButtonBarLayout;
     WX_APPEND_ARRAY(layout->buttons, original->buttons);
     wxPoint cursor(layout->buttons.Item(btn_i).position);
-    bool preserve_height = false;
-    if(btn_i == 0)
-    {
-        // If height isn't preserved (i.e. it is reduced), then the minimum
-        // size for the button bar will decrease, preventing the original
-        // layout from being used (in some cases).
-        // It may be a good idea to always preserve the height, but for now
-        // it is only done when the first button is involved in a collapse.
-        preserve_height = true;
-    }
 
+    cursor.y = 0;
     for(; btn_i <= first_btn; ++btn_i)
     {
         wxRibbonButtonBarButtonInstance& instance = layout->buttons.Item(btn_i);
-        instance.base->GetSmallerSize(&instance.size);
+        if(instance.size > target_size)
+        {
+            instance.base->GetSmallerSize(&instance.size,
+                                          instance.size - target_size);
+        }
         instance.position = cursor;
         cursor.y += instance.base->sizes[instance.size].size.GetHeight();
     }
 
     int x_adjust = available_width - used_width;
 
+    // Adjust x coords of buttons right of shrinked column
     for(; btn_i < btn_count; ++btn_i)
     {
         wxRibbonButtonBarButtonInstance& instance = layout->buttons.Item(btn_i);
@@ -1025,16 +1139,19 @@ bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
     {
         delete layout;
         wxFAIL_MSG("Layout collapse resulted in increased size");
-        return false;
+        return;
     }
 
-    if(preserve_height)
-    {
-        layout->overall_size.SetHeight(original->overall_size.GetHeight());
-    }
+    // If height isn't preserved (i.e. it is reduced), then the minimum
+    // size for the button bar will decrease, preventing the original
+    // layout from being used (in some cases).
+    // If neither "min_size_class" nor "max_size_class" is set, this is
+    // only required when the first button is involved in a collapse but
+    // if small, medium and large buttons as well as min/max size classes
+    // are involved this is always a good idea.
+    layout->overall_size.SetHeight(original->overall_size.GetHeight());
 
     m_layouts.Add(layout);
-    return true;
 }
 
 void wxRibbonButtonBar::MakeBitmaps(wxRibbonButtonBarButtonBase* base,

From 2be4724d53548ceffb0495a7b6d1ab58d9359f86 Mon Sep 17 00:00:00 2001
From: Max Maisel <max.maisel@posteo.de>
Date: Thu, 15 Mar 2018 16:34:50 +0100
Subject: [PATCH 435/916] Updated ribbon example program

Added Ribbon SetButtonIcon(), SetButtonText(),
SetButtonMinSizeClass() and SetButtonMaxSizeClass() examples.
---
 samples/ribbon/ribbondemo.cpp | 120 +++++++++++++++++++++++++++++++---
 1 file changed, 112 insertions(+), 8 deletions(-)

diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp
index 9600a3ac90..8a7de6d5fe 100644
--- a/samples/ribbon/ribbondemo.cpp
+++ b/samples/ribbon/ribbondemo.cpp
@@ -60,6 +60,8 @@ public:
         ID_SELECTION_EXPAND_H,
         ID_SELECTION_EXPAND_V,
         ID_SELECTION_CONTRACT,
+        ID_BUTTON_XX,
+        ID_BUTTON_XY,
         ID_PRIMARY_COLOUR,
         ID_SECONDARY_COLOUR,
         ID_DEFAULT_PROVIDER,
@@ -84,7 +86,15 @@ public:
         ID_UI_CHANGE_TEXT_UPDATED,
         ID_REMOVE_PAGE,
         ID_HIDE_PAGES,
-        ID_SHOW_PAGES
+        ID_SHOW_PAGES,
+        ID_PLUS_MINUS,
+        ID_CHANGE_LABEL,
+        ID_SMALL_BUTTON_1,
+        ID_SMALL_BUTTON_2,
+        ID_SMALL_BUTTON_3,
+        ID_SMALL_BUTTON_4,
+        ID_SMALL_BUTTON_5,
+        ID_SMALL_BUTTON_6
     };
 
     void OnEnableUpdateUI(wxUpdateUIEvent& evt);
@@ -134,6 +144,8 @@ public:
     void OnRemovePage(wxRibbonButtonBarEvent& evt);
     void OnHidePages(wxRibbonButtonBarEvent& evt);
     void OnShowPages(wxRibbonButtonBarEvent& evt);
+    void OnPlusMinus(wxRibbonButtonBarEvent& evt);
+    void OnChangeLabel(wxRibbonButtonBarEvent& evt);
     void OnTogglePanels(wxCommandEvent& evt);
     void OnRibbonBarToggled(wxRibbonBarEvent& evt);
     void OnRibbonBarHelpClicked(wxRibbonBarEvent& evt);
@@ -169,6 +181,10 @@ protected:
     bool m_bChecked;
     wxString m_new_text;
 
+    wxRibbonButtonBar* m_mutable_button_bar;
+    bool m_plus_minus_state;
+    bool m_change_label_state;
+
     wxDECLARE_EVENT_TABLE();
 };
 
@@ -241,6 +257,8 @@ EVT_RIBBONPANEL_EXTBUTTON_ACTIVATED(wxID_ANY, MyFrame::OnExtButton)
 EVT_RIBBONBUTTONBAR_CLICKED(ID_REMOVE_PAGE, MyFrame::OnRemovePage)
 EVT_RIBBONBUTTONBAR_CLICKED(ID_HIDE_PAGES, MyFrame::OnHidePages)
 EVT_RIBBONBUTTONBAR_CLICKED(ID_SHOW_PAGES, MyFrame::OnShowPages)
+EVT_RIBBONBUTTONBAR_CLICKED(ID_PLUS_MINUS, MyFrame::OnPlusMinus)
+EVT_RIBBONBUTTONBAR_CLICKED(ID_CHANGE_LABEL, MyFrame::OnChangeLabel)
 EVT_RIBBONBAR_TOGGLED(wxID_ANY, MyFrame::OnRibbonBarToggled)
 EVT_RIBBONBAR_HELP_CLICK(wxID_ANY, MyFrame::OnRibbonBarHelpClicked)
 EVT_SIZE(MyFrame::OnSizeEvent)
@@ -352,13 +370,22 @@ MyFrame::MyFrame()
         sizer_panelcombo->SetMinSize(wxSize(150, -1));
         sizer_panelcombo2->SetMinSize(wxSize(150, -1));
 
-        //not using wxWrapSizer(wxHORIZONTAL) as it reports an incorrect min height
-        wxSizer* sizer_panelsizer = new wxBoxSizer(wxVERTICAL);
-        sizer_panelsizer->AddStretchSpacer(1);
-        sizer_panelsizer->Add(sizer_panelcombo, 0, wxALL|wxEXPAND, 2);
-        sizer_panelsizer->Add(sizer_panelcombo2, 0, wxALL|wxEXPAND, 2);
-        sizer_panelsizer->AddStretchSpacer(1);
-        sizer_panel->SetSizer(sizer_panelsizer);
+        wxRibbonButtonBar* bar = new wxRibbonButtonBar(sizer_panel, wxID_ANY);
+        bar->AddButton(ID_BUTTON_XX, wxT("xx"), ribbon_xpm);
+        bar->AddButton(ID_BUTTON_XY, wxT("xy"), ribbon_xpm);
+        // This prevents ribbon buttons in panels with sizer from collapsing.
+        bar->SetButtonMinSizeClass(ID_BUTTON_XX, wxRIBBON_BUTTONBAR_BUTTON_LARGE);
+        bar->SetButtonMinSizeClass(ID_BUTTON_XY, wxRIBBON_BUTTONBAR_BUTTON_LARGE);
+
+        wxSizer* sizer_panelsizer_h = new wxBoxSizer(wxHORIZONTAL);
+        wxSizer* sizer_panelsizer_v = new wxBoxSizer(wxVERTICAL);
+        sizer_panelsizer_v->AddStretchSpacer(1);
+        sizer_panelsizer_v->Add(sizer_panelcombo, 0, wxALL|wxEXPAND, 2);
+        sizer_panelsizer_v->Add(sizer_panelcombo2, 0, wxALL|wxEXPAND, 2);
+        sizer_panelsizer_v->AddStretchSpacer(1);
+        sizer_panelsizer_h->Add(bar, 0, wxEXPAND);
+        sizer_panelsizer_h->Add(sizer_panelsizer_v, 0);
+        sizer_panel->SetSizer(sizer_panelsizer_h);
 
         wxFont label_font(8, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_LIGHT);
         m_bitmap_creation_dc.SetFont(label_font);
@@ -418,10 +445,57 @@ MyFrame::MyFrame()
         bar->AddButton(ID_REMOVE_PAGE, wxT("Remove"), wxArtProvider::GetBitmap(wxART_DELETE, wxART_OTHER, wxSize(24, 24)));
         bar->AddButton(ID_HIDE_PAGES, wxT("Hide Pages"), ribbon_xpm);
         bar->AddButton(ID_SHOW_PAGES, wxT("Show Pages"), ribbon_xpm);
+
+        panel = new wxRibbonPanel(page, wxID_ANY, wxT("Button bar manipulation"), ribbon_xpm);
+        m_mutable_button_bar = new wxRibbonButtonBar(panel, wxID_ANY);
+        m_mutable_button_bar->AddButton(ID_PLUS_MINUS, wxT("+/-"),
+            wxArtProvider::GetBitmap(wxART_PLUS, wxART_OTHER, wxSize(24, 24)));
+        m_plus_minus_state = false;
+        m_mutable_button_bar->AddButton(ID_CHANGE_LABEL, wxT("short"), ribbon_xpm);
+        m_mutable_button_bar->SetButtonTextMinWidth(ID_CHANGE_LABEL, wxT("some long text"));
+        m_change_label_state = false;
+
+        panel = new wxRibbonPanel(page, wxID_ANY, wxT("Always medium buttons"), ribbon_xpm);
+        bar = new wxRibbonButtonBar(panel, wxID_ANY);
+        bar->AddButton(ID_SMALL_BUTTON_1, wxT("Button 1"), ribbon_xpm);
+        bar->SetButtonMaxSizeClass(ID_SMALL_BUTTON_1, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
+        bar->AddButton(ID_SMALL_BUTTON_2, wxT("Button 2"), ribbon_xpm);
+        bar->SetButtonMaxSizeClass(ID_SMALL_BUTTON_2, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
+        bar->AddButton(ID_SMALL_BUTTON_3, wxT("Button 3"), ribbon_xpm);
+        bar->AddButton(ID_SMALL_BUTTON_4, wxT("Button 4"), ribbon_xpm);
+        bar->AddButton(ID_SMALL_BUTTON_5, wxT("Button 5"), ribbon_xpm);
+        bar->SetButtonMaxSizeClass(ID_SMALL_BUTTON_5, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
+        bar->AddButton(ID_SMALL_BUTTON_6, wxT("Button 6"), ribbon_xpm);
+        bar->SetButtonMaxSizeClass(ID_SMALL_BUTTON_6, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
     }
     new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Highlight Page"), empty_xpm);
     m_ribbon->AddPageHighlight(m_ribbon->GetPageCount()-1);
 
+    {
+        wxRibbonPage* page = new wxRibbonPage(m_ribbon, wxID_ANY, wxT("Advanced"), empty_xpm);
+        wxRibbonPanel* panel = new wxRibbonPanel(page, wxID_ANY, wxT("Button bar manipulation"), ribbon_xpm);
+        m_mutable_button_bar = new wxRibbonButtonBar(panel, wxID_ANY);
+        m_mutable_button_bar->AddButton(ID_PLUS_MINUS, wxT("+/-"),
+            wxArtProvider::GetBitmap(wxART_PLUS, wxART_OTHER, wxSize(24, 24)));
+        m_plus_minus_state = false;
+        m_mutable_button_bar->AddButton(ID_CHANGE_LABEL, wxT("short"), ribbon_xpm);
+        m_mutable_button_bar->SetButtonTextMinWidth(ID_CHANGE_LABEL, wxT("some long text"));
+        m_change_label_state = false;
+
+        panel = new wxRibbonPanel(page, wxID_ANY, wxT("Always medium buttons"), ribbon_xpm);
+        wxRibbonButtonBar* bar = new wxRibbonButtonBar(panel, wxID_ANY);
+        bar->AddButton(ID_SMALL_BUTTON_1, wxT("Button 1"), ribbon_xpm);
+        bar->SetButtonMaxSizeClass(ID_SMALL_BUTTON_1, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
+        bar->AddButton(ID_SMALL_BUTTON_2, wxT("Button 2"), ribbon_xpm);
+        bar->SetButtonMaxSizeClass(ID_SMALL_BUTTON_2, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
+        bar->AddButton(ID_SMALL_BUTTON_3, wxT("Button 3"), ribbon_xpm);
+        bar->AddButton(ID_SMALL_BUTTON_4, wxT("Button 4"), ribbon_xpm);
+        bar->AddButton(ID_SMALL_BUTTON_5, wxT("Button 5"), ribbon_xpm);
+        bar->SetButtonMaxSizeClass(ID_SMALL_BUTTON_5, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
+        bar->AddButton(ID_SMALL_BUTTON_6, wxT("Button 6"), ribbon_xpm);
+        bar->SetButtonMaxSizeClass(ID_SMALL_BUTTON_6, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM);
+    }
+
     m_ribbon->Realize();
 
     m_logwindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
@@ -1038,6 +1112,36 @@ void MyFrame::OnShowPages(wxRibbonButtonBarEvent& WXUNUSED(evt))
     m_ribbon->Realize();
 }
 
+void MyFrame::OnPlusMinus(wxRibbonButtonBarEvent& WXUNUSED(evt))
+{
+    if(m_plus_minus_state)
+    {
+        m_mutable_button_bar->SetButtonIcon(ID_PLUS_MINUS,
+            wxArtProvider::GetBitmap(wxART_PLUS, wxART_OTHER, wxSize(24, 24)));
+        m_plus_minus_state = false;
+    }
+    else
+    {
+        m_mutable_button_bar->SetButtonIcon(ID_PLUS_MINUS,
+            wxArtProvider::GetBitmap(wxART_MINUS, wxART_OTHER, wxSize(24, 24)));
+        m_plus_minus_state = true;
+    }
+}
+
+void MyFrame::OnChangeLabel(wxRibbonButtonBarEvent& WXUNUSED(evt))
+{
+    if(m_change_label_state)
+    {
+        m_mutable_button_bar->SetButtonText(ID_CHANGE_LABEL, wxT("short"));
+        m_change_label_state = false;
+    }
+    else
+    {
+        m_mutable_button_bar->SetButtonText(ID_CHANGE_LABEL, wxT("some long text"));
+        m_change_label_state = true;
+    }
+}
+
 void MyFrame::OnRibbonBarToggled(wxRibbonBarEvent& WXUNUSED(evt))
 {
     AddText(wxString::Format("Ribbon bar %s.",

From 0c4c5a2aa924571ae5dfde82f54b00506c066dac Mon Sep 17 00:00:00 2001
From: Felipe <felipefplzx@gmail.com>
Date: Mon, 19 Mar 2018 00:34:06 +0100
Subject: [PATCH 436/916] Update Brazilian Portuguese translations

Now 100% complete.
---
 locale/pt_BR.po | 198 +++++++++++++++++++++++-------------------------
 1 file changed, 94 insertions(+), 104 deletions(-)

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index c88b1fa3d0..5b431fbd1e 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -4,10 +4,10 @@
 # translation of pt_BR.po to
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWidgets 3.1\n"
+"Project-Id-Version: wxWidgets 3.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 14:25+0200\n"
-"PO-Revision-Date: 2015-06-22 13:44-0300\n"
+"POT-Creation-Date: 2018-03-17 17:48-0300\n"
+"PO-Revision-Date: 2018-03-17 18:20-0300\n"
 "Last-Translator: Felipe\n"
 "Language-Team: Felipe <felipefplzx@gmail.com>\n"
 "Language: pt_BR\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Poedit 1.8.1\n"
+"X-Generator: Poedit 2.0.2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: ../src/common/debugrpt.cpp:586
@@ -38,7 +38,7 @@ msgstr "              Obrigado a você e nós lamentamos pela inconveniência!\n
 #: ../src/common/prntbase.cpp:573
 #, c-format
 msgid " (copy %d of %d)"
-msgstr "(cópia %d de %d)"
+msgstr " (cópia %d de %d)"
 
 #: ../src/common/log.cpp:421
 #, c-format
@@ -52,7 +52,7 @@ msgstr " (no módulo \"%s\")"
 
 #: ../src/osx/core/secretstore.cpp:138
 msgid " (while overwriting an existing item)"
-msgstr ""
+msgstr " (enquanto sobrescrevendo um item existente)"
 
 #: ../src/common/docview.cpp:1642
 msgid " - "
@@ -64,19 +64,19 @@ msgstr " Pré-visualizar"
 
 #: ../src/common/fontcmn.cpp:824
 msgid " bold"
-msgstr "negrito"
+msgstr " negrito"
 
 #: ../src/common/fontcmn.cpp:840
 msgid " italic"
-msgstr "itálico"
+msgstr " itálico"
 
 #: ../src/common/fontcmn.cpp:820
 msgid " light"
-msgstr "leve"
+msgstr " leve"
 
 #: ../src/common/fontcmn.cpp:807
 msgid " strikethrough"
-msgstr "sublinhado"
+msgstr " sublinhado"
 
 #: ../src/common/paper.cpp:117
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
@@ -135,9 +135,9 @@ msgid "%lu of %lu"
 msgstr "%lu de %lu"
 
 #: ../src/generic/datavgen.cpp:6028
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%d items)"
-msgstr "%s (ou %s)"
+msgstr "%s (%d itens)"
 
 #: ../src/common/cmdline.cpp:1221
 #, c-format
@@ -503,8 +503,7 @@ msgstr "&Rede"
 msgid "&New"
 msgstr "&Novo"
 
-#: ../src/aui/tabmdi.cpp:111 ../src/generic/mdig.cpp:100
-#: ../src/msw/mdi.cpp:180
+#: ../src/aui/tabmdi.cpp:111 ../src/generic/mdig.cpp:100 ../src/msw/mdi.cpp:180
 msgid "&Next"
 msgstr "&Próximo"
 
@@ -578,8 +577,7 @@ msgstr "&Modo da posição:"
 msgid "&Preferences"
 msgstr "&Preferências"
 
-#: ../src/aui/tabmdi.cpp:112 ../src/generic/mdig.cpp:101
-#: ../src/msw/mdi.cpp:181
+#: ../src/aui/tabmdi.cpp:112 ../src/generic/mdig.cpp:101 ../src/msw/mdi.cpp:181
 msgid "&Previous"
 msgstr "&Anterior"
 
@@ -787,12 +785,12 @@ msgstr "&Sim"
 #: ../src/common/valtext.cpp:256
 #, c-format
 msgid "'%s' contains illegal characters"
-msgstr "'%s' contém caracteres ilegais."
+msgstr "'%s' contém caracteres ilegais"
 
 #: ../src/common/valtext.cpp:254
 #, c-format
 msgid "'%s' doesn't consist only of valid characters"
-msgstr "'%s' não consiste apenas de caracteres válidos."
+msgstr "'%s' não consiste apenas de caracteres válidos"
 
 #: ../src/common/config.cpp:519 ../src/msw/regconf.cpp:258
 #, c-format
@@ -812,7 +810,7 @@ msgstr "'%s' não é um catálogo de mensagens válido."
 #: ../src/common/valtext.cpp:165
 #, c-format
 msgid "'%s' is not one of the valid strings"
-msgstr "'%s' não é uma das sequências válidas."
+msgstr "'%s' não é uma das sequências válidas"
 
 #: ../src/common/valtext.cpp:167
 #, c-format
@@ -987,7 +985,7 @@ msgstr "2"
 
 #: ../src/common/paper.cpp:132
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
-msgstr "Envelope 6 3/4, 3 5/8 x 6 1/2 em\""
+msgstr "Envelope 6 3/4, 3 5/8 x 6 1/2 em"
 
 #: ../src/common/paper.cpp:139
 msgid "9 x 11 in"
@@ -1065,7 +1063,7 @@ msgstr "<b><i>negrito itálico <u>sublinhado</u></i></b><br>"
 
 #: ../src/html/helpwnd.cpp:1265
 msgid "<b>Bold face.</b> "
-msgstr "<b>Face em negrito.</b>"
+msgstr "<b>Face em negrito.</b> "
 
 #: ../src/html/helpwnd.cpp:1264
 msgid "<i>Italic face.</i> "
@@ -1086,7 +1084,7 @@ msgstr "Um relatório de debug foi gerado. Ele pode ser achado em"
 
 #: ../src/common/xtixml.cpp:418
 msgid "A non empty collection must consist of 'element' nodes"
-msgstr "Uma coleção não vazia deve consistir de nodes do 'elemento'"
+msgstr "Uma coleção não vazia deve consistir de nodes do elemento"
 
 #: ../src/richtext/richtextliststylepage.cpp:304
 #: ../src/richtext/richtextliststylepage.cpp:306
@@ -1329,7 +1327,7 @@ msgstr "AppWorkspace"
 #: ../src/generic/logg.cpp:1014
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "Anexar o log ao arquivo '%s'? (escolher [Não] sobrescreverá ele)"
+msgstr "Anexar o log ao arquivo '%s'? (escolher [Não] sobrescreverá ele)?"
 
 #: ../src/osx/menu_osx.cpp:577 ../src/osx/menu_osx.cpp:585
 msgid "Application"
@@ -1511,9 +1509,8 @@ msgid "Blue"
 msgstr "Azul"
 
 #: ../src/generic/colrdlgg.cpp:345
-#, fuzzy
 msgid "Blue:"
-msgstr "Azul"
+msgstr "Azul:"
 
 #: ../src/generic/fontdlgg.cpp:333 ../src/richtext/richtextfontpage.cpp:355
 #: ../src/osx/carbon/fontdlg.cpp:354 ../src/common/stockitem.cpp:143
@@ -2001,7 +1998,7 @@ msgstr ""
 #: ../src/gtk/filepicker.cpp:190 ../src/gtk/filedlg.cpp:87
 #, c-format
 msgid "Changing current directory to \"%s\" failed"
-msgstr "Falhou em mudar o diretório atual para \"%s\""
+msgstr "Falhou em mudar o diretório atual para %s"
 
 #. TRANSLATORS: System cursor name
 #: ../src/propgrid/advprops.cpp:1757
@@ -2031,7 +2028,7 @@ msgstr "Marque para adicionar um parêntese direito."
 #: ../src/richtext/richtextborderspage.cpp:551
 #: ../src/richtext/richtextborderspage.cpp:553
 msgid "Check to edit all borders simultaneously."
-msgstr "Marque pra editar todas as bordas simultâneamente"
+msgstr "Marque pra editar todas as bordas simultâneamente."
 
 #: ../src/richtext/richtextliststylepage.cpp:231
 #: ../src/richtext/richtextliststylepage.cpp:233
@@ -2090,7 +2087,7 @@ msgstr "Marque para mostrar o texto em superscript."
 #: ../src/richtext/richtextfontpage.cpp:322
 #: ../src/richtext/richtextfontpage.cpp:324
 msgid "Check to suppress hyphenation."
-msgstr "Marque pra suprimir a hifenação"
+msgstr "Marque pra suprimir a hifenação."
 
 #: ../src/msw/dialup.cpp:763
 msgid "Choose ISP to dial"
@@ -2177,7 +2174,7 @@ msgstr "Clique pra escolher a fonte para este nível."
 #: ../src/richtext/richtextstyledlg.cpp:279
 #: ../src/richtext/richtextstyledlg.cpp:281
 msgid "Click to close this window."
-msgstr "Clique para fechar esta janela"
+msgstr "Clique pra fechar esta janela."
 
 #: ../src/osx/carbon/fontdlg.cpp:410 ../src/osx/carbon/fontdlg.cpp:412
 msgid "Click to confirm changes to the font."
@@ -2261,7 +2258,7 @@ msgstr "Fechar esta janela"
 #. TRANSLATORS: Action for manipulating a tree control
 #: ../src/generic/datavgen.cpp:6006
 msgid "Collapse"
-msgstr ""
+msgstr "Retrair"
 
 #: ../src/common/stockitem.cpp:193
 msgid "Color"
@@ -2281,9 +2278,9 @@ msgid "Colour:"
 msgstr "Côr:"
 
 #: ../src/generic/datavgen.cpp:6077
-#, fuzzy, c-format
+#, c-format
 msgid "Column %u"
-msgstr "Adicionar Coluna"
+msgstr "Coluna %u"
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/common/accelcmn.cpp:114
@@ -2397,9 +2394,8 @@ msgid "Could not find tab for id"
 msgstr "Não pôde achar a aba pela id"
 
 #: ../src/gtk/notifmsg.cpp:108
-#, fuzzy
 msgid "Could not initalize libnotify."
-msgstr "Não pôde definir o alinhamento."
+msgstr "Não pôde inicializar o libnotify."
 
 #: ../src/html/chm.cpp:444
 #, c-format
@@ -2431,9 +2427,8 @@ msgstr "Não pôde adicionar uma imagem a lista de imagens."
 
 #: ../src/osx/glcanvas_osx.cpp:414 ../src/unix/glx11.cpp:558
 #: ../src/msw/glcanvas.cpp:616
-#, fuzzy
 msgid "Couldn't create OpenGL context"
-msgstr "Não pôde criar um timer"
+msgstr "Não pôde criar o contexto do OpenGL"
 
 #: ../src/msw/timer.cpp:134
 msgid "Couldn't create a timer"
@@ -2692,9 +2687,9 @@ msgid "Deleted stale lock file '%s'."
 msgstr "Arquivo do stale lock apagado '%s'."
 
 #: ../src/common/secretstore.cpp:220
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting password for \"%s/%s\" failed: %s."
-msgstr "Falhou em criar %s \"%s\"."
+msgstr "Falhou em apagar a senha do %s/%s\": %s."
 
 #: ../src/common/module.cpp:124
 #, c-format
@@ -2793,7 +2788,7 @@ msgstr "Documento:"
 
 #: ../src/generic/aboutdlgg.cpp:73
 msgid "Documentation by "
-msgstr "Documentação de"
+msgstr "Documentação de "
 
 #: ../src/generic/aboutdlgg.cpp:180
 msgid "Documentation writers"
@@ -2990,9 +2985,9 @@ msgid "Error closing kqueue instance"
 msgstr "Erro ao fechar a instância kqueue"
 
 #: ../src/common/filefn.cpp:1049
-#, fuzzy, c-format
+#, c-format
 msgid "Error copying the file '%s' to '%s'."
-msgstr "Falhou em copiar o arquivo '%s' para '%s'"
+msgstr "Erro ao copiar o arquivo '%s' para '%s'."
 
 #: ../src/generic/dirdlgg.cpp:222
 msgid "Error creating directory"
@@ -3017,7 +3012,7 @@ msgstr "Erro ao salvar os dados de configuração do usuário."
 
 #: ../src/gtk/print.cpp:722
 msgid "Error while printing: "
-msgstr "Erro enquanto imprimia:"
+msgstr "Erro enquanto imprimia: "
 
 #: ../src/common/log.cpp:219
 msgid "Error: "
@@ -3062,7 +3057,7 @@ msgstr "Executivo, 7 1/4 x 10 1/2 em"
 #. TRANSLATORS: Action for manipulating a tree control
 #: ../src/generic/datavgen.cpp:6009
 msgid "Expand"
-msgstr ""
+msgstr "Expandir"
 
 #: ../src/msw/registry.cpp:1240
 #, c-format
@@ -3120,7 +3115,7 @@ msgstr "Falhou em verificar o formato do arquivo de imagem \"%s\"."
 #: ../src/common/debugrpt.cpp:239
 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
-msgstr "Falhou em limpar o diretório do relatório de debug \"%s\"."
+msgstr "Falhou em limpar o diretório do relatório de debug \"%s\""
 
 #: ../src/common/filename.cpp:192
 msgid "Failed to close file handle"
@@ -3175,7 +3170,7 @@ msgstr "Falhou em copiar o arquivo '%s' para '%s'"
 #: ../src/msw/registry.cpp:679
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
-msgstr "Falhou em copiar a sub-chave do registro '%s' para '%s'"
+msgstr "Falhou em copiar a sub-chave do registro '%s' para '%s'."
 
 #: ../src/msw/dde.cpp:1070
 msgid "Failed to create DDE string"
@@ -3356,9 +3351,9 @@ msgid "Failed to load icon \"%s\" from resources."
 msgstr "Falhou em carregar o ícone \"%s\" dos recursos."
 
 #: ../src/common/iconbndl.cpp:225
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load icons from resource '%s'."
-msgstr "Falhou em carregar o ícone \"%s\" dos recursos."
+msgstr "Falhou em carregar os ícones do recurso '%s'."
 
 #: ../src/common/iconbndl.cpp:200
 #, c-format
@@ -3451,7 +3446,7 @@ msgstr "Falhou em abrir o diretório \"%s\" pro monitoramento."
 #: ../src/x11/utils.cpp:227
 #, c-format
 msgid "Failed to open display \"%s\"."
-msgstr "Falhou em abrir a exibição \"%s\""
+msgstr "Falhou em abrir a exibição \"%s\"."
 
 #: ../src/common/filename.cpp:1062
 msgid "Failed to open temporary file."
@@ -3604,7 +3599,7 @@ msgstr "Falhou em definir o texto no controle de texto."
 #: ../src/unix/threadpsx.cpp:1298
 #, c-format
 msgid "Failed to set thread concurrency level to %lu"
-msgstr "Falhou em definir o nível de concordância do thread em %lu."
+msgstr "Falhou em definir o nível de concordância do thread em %lu"
 
 #: ../src/unix/threadpsx.cpp:1424
 #, c-format
@@ -3817,7 +3812,7 @@ msgstr "Pra frente"
 
 #: ../src/common/xtixml.cpp:235
 msgid "Forward hrefs are not supported"
-msgstr "hrefs adiantadas não são suportadas"
+msgstr "As hrefs adiantadas não são suportadas"
 
 #: ../src/html/helpwnd.cpp:875
 #, c-format
@@ -3906,7 +3901,7 @@ msgstr "Ir para o diretório pai"
 
 #: ../src/generic/aboutdlgg.cpp:76
 msgid "Graphics art by "
-msgstr "Arte gráfica de"
+msgstr "Arte gráfica de "
 
 #: ../src/propgrid/advprops.cpp:1599
 msgid "Gray"
@@ -3926,9 +3921,8 @@ msgid "Green"
 msgstr "Verde"
 
 #: ../src/generic/colrdlgg.cpp:342
-#, fuzzy
 msgid "Green:"
-msgstr "Verde"
+msgstr "Verde:"
 
 #: ../src/richtext/richtextborderspage.cpp:615
 msgid "Groove"
@@ -4290,7 +4284,7 @@ msgstr "Especificação do modo de exibição '%s' inválida."
 #: ../src/x11/app.cpp:127
 #, c-format
 msgid "Invalid geometry specification '%s'"
-msgstr "Especificação da geometria '%s' inválida "
+msgstr "Inválida a especificação da geometria '%s'"
 
 #: ../src/unix/fswatcher_inotify.cpp:323
 #, c-format
@@ -5105,9 +5099,9 @@ msgid ""
 "Do you want to use this encoding (otherwise you will have to choose another "
 "one)?"
 msgstr ""
-"Nenhuma fonte para exibir o texto na codificação '%s' achada,\n"
+"Nenhuma fonte pra exibir o texto na codificação '%s' achada,\n"
 "mas uma codificação alternativa '%s' está disponível.\n"
-"Você quer usar esta codificação? (de outro modo você terá que escolher outra)"
+"Você quer usar esta codificação (de outro modo você terá que escolher outra)?"
 
 #: ../src/common/fontmap.cpp:426
 #, c-format
@@ -5118,7 +5112,7 @@ msgid ""
 msgstr ""
 "Nenhuma fonte para exibir o texto na codificação '%s' achada.\n"
 "Você gostaria de selecionar a fonte a ser usada para esta codificação?\n"
-"(de outro modo o texto nesta codificação não será mostrado corretamente)"
+"(de outro modo o texto nesta codificação não será mostrado corretamente)?"
 
 #: ../src/generic/animateg.cpp:142
 msgid "No handler found for animation type."
@@ -5355,9 +5349,8 @@ msgid "Opaci&ty:"
 msgstr "Opaci&dade:"
 
 #: ../src/generic/colrdlgg.cpp:354
-#, fuzzy
 msgid "Opacity:"
-msgstr "Opaci&dade:"
+msgstr "Opacidade:"
 
 #: ../src/common/docview.cpp:1773 ../src/common/docview.cpp:1815
 msgid "Open File"
@@ -5377,9 +5370,8 @@ msgid "Open..."
 msgstr "Abrir..."
 
 #: ../src/unix/glx11.cpp:506 ../src/msw/glcanvas.cpp:592
-#, fuzzy
 msgid "OpenGL 3.0 or later is not supported by the OpenGL driver."
-msgstr "O perfil do Núcleo do OpenGL não é suportado pelo driver do OpenGL."
+msgstr "OpenGL 3.0 ou superior não é suportado pelo driver do OpenGL."
 
 #: ../src/generic/dirctrlg.cpp:599 ../src/generic/dirdlgg.cpp:323
 #: ../src/generic/filectrlg.cpp:642 ../src/generic/filectrlg.cpp:786
@@ -5941,9 +5933,9 @@ msgid "Read error on file '%s'"
 msgstr "Erro de leitura no arquivo '%s'"
 
 #: ../src/common/secretstore.cpp:199
-#, fuzzy, c-format
+#, c-format
 msgid "Reading password for \"%s/%s\" failed: %s."
-msgstr "Falhou em criar %s \"%s\"."
+msgstr "Falhou em ler a senha do \"%s/%s\": %s."
 
 #: ../src/common/prntbase.cpp:272
 msgid "Ready"
@@ -5955,7 +5947,7 @@ msgstr "Vermelho"
 
 #: ../src/generic/colrdlgg.cpp:339
 msgid "Red:"
-msgstr ""
+msgstr "Vermelho:"
 
 #: ../src/common/stockitem.cpp:185 ../src/stc/stc_i18n.cpp:16
 msgid "Redo"
@@ -5993,17 +5985,17 @@ msgstr ""
 #: ../src/msw/registry.cpp:954
 #, c-format
 msgid "Registry value \"%s\" is not binary (but of type %s)"
-msgstr ""
+msgstr "O valor do registro \"%s\" não é binário (mas do tipo %s)"
 
 #: ../src/msw/registry.cpp:917
 #, c-format
 msgid "Registry value \"%s\" is not numeric (but of type %s)"
-msgstr ""
+msgstr "O valor do registro \"%s\" não é numérico (mas do tipo %s)"
 
 #: ../src/msw/registry.cpp:1003
 #, c-format
 msgid "Registry value \"%s\" is not text (but of type %s)"
-msgstr ""
+msgstr "O valor do registro \"%s\" não é de texto (mas do tipo %s)"
 
 #: ../src/msw/registry.cpp:521
 #, c-format
@@ -6133,7 +6125,7 @@ msgstr "Romano"
 #: ../src/generic/datavgen.cpp:5916
 #, c-format
 msgid "Row %i"
-msgstr ""
+msgstr "Fileira %i"
 
 #: ../src/richtext/richtextliststylepage.cpp:299
 #: ../src/richtext/richtextbulletspage.cpp:239
@@ -6178,9 +6170,9 @@ msgid "Save log contents to file"
 msgstr "Salvar os conteúdos do log num arquivo"
 
 #: ../src/common/secretstore.cpp:179
-#, fuzzy, c-format
+#, c-format
 msgid "Saving password for \"%s/%s\" failed: %s."
-msgstr "Falhou em criar %s \"%s\"."
+msgstr "Falhou em salvar a senha para o \"%s/%s\": %s."
 
 #: ../src/generic/fontdlgg.cpp:325
 msgid "Script"
@@ -6526,7 +6518,7 @@ msgstr "Estático"
 
 #: ../src/generic/prntdlgg.cpp:204
 msgid "Status:"
-msgstr "Status: "
+msgstr "Status:"
 
 #: ../src/common/stockitem.cpp:198
 msgid "Stop"
@@ -6801,11 +6793,11 @@ msgstr "As seguintes opções padrão do GTK+ também são suportadas:\n"
 
 #: ../src/generic/fontdlgg.cpp:414 ../src/generic/fontdlgg.cpp:416
 msgid "The font colour."
-msgstr "A côr da fonte"
+msgstr "A côr da fonte."
 
 #: ../src/generic/fontdlgg.cpp:375 ../src/generic/fontdlgg.cpp:377
 msgid "The font family."
-msgstr "A família da fonte"
+msgstr "A família da fonte."
 
 #: ../src/richtext/richtextsymboldlg.cpp:405
 #: ../src/richtext/richtextsymboldlg.cpp:407
@@ -7190,7 +7182,7 @@ msgstr "Margem superior (mm):"
 
 #: ../src/generic/aboutdlgg.cpp:79
 msgid "Translations by "
-msgstr "Traduções de"
+msgstr "Traduções de "
 
 #: ../src/generic/aboutdlgg.cpp:188
 msgid "Translators"
@@ -7334,9 +7326,9 @@ msgid "Unable to read from inotify descriptor"
 msgstr "Incapaz de ler do descritor do inotify"
 
 #: ../src/unix/fswatcher_inotify.cpp:141
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to remove inotify watch %i"
-msgstr "Incapaz de remover a observação do inotify"
+msgstr "Incapaz de remover a observação do inotify %i"
 
 #: ../src/unix/fswatcher_kqueue.cpp:153
 msgid "Unable to remove kqueue watch"
@@ -7387,7 +7379,7 @@ msgstr ""
 #: ../src/common/cmdline.cpp:1195
 #, c-format
 msgid "Unexpected parameter '%s'"
-msgstr "Parâmetro '%s' inesperado"
+msgstr "Parâmetro inesperado '%s'"
 
 #: ../include/wx/msw/private/fswatcher.h:148
 msgid "Unexpectedly new I/O completion port was created"
@@ -7638,7 +7630,7 @@ msgstr "Formato desconhecido dos dados da imagem."
 #: ../src/common/cmdline.cpp:914
 #, c-format
 msgid "Unknown long option '%s'"
-msgstr "Opção longa '%s' desconhecida"
+msgstr "Opção longa desconhecida '%s'"
 
 #: ../src/msw/ole/automtn.cpp:631
 msgid "Unknown name or named argument."
@@ -7647,7 +7639,7 @@ msgstr "Nome ou argumento nomeado desconhecido."
 #: ../src/common/cmdline.cpp:929 ../src/common/cmdline.cpp:951
 #, c-format
 msgid "Unknown option '%s'"
-msgstr "Opção '%s' desconhecida"
+msgstr "Opção desconhecida '%s'"
 
 #: ../src/common/mimecmn.cpp:225
 #, c-format
@@ -7671,7 +7663,7 @@ msgstr "Formato da área de transferência não suportado."
 #: ../src/common/appcmn.cpp:256
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "Tema '%s' não suportado"
+msgstr "Tema não suportado '%s'."
 
 #. TRANSLATORS: Name of keyboard key
 #: ../src/generic/fdrepdlg.cpp:152 ../src/common/stockitem.cpp:205
@@ -7731,7 +7723,7 @@ msgstr "O valor deve estar entre %s e %s."
 
 #: ../src/generic/aboutdlgg.cpp:128
 msgid "Version "
-msgstr "Versão"
+msgstr "Versão "
 
 #: ../src/richtext/richtextsizepage.cpp:291
 #: ../src/richtext/richtextsizepage.cpp:293
@@ -7922,7 +7914,7 @@ msgstr "XPM: Dados dos pixels mal formados!"
 #: ../src/common/xpmdecod.cpp:705
 #, c-format
 msgid "XPM: incorrect colour description in line %d"
-msgstr "XPM: descrição da côr incorreta na linha %d!"
+msgstr "XPM: descrição da côr incorreta na linha %d"
 
 #: ../src/common/xpmdecod.cpp:680
 msgid "XPM: incorrect header format!"
@@ -8072,7 +8064,7 @@ msgstr ""
 
 #: ../src/msw/dde.cpp:1156
 msgid "an internal call to the PostMessage function has failed. "
-msgstr "uma chamada interna para a função PostMessage falhou."
+msgstr "uma chamada interna para a função PostMessage falhou. "
 
 #: ../src/msw/dde.cpp:1165
 msgid "an internal error has occurred in the DDEML."
@@ -8243,7 +8235,7 @@ msgstr "não pode gravar o arquivo de configuração do usuário."
 #. TRANSLATORS: Checkbox state name
 #: ../src/generic/treelist.cpp:482 ../src/generic/datavgen.cpp:1261
 msgid "checked"
-msgstr ""
+msgstr "verificado"
 
 #: ../src/html/chm.cpp:345
 msgid "checksum error"
@@ -8364,9 +8356,8 @@ msgstr "falhou em dar descarga no arquivo '%s'"
 
 #. TRANSLATORS: Name of Boolean false value
 #: ../src/generic/datavgen.cpp:1030
-#, fuzzy
 msgid "false"
-msgstr "Falso"
+msgstr "falso"
 
 #: ../src/common/datetimefmt.cpp:1966
 msgid "fifteenth"
@@ -8377,29 +8368,29 @@ msgid "fifth"
 msgstr "quinto"
 
 #: ../src/common/fileconf.cpp:579
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %zu: '%s' ignored after group header."
-msgstr "arquivo '%s', linha %d: '%s' ignorado após o cabeçalho do grupo."
+msgstr "arquivo '%s', linha %zu: '%s' ignorado após o cabeçalho do grupo."
 
 #: ../src/common/fileconf.cpp:608
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %zu: '=' expected."
-msgstr "arquivo '%s', linha %d: '=' esperado."
+msgstr "arquivo '%s', linha %zu: '=' esperado."
 
 #: ../src/common/fileconf.cpp:631
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %zu: key '%s' was first found at line %d."
-msgstr "arquivo '%s', linha %d: chave '%s' foi achada primeiro na linha %d."
+msgstr "arquivo '%s', linha %zu: chave '%s' foi achada primeiro na linha %d."
 
 #: ../src/common/fileconf.cpp:621
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s', line %zu: value for immutable key '%s' ignored."
-msgstr "arquivo '%s', linha %d: valor para a chave imutável '%s' ignorado."
+msgstr "arquivo '%s', linha %zu: valor para a chave imutável '%s' ignorado."
 
 #: ../src/common/fileconf.cpp:543
-#, fuzzy, c-format
+#, c-format
 msgid "file '%s': unexpected character %c at line %zu."
-msgstr "arquivo '%s': caractere %c ineperado na linha %d."
+msgstr "arquivo '%s': caractere ineperado %c na linha %zu."
 
 #: ../src/richtext/richtextbuffer.cpp:8738
 msgid "files"
@@ -8770,7 +8761,7 @@ msgstr "tradutor-créditos"
 #. TRANSLATORS: Name of Boolean true value
 #: ../src/generic/datavgen.cpp:1028
 msgid "true"
-msgstr ""
+msgstr "verdadeiro"
 
 #: ../src/common/datetimefmt.cpp:1963
 msgid "twelfth"
@@ -8783,7 +8774,7 @@ msgstr "vigésimo"
 #. TRANSLATORS: Checkbox state name
 #: ../src/generic/treelist.cpp:486 ../src/generic/datavgen.cpp:1263
 msgid "unchecked"
-msgstr ""
+msgstr "não verificado"
 
 #: ../src/common/fontcmn.cpp:802 ../src/common/fontcmn.cpp:978
 msgid "underlined"
@@ -8791,9 +8782,8 @@ msgstr "sublinhado"
 
 #. TRANSLATORS: Checkbox state name
 #: ../src/generic/treelist.cpp:490
-#, fuzzy
 msgid "undetermined"
-msgstr "sublinhado"
+msgstr "não determinado"
 
 #: ../src/common/fileconf.cpp:1979
 #, c-format
@@ -8810,9 +8800,9 @@ msgid "unknown"
 msgstr "desconhecido"
 
 #: ../src/msw/registry.cpp:150
-#, fuzzy, c-format
+#, c-format
 msgid "unknown (%lu)"
-msgstr "desconhecido"
+msgstr "desconhecido (%lu)"
 
 #: ../src/common/xtixml.cpp:253
 #, c-format
@@ -8862,11 +8852,11 @@ msgstr "o wxGetTimeOfDay falhou."
 #: ../src/motif/app.cpp:242
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
-msgstr "O wxWidgets não pôde abrir a exibição pro '%s': saindo."
+msgstr "wxWidgets não pôde abrir a exibição pro '%s': saindo."
 
 #: ../src/x11/app.cpp:170
 msgid "wxWidgets could not open display. Exiting."
-msgstr "O wxWidgets não pôde abrir a exibição. Saindo."
+msgstr "wxWidgets não pôde abrir a exibição. Saindo."
 
 #: ../src/richtext/richtextsymboldlg.cpp:434
 msgid "xxxx"

From 3ae0ca9d0e47d253840349063f30efdd2427cadc Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 23 Mar 2018 21:50:39 +0100
Subject: [PATCH 437/916] CMake: Fix adding access and dll samples

---
 build/cmake/samples/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index bb0a87e23e..9e9146268b 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -7,7 +7,7 @@
 # Licence:     wxWindows licence
 #############################################################################
 
-wx_add_sample(access accesstest.cpp DEPENDS wxUSE_ACCESSBILITY)
+wx_add_sample(access accesstest.cpp DEPENDS wxUSE_ACCESSIBILITY)
 wx_add_sample(animate anitest.cpp anitest.h LIBRARIES adv DATA throbber.gif hourglass.ani DEPENDS wxUSE_ANIMATIONCTRL)
 wx_add_sample(archive CONSOLE)
 wx_add_sample(artprov arttest.cpp artbrows.cpp artbrows.h)
@@ -231,7 +231,7 @@ if(WIN32)
     # Windows only samples
 
     # DLL Sample
-    if(wxUSE_DYNLIBCLASS)
+    if(wxUSE_DYNLIB_CLASS)
         wx_add_sample(dll DLL my_dll.cpp my_dll.h NAME my_dll FOLDER dll
             DEFINITIONS MY_DLL_BUILDING)
         if(NOT wxBUILD_SHARED)

From e2ddc3e863fd38623eac8f5149ab8368bb62e703 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 23 Mar 2018 21:58:39 +0100
Subject: [PATCH 438/916] CMake: Fix GTK3 Win32 build

Add 'BEFORE' to target_include_directories so we include the headers
of the buildin third-party libraries before headers of third-party
libraries included in wxTOOLKIT_INCLUDE_DIRS.
---
 build/cmake/functions.cmake         | 2 +-
 build/cmake/lib/adv/CMakeLists.txt  | 6 +++++-
 build/cmake/lib/aui/CMakeLists.txt  | 2 +-
 build/cmake/lib/core/CMakeLists.txt | 9 +++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 9af05bd939..f699234816 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -378,7 +378,7 @@ macro(wx_lib_include_directories name)
         list(APPEND wxMONO_INCLUDE_DIRS_PUBLIC ${_LIB_INCLUDE_DIRS_PUBLIC})
         list(APPEND wxMONO_INCLUDE_DIRS_PRIVATE ${_LIB_INCLUDE_DIRS_PRIVATE})
     else()
-        target_include_directories(${name};${ARGN})
+        target_include_directories(${name};BEFORE;${ARGN})
     endif()
 endmacro()
 
diff --git a/build/cmake/lib/adv/CMakeLists.txt b/build/cmake/lib/adv/CMakeLists.txt
index 9db332822c..c653d82f55 100644
--- a/build/cmake/lib/adv/CMakeLists.txt
+++ b/build/cmake/lib/adv/CMakeLists.txt
@@ -18,7 +18,11 @@ if(WXMSW)
 elseif(WXOSX_COCOA)
     wx_append_sources(ADV_FILES ADVANCED_OSX_COCOA)
 elseif(WXGTK)
-    wx_append_sources(ADV_FILES ADVANCED_GTK2)
+    if(WXGTK2)
+        wx_append_sources(ADV_FILES ADVANCED_GTK2)
+    else()
+        wx_append_sources(ADV_FILES ADVANCED_GTK)
+    endif()
     wx_append_sources(ADV_FILES ADVANCED_GTK_NATIVE)
 endif()
 
diff --git a/build/cmake/lib/aui/CMakeLists.txt b/build/cmake/lib/aui/CMakeLists.txt
index ba369af670..1ce816a851 100644
--- a/build/cmake/lib/aui/CMakeLists.txt
+++ b/build/cmake/lib/aui/CMakeLists.txt
@@ -13,7 +13,7 @@ wx_append_sources(AUI_FILES AUI_CMN)
 
 if(WXMSW)
     wx_append_sources(AUI_FILES AUI_MSW)
-elseif(WXGTK)
+elseif(WXGTK2)
     wx_append_sources(AUI_FILES AUI_GTK)
 endif()
 
diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt
index 809b50b9b0..d9847854e2 100644
--- a/build/cmake/lib/core/CMakeLists.txt
+++ b/build/cmake/lib/core/CMakeLists.txt
@@ -25,8 +25,13 @@ if(WXMSW)
     wx_append_sources(CORE_SRC MSW)
     wx_append_sources(CORE_SRC MSW_DESKTOP)
 elseif(WXGTK)
-    wx_append_sources(CORE_SRC GTK2_LOWLEVEL)
-    wx_append_sources(CORE_SRC GTK2)
+    if(WXGTK2)
+        wx_append_sources(CORE_SRC GTK2_LOWLEVEL)
+        wx_append_sources(CORE_SRC GTK2)
+    else()
+        wx_append_sources(CORE_SRC GTK_LOWLEVEL)
+        wx_append_sources(CORE_SRC GTK)
+    endif()
 
     wx_append_sources(CORE_SRC XWIN_LOWLEVEL)
 elseif(WXOSX_COCOA)

From e4c0beac257b65bfc758e7cbd8d9a590937cba90 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 23 Mar 2018 21:59:38 +0100
Subject: [PATCH 439/916] CMake: Remove duplicate wxUSE_IMAGE option

---
 build/cmake/lib/core/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt
index d9847854e2..01edc85f35 100644
--- a/build/cmake/lib/core/CMakeLists.txt
+++ b/build/cmake/lib/core/CMakeLists.txt
@@ -9,8 +9,6 @@
 
 include(../../source_groups.cmake)
 
-wx_option(wxUSE_IMAGE "use wxImage class" ON)
-
 wx_append_sources(CORE_SRC GUI_CMN)
 wx_append_sources(CORE_SRC BASE_AND_GUI_CMN)
 if(WIN32)

From c103ab686c31bfde55b805dad24536c244119912 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 23 Mar 2018 22:00:29 +0100
Subject: [PATCH 440/916] CMake: Disable dialup sample in macOS

---
 build/cmake/options.cmake          | 7 ++++++-
 build/cmake/samples/CMakeLists.txt | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index b01db3261f..de515cea0c 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -101,7 +101,12 @@ wx_option(wxUSE_ON_FATAL_EXCEPTION "catch signals in wxApp::OnFatalException")
 wx_option(wxUSE_CMDLINE_PARSER "use wxCmdLineParser class")
 wx_option(wxUSE_DATETIME "use wxDateTime class")
 wx_option(wxUSE_DEBUGREPORT "use wxDebugReport class")
-wx_option(wxUSE_DIALUP_MANAGER "use dialup network classes")
+if(APPLE)
+    set(wxUSE_DIALUP_MANAGER_DEFAULT OFF)
+else()
+    set(wxUSE_DIALUP_MANAGER_DEFAULT ON)
+endif()
+wx_option(wxUSE_DIALUP_MANAGER "use dialup network classes" ${wxUSE_DIALUP_MANAGER_DEFAULT})
 wx_option(wxUSE_DYNLIB_CLASS "use wxLibrary class for DLL loading")
 wx_option(wxUSE_DYNAMIC_LOADER "use (new) wxDynamicLibrary class")
 wx_option(wxUSE_EXCEPTIONS "build exception-safe library")
diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index 9e9146268b..5916b03935 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -24,7 +24,7 @@ if(wxUSE_ON_FATAL_EXCEPTION AND (NOT WIN32 OR MSVC))
     wx_add_sample(debugrpt LIBRARIES qa DEPENDS wxUSE_DEBUGREPORT)
 endif()
 wx_add_sample(dialogs dialogs.cpp dialogs.h LIBRARIES adv DATA tips.txt)
-wx_add_sample(dialup nettest.cpp DEPENDS wxUSE_DIALUP_MANAGER)
+wx_add_sample(dialup nettest.cpp LIBRARIES net DEPENDS wxUSE_DIALUP_MANAGER)
 wx_add_sample(display DEPENDS wxUSE_DISPLAY)
 wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP)
 wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h

From bf30fa7490e2febcac152c404d357a11626e0143 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Mar 2018 19:14:52 +0100
Subject: [PATCH 441/916] Include required headers explicitly in the widgets
 sample

Don't rely on wx/treebook.h pulling in wx/treectrl.h and wx/textctrl.h,
forward declare or include the headers declaring the classes from these
headers explicitly where needed.
---
 samples/widgets/widgets.cpp | 1 +
 samples/widgets/widgets.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 90ac92a059..12e471fe26 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -49,6 +49,7 @@
 #include "wx/numdlg.h"
 #include "wx/textdlg.h"
 #include "wx/imaglist.h"
+#include "wx/treectrl.h"
 #include "wx/wupdlock.h"
 #include "wx/textcompleter.h"
 
diff --git a/samples/widgets/widgets.h b/samples/widgets/widgets.h
index b228fe110b..65d7708133 100644
--- a/samples/widgets/widgets.h
+++ b/samples/widgets/widgets.h
@@ -41,6 +41,7 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
 class WXDLLIMPEXP_FWD_CORE wxSizer;
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextEntryBase;
 class WXDLLIMPEXP_FWD_CORE WidgetsBookCtrl;
 
 class WidgetsPageInfo;

From 79170994fc65ae91746642fb3fad37fa5524c63a Mon Sep 17 00:00:00 2001
From: Trylz <trylzengine@outlook.com>
Date: Tue, 6 Mar 2018 16:15:31 -0500
Subject: [PATCH 442/916] Fix handling of second auxiliary mouse button events
 in wxMSW

The test for AUX2 mouse button was wrong and checked whether the button
was pressed, instead of checking whether the event was generated by it.

Check the event source correctly by comparing wParam with XBUTTON2 and
not MK_XBUTTON2.

Closes https://github.com/wxWidgets/wxWidgets/pull/753
---
 docs/changes.txt   | 1 +
 src/msw/window.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 423d79f114..d2b8473fc8 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -78,6 +78,7 @@ wxGTK:
 wxMSW:
 
 - Fix hang after clearing wxTAB_TRAVERSAL style on a window with children.
+- Fix handling of AUX2 mouse button events (Trylz).
 
 
 3.1.1: (released 2018-02-19)
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ca8fccb9da..113b3b715d 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -5547,7 +5547,7 @@ bool wxWindowMSW::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags)
         case WM_XBUTTONDOWN:
         case WM_XBUTTONUP:
         case WM_XBUTTONDBLCLK:
-            if ( flags & MK_XBUTTON2 )
+            if (HIWORD(flags) == XBUTTON2)
                 msg += wxEVT_AUX2_DOWN - wxEVT_AUX1_DOWN;
     }
 

From 6b859ce330180d373c7c3f2197fdc3e2c60f4dd4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Mar 2018 14:07:22 +0200
Subject: [PATCH 443/916] Use Last[Read/Write]Count() in socket stream
 operations

Using LastRead() was MT-unsafe when the same socket was used for both
writing and reading from different threads.

It's not clear if this change is sufficient to make wxSocket fully
MT-safe in this scenario, but it does help and there should be no
negative effects from doing this.

Closes #17787.

Closes https://github.com/wxWidgets/wxWidgets/pull/761
---
 docs/changes.txt       | 1 +
 src/common/sckstrm.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index d2b8473fc8..f69b03c2d3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -70,6 +70,7 @@ Changes in behaviour which may result in build errors
 All:
 
 - Make wxList and wxVector iterators conform to input iterator requirements.
+- Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
 
 wxGTK:
 
diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 8f64727d78..6146be5214 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -40,7 +40,7 @@ wxSocketOutputStream::~wxSocketOutputStream()
 
 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-    const size_t ret = m_o_socket->Write(buffer, size).LastCount();
+    const size_t ret = m_o_socket->Write(buffer, size).LastWriteCount();
     m_lasterror = m_o_socket->Error()
                     ? m_o_socket->IsClosed() ? wxSTREAM_EOF
                                              : wxSTREAM_WRITE_ERROR
@@ -63,7 +63,7 @@ wxSocketInputStream::~wxSocketInputStream()
 
 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-    const size_t ret = m_i_socket->Read(buffer, size).LastCount();
+    const size_t ret = m_i_socket->Read(buffer, size).LastReadCount();
     m_lasterror = m_i_socket->Error()
                     ? m_i_socket->IsClosed() ? wxSTREAM_EOF
                                              : wxSTREAM_READ_ERROR

From 677989bd8f3dca0b21c2ca62a913a811eaec2bc8 Mon Sep 17 00:00:00 2001
From: Danny Scott <doscott@gmail.com>
Date: Tue, 20 Mar 2018 19:46:24 -0300
Subject: [PATCH 444/916] Correct TDM and MinGW compiler descriptions in the
 release notes

Closes https://github.com/wxWidgets/wxWidgets/pull/765
---
 docs/release.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/release.md b/docs/release.md
index 89b2d403ce..ecbd298d2b 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -31,7 +31,7 @@ To verify your download please use the following SHA-1 checksums:
 We provide pre-built binary files for the following compilers:
 
 * Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0, 12.0, 14.0 and 14.1 (corresponding to marketing product names of Microsoft Visual Studio 2008, 2010, 2012, 2013, 2015 and 2017 respectively).
-* MinGW-TDM versions 5.1 and 7.2 (with the default SJLJ exceptions propagation method, using C++11). Please note that you need to use the very latest MinGW 7.2 compiler release with this version of the compiler which can be downloaded from [here for 32 bits](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/7.2.0/threads-win32/sjlj/i686-7.2.0-release-win32-sjlj-rt_v5-rev1.7z/download) and [here for 64 bits](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/7.2.0/threads-win32/seh/x86_64-7.2.0-release-win32-seh-rt_v5-rev1.7z/download), the older "rev0" release has a known bug affecting building wxWidgets in some scenarios.
+* TDM-GCC version 5.1 and MinGW-w64 version 7.2 (with the default SJLJ exceptions propagation method, using C++11). Please note that you need to use the very latest MinGW-w64 7.2 compiler release with this version of the compiler which can be downloaded from [here for 32 bits](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/7.2.0/threads-win32/sjlj/i686-7.2.0-release-win32-sjlj-rt_v5-rev1.7z/download) and [here for 64 bits](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/7.2.0/threads-win32/seh/x86_64-7.2.0-release-win32-seh-rt_v5-rev1.7z/download), the older "rev0" release has a known bug affecting building wxWidgets in some scenarios.
 
 ### For Developers
 

From 7612d1f6fa5cdb0056378f18496af11470114bba Mon Sep 17 00:00:00 2001
From: Max Maisel <max.maisel@posteo.de>
Date: Mon, 26 Mar 2018 16:50:32 +0200
Subject: [PATCH 445/916] wxRibbon: Added @since tags to new function
 documentation

---
 interface/wx/ribbon/art.h       |  2 ++
 interface/wx/ribbon/buttonbar.h | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/interface/wx/ribbon/art.h b/interface/wx/ribbon/art.h
index b233eb403b..055949e76a 100644
--- a/interface/wx/ribbon/art.h
+++ b/interface/wx/ribbon/art.h
@@ -983,6 +983,8 @@ public:
         @return Width of the given label text in pixel.
 
         @note This function only works with single-line strings.
+
+        @since 3.1.2
     */
     virtual wxCoord GetButtonBarButtonTextWidth(
                         wxDC& dc, const wxString& label,
diff --git a/interface/wx/ribbon/buttonbar.h b/interface/wx/ribbon/buttonbar.h
index f95455943b..9b18fba7ce 100644
--- a/interface/wx/ribbon/buttonbar.h
+++ b/interface/wx/ribbon/buttonbar.h
@@ -495,6 +495,8 @@ public:
             Small bitmap of the new button when it is disabled. If left as
             null, then a bitmap will be automatically generated from @a
             bitmap_small.
+
+        @since 3.1.2
     */
     virtual void SetButtonIcon(
                 int button_id,
@@ -518,6 +520,8 @@ public:
             after every change.
 
         @see SetButtonTextMinWidth
+
+        @since 3.1.2
     */
     virtual void SetButtonText(int button_id, const wxString& label);
 
@@ -543,6 +547,8 @@ public:
             button labels on the fly without modifying the button bar layout.
 
         @see SetButtonText()
+
+        @since 3.1.2
     */
     virtual void SetButtonTextMinWidth(int button_id,
                 int min_width_medium, int min_width_large);
@@ -565,6 +571,8 @@ public:
             button labels on the fly without modifying the button bar layout.
 
         @see SetButtonText()
+
+        @since 3.1.2
     */
     virtual void SetButtonTextMinWidth(int button_id, const wxString& label);
 
@@ -580,6 +588,8 @@ public:
             The minimum size-class of the button. Buttons on a button bar
             can have three distinct sizes: wxRIBBON_BUTTONBAR_BUTTON_SMALL,
             wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, and wxRIBBON_BUTTONBAR_BUTTON_LARGE.
+
+        @since 3.1.2
     */
     virtual void SetButtonMinSizeClass(int button_id,
                 wxRibbonButtonBarButtonState min_size_class);
@@ -596,6 +606,8 @@ public:
             The maximum size-class of the button. Buttons on a button bar
             can have three distinct sizes: wxRIBBON_BUTTONBAR_BUTTON_SMALL,
             wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, and wxRIBBON_BUTTONBAR_BUTTON_LARGE.
+
+        @since 3.1.2
     */
     virtual void SetButtonMaxSizeClass(int button_id,
                 wxRibbonButtonBarButtonState max_size_class);

From 41c4f4153c673e2be8dad9db2ab122663df295b1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Mar 2018 17:28:01 +0200
Subject: [PATCH 446/916] Use scope guard to ensure that free() is called in
 wxTLW code

No real changes, just make the code safer by ensuring that free() is
always called instead of doing it manually.
---
 src/msw/toplevel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 4c96e1c13c..d83406d831 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -38,6 +38,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/dynlib.h"
+#include "wx/scopeguard.h"
 #include "wx/tooltip.h"
 
 #include "wx/msw/private.h"
@@ -438,6 +439,8 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         // don't use DS_SETFONT we don't need the fourth WORD for the font)
         static const int dlgsize = sizeof(DLGTEMPLATE) + (sizeof(WORD) * 3);
         DLGTEMPLATE *dlgTemplate = (DLGTEMPLATE *)malloc(dlgsize);
+        wxON_BLOCK_EXIT1(free, dlgTemplate);
+
         memset(dlgTemplate, 0, dlgsize);
 
         // these values are arbitrary, they won't be used normally anyhow
@@ -470,7 +473,6 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
             dlgTemplate->style |= DS_MODALFRAME;
 
         ret = CreateDialog(dlgTemplate, title, pos, sizeReal);
-        free(dlgTemplate);
     }
     else // !dialog
     {

From 29a12aa846b4c065bcffd09ed8081440fd6fc003 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Mar 2018 17:30:38 +0200
Subject: [PATCH 447/916] Slightly simplify wxTopLevelWindowMSW::Create()

Don't use "ret" variable, we can avoid testing it if we just return
immediately in case of failure.
---
 src/msw/toplevel.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index d83406d831..1d525d50f1 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -421,8 +421,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     // non-TLW windows
     wxTopLevelWindows.Append(this);
 
-    bool ret = CreateBase(parent, id, pos, sizeReal, style, name);
-    if ( !ret )
+    if ( !CreateBase(parent, id, pos, sizeReal, style, name) )
         return false;
 
     if ( parent )
@@ -472,14 +471,16 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         if ( style & (wxRESIZE_BORDER | wxCAPTION) )
             dlgTemplate->style |= DS_MODALFRAME;
 
-        ret = CreateDialog(dlgTemplate, title, pos, sizeReal);
+        if ( !CreateDialog(dlgTemplate, title, pos, sizeReal) )
+            return false;
     }
     else // !dialog
     {
-        ret = CreateFrame(title, pos, sizeReal);
+        if ( !CreateFrame(title, pos, sizeReal) )
+            return false;
     }
 
-    if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) )
+    if ( !(GetWindowStyleFlag() & wxCLOSE_BOX) )
     {
         EnableCloseButton(false);
     }
@@ -488,12 +489,9 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     // itself but for custom windows we have to do it ourselves in order to
     // make the keyboard indicators (such as underlines for accelerators and
     // focus rectangles) work under Win2k+
-    if ( ret )
-    {
-        MSWUpdateUIState(UIS_INITIALIZE);
-    }
+    MSWUpdateUIState(UIS_INITIALIZE);
 
-    return ret;
+    return true;
 }
 
 wxTopLevelWindowMSW::~wxTopLevelWindowMSW()

From 95ba7a3ef2b6c648ea57ff5a6b695fff38558346 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Mar 2018 22:41:01 +0200
Subject: [PATCH 448/916] Remove redundant test for wxICONIZE in MSW
 wxMDIChildFrame

wxMINIMIZE and wxICONIZE are one and the same, so it's useless to test
for both of them.
---
 src/msw/mdi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 47f70e1790..b520a01bb0 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -876,7 +876,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
     msflags |= WS_THICKFRAME;
   if (style & wxSYSTEM_MENU)
     msflags |= WS_SYSMENU;
-  if ((style & wxMINIMIZE) || (style & wxICONIZE))
+  if (style & wxMINIMIZE)
     msflags |= WS_MINIMIZE;
   if (style & wxMAXIMIZE)
     msflags |= WS_MAXIMIZE;

From a0cc2366783083814ad78e8da4bfce936009edb2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 30 Mar 2018 22:37:23 +0200
Subject: [PATCH 449/916] Fix typo in a message in the archive sample

No real changes.
---
 samples/archive/archive.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/archive/archive.cpp b/samples/archive/archive.cpp
index 1707993d8d..f7cbfda4b2 100644
--- a/samples/archive/archive.cpp
+++ b/samples/archive/archive.cpp
@@ -214,7 +214,7 @@ int ArchiveApp::DoExtract()
         return 1;
 
     wxSharedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
-    wxPrintf("Extrating from: %s\n", m_archiveFileName);
+    wxPrintf("Extracting from: %s\n", m_archiveFileName);
     for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
          entry = archiveStream->GetNextEntry())
     {

From b9c10f215dc9024ceb2215cd8dbe9791cdc60d0d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 30 Mar 2018 22:38:03 +0200
Subject: [PATCH 450/916] Use wxScopedPtr<> instead of wxSharedPtr<> in archive
 sample

There is no need to use wxSharedPtr<> when ownership is not shared, use
simpler and overhead-free wxScopedPtr<> instead.
---
 samples/archive/archive.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/archive/archive.cpp b/samples/archive/archive.cpp
index f7cbfda4b2..74f23102c6 100644
--- a/samples/archive/archive.cpp
+++ b/samples/archive/archive.cpp
@@ -18,7 +18,7 @@
 #include "wx/app.h"
 #include "wx/cmdline.h"
 #include "wx/filename.h"
-#include "wx/sharedptr.h"
+#include "wx/scopedptr.h"
 #include "wx/vector.h"
 #include "wx/wfstream.h"
 #include "wx/zipstrm.h"
@@ -149,7 +149,7 @@ int ArchiveApp::DoCreate()
     }
 
     wxTempFileOutputStream fileOutputStream(m_archiveFileName);
-    wxSharedPtr<wxArchiveOutputStream> archiveOutputStream(m_archiveClassFactory->NewStream(fileOutputStream));
+    wxScopedPtr<wxArchiveOutputStream> archiveOutputStream(m_archiveClassFactory->NewStream(fileOutputStream));
     if (m_archiveClassFactory->GetProtocol().IsSameAs("zip", false) && m_forceZip64)
         reinterpret_cast<wxZipOutputStream*>(archiveOutputStream.get())->SetFormat(wxZIP_FORMAT_ZIP64);
 
@@ -184,7 +184,7 @@ int ArchiveApp::DoList()
     if (!fileInputStream.IsOk())
         return 1;
 
-    wxSharedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
+    wxScopedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
     wxPrintf("Archive: %s\n", m_archiveFileName);
     wxPrintf("Length     Date       Time     Name\n");
     wxPrintf("---------- ---------- -------- ----\n");
@@ -213,7 +213,7 @@ int ArchiveApp::DoExtract()
     if (!fileInputStream.IsOk())
         return 1;
 
-    wxSharedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
+    wxScopedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
     wxPrintf("Extracting from: %s\n", m_archiveFileName);
     for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
          entry = archiveStream->GetNextEntry())

From 36fe1e0f663016fb4c27759b9deecc04b5e4bea5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 30 Mar 2018 22:53:07 +0200
Subject: [PATCH 451/916] Initialize ArchiveApp members in ctor in the sample

No real changes, but initialize members of ArchiveApp class in its ctor
to avoid leaving them uninitialized.
---
 samples/archive/archive.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/samples/archive/archive.cpp b/samples/archive/archive.cpp
index 74f23102c6..f622ca1d99 100644
--- a/samples/archive/archive.cpp
+++ b/samples/archive/archive.cpp
@@ -26,6 +26,11 @@
 class ArchiveApp: public wxAppConsole
 {
 public:
+    ArchiveApp()
+    {
+        m_forceZip64 = false;
+        m_archiveClassFactory = NULL;
+    }
 
     virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
 

From 8de66bc753d1c894682a3fac870575eb70cee7d0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 31 Mar 2018 01:34:35 +0200
Subject: [PATCH 452/916] Add error checks when copying data in the archive
 sample

Errors when writing the output data in CopyStreamData() were not
detected.
---
 samples/archive/archive.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/samples/archive/archive.cpp b/samples/archive/archive.cpp
index f622ca1d99..0292be4d18 100644
--- a/samples/archive/archive.cpp
+++ b/samples/archive/archive.cpp
@@ -138,7 +138,14 @@ bool ArchiveApp::CopyStreamData(wxInputStream& inputStream, wxOutputStream& outp
         if (copiedData + readSize > size)
             readSize = size - copiedData;
         inputStream.Read(buf, readSize);
-        outputStream.Write(buf, readSize);
+        size_t actuallyRead = inputStream.LastRead();
+        outputStream.Write(buf, actuallyRead);
+        if (outputStream.LastWrite() != actuallyRead)
+        {
+            wxLogError("Failed to output data");
+            return false;
+        }
+
         copiedData += readSize;
     }
 
@@ -170,7 +177,8 @@ int ArchiveApp::DoCreate()
         }
         if (!archiveOutputStream->PutNextEntry(inputFileName.GetFullName(), wxDateTime::Now(), inputFileStream.GetLength()))
             break;
-        CopyStreamData(inputFileStream, *archiveOutputStream, inputFileStream.GetLength());
+        if (!CopyStreamData(inputFileStream, *archiveOutputStream, inputFileStream.GetLength()))
+            return 1;
     }
 
     if (archiveOutputStream->Close())
@@ -225,7 +233,8 @@ int ArchiveApp::DoExtract()
     {
         wxPrintf("Extracting: %s...\n", entry->GetName());
         wxTempFileOutputStream outputFileStream(entry->GetName());
-        CopyStreamData(*archiveStream, outputFileStream, entry->GetSize());
+        if (!CopyStreamData(*archiveStream, outputFileStream, entry->GetSize()))
+            return 1;
         outputFileStream.Commit();
     }
     wxPrintf("Extracted all files\n");

From 6da3c3c34d864a897d613a0099430899b96c9527 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 31 Mar 2018 01:35:55 +0200
Subject: [PATCH 453/916] Add support for using filter streams in the archive
 sample

Allow using wxZlib{Input,Output}Stream too, meaning that the sample can
now also work with .gz files, handling them as a degenerate (because
containing only a single file) special case of archives.

The changes here -- which should be viewed ignoring whitespace to be
actually readable -- don't modify the existing code and just add the
possibility to use a wxFilterClassFactory if there is no
wxArchiveClassFactory corresponding to the specified file extension.
---
 samples/archive/archive.cpp | 200 +++++++++++++++++++++++++-----------
 1 file changed, 141 insertions(+), 59 deletions(-)

diff --git a/samples/archive/archive.cpp b/samples/archive/archive.cpp
index 0292be4d18..afc26b1c39 100644
--- a/samples/archive/archive.cpp
+++ b/samples/archive/archive.cpp
@@ -30,6 +30,7 @@ public:
     {
         m_forceZip64 = false;
         m_archiveClassFactory = NULL;
+        m_filterClassFactory = NULL;
     }
 
     virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
@@ -61,7 +62,9 @@ private:
     wxVector<wxString> m_fileNames;
     bool m_forceZip64;
 
+    // At most one of these pointers is non-NULL.
     const wxArchiveClassFactory* m_archiveClassFactory;
+    const wxFilterClassFactory* m_filterClassFactory;
 
     int DoCreate();
 
@@ -81,6 +84,35 @@ const ArchiveApp::ArchiveCommandDesc ArchiveApp::s_cmdDesc[] =
     {CMD_NONE, 0, 0}
 };
 
+// Helper function iterating over all factories of the given type (assumed to
+// derive from wxFilterClassFactoryBase) and returning a string containing all
+// comma-separated values returned from their GetProtocols() called with the
+// given protocol type.
+template <typename T>
+void AppendAllSupportedOfType(wxString& all, wxStreamProtocolType type)
+{
+    for (const T* factory = T::GetFirst(); factory; factory = factory->GetNext())
+    {
+        const wxChar* const* exts = factory->GetProtocols(type);
+        while (*exts)
+        {
+            if (!all.empty())
+                all+= ", ";
+            all += *exts++;
+        }
+    }
+}
+
+// Returns all supported protocols or extensions (depending on the type
+// parameter value) for both archive and filter factories.
+wxString GetAllSupported(wxStreamProtocolType type)
+{
+    wxString all;
+    AppendAllSupportedOfType<wxArchiveClassFactory>(all, type);
+    AppendAllSupportedOfType<wxFilterClassFactory>(all, type);
+    return all;
+}
+
 void ArchiveApp::OnInitCmdLine(wxCmdLineParser& parser)
 {
     wxAppConsole::OnInitCmdLine(parser);
@@ -95,15 +127,7 @@ void ArchiveApp::OnInitCmdLine(wxCmdLineParser& parser)
     for (const ArchiveCommandDesc* cmdDesc = s_cmdDesc; cmdDesc->type != CMD_NONE; cmdDesc++)
         parser.AddUsageText(wxString::Format("  %s: %s", cmdDesc->id, cmdDesc->desc));
 
-    wxString formats;
-    for(const wxArchiveClassFactory* factory = wxArchiveClassFactory::GetFirst(); factory;
-        factory = factory->GetNext())
-    {
-        if(!formats.empty())
-            formats += ", ";
-        formats += factory->GetProtocol();
-    }
-    parser.AddUsageText("\nsupported formats: " + formats);
+    parser.AddUsageText("\nsupported formats: " + GetAllSupported(wxSTREAM_PROTOCOL));
 }
 
 bool ArchiveApp::OnCmdLineParsed(wxCmdLineParser& parser)
@@ -133,11 +157,12 @@ bool ArchiveApp::CopyStreamData(wxInputStream& inputStream, wxOutputStream& outp
     wxChar buf[128 * 1024];
     int readSize = 128 * 1024;
     wxFileOffset copiedData = 0;
-    while (copiedData < size)
+    for (;;)
     {
-        if (copiedData + readSize > size)
+        if (size != -1 && copiedData + readSize > size)
             readSize = size - copiedData;
         inputStream.Read(buf, readSize);
+
         size_t actuallyRead = inputStream.LastRead();
         outputStream.Write(buf, actuallyRead);
         if (outputStream.LastWrite() != actuallyRead)
@@ -146,7 +171,17 @@ bool ArchiveApp::CopyStreamData(wxInputStream& inputStream, wxOutputStream& outp
             return false;
         }
 
-        copiedData += readSize;
+        if (size == -1)
+        {
+            if (inputStream.Eof())
+                break;
+        }
+        else
+        {
+            copiedData += actuallyRead;
+            if (copiedData >= size)
+                break;
+        }
     }
 
     return true;
@@ -161,34 +196,53 @@ int ArchiveApp::DoCreate()
     }
 
     wxTempFileOutputStream fileOutputStream(m_archiveFileName);
-    wxScopedPtr<wxArchiveOutputStream> archiveOutputStream(m_archiveClassFactory->NewStream(fileOutputStream));
-    if (m_archiveClassFactory->GetProtocol().IsSameAs("zip", false) && m_forceZip64)
-        reinterpret_cast<wxZipOutputStream*>(archiveOutputStream.get())->SetFormat(wxZIP_FORMAT_ZIP64);
-
-    for(wxVector<wxString>::iterator fileName = m_fileNames.begin(); fileName != m_fileNames.end(); fileName++)
+    if (m_archiveClassFactory)
     {
-        wxFileName inputFileName(*fileName);
-        wxPrintf("Adding %s...\n", inputFileName.GetFullName());
-        wxFileInputStream inputFileStream(*fileName);
+        wxScopedPtr<wxArchiveOutputStream> archiveOutputStream(m_archiveClassFactory->NewStream(fileOutputStream));
+        if (m_archiveClassFactory->GetProtocol().IsSameAs("zip", false) && m_forceZip64)
+            reinterpret_cast<wxZipOutputStream*>(archiveOutputStream.get())->SetFormat(wxZIP_FORMAT_ZIP64);
+
+        for(wxVector<wxString>::iterator fileName = m_fileNames.begin(); fileName != m_fileNames.end(); fileName++)
+        {
+            wxFileName inputFileName(*fileName);
+            wxPrintf("Adding %s...\n", inputFileName.GetFullName());
+            wxFileInputStream inputFileStream(*fileName);
+            if (!inputFileStream.IsOk())
+            {
+                wxLogError("Could not open file");
+                return 1;
+            }
+            if (!archiveOutputStream->PutNextEntry(inputFileName.GetFullName(), wxDateTime::Now(), inputFileStream.GetLength()))
+                break;
+            if (!CopyStreamData(inputFileStream, *archiveOutputStream, inputFileStream.GetLength()))
+                return 1;
+        }
+
+        if (!archiveOutputStream->Close())
+            return 1;
+    }
+    else // use m_filterClassFactory
+    {
+        if (m_fileNames.size() != 1)
+        {
+            wxLogError("Filter-based formats only support archives consisting of a single file");
+            return -1;
+        }
+
+        wxScopedPtr<wxFilterOutputStream> filterOutputStream(m_filterClassFactory->NewStream(fileOutputStream));
+        wxFileInputStream inputFileStream(*m_fileNames.begin());
         if (!inputFileStream.IsOk())
         {
             wxLogError("Could not open file");
             return 1;
         }
-        if (!archiveOutputStream->PutNextEntry(inputFileName.GetFullName(), wxDateTime::Now(), inputFileStream.GetLength()))
-            break;
-        if (!CopyStreamData(inputFileStream, *archiveOutputStream, inputFileStream.GetLength()))
+        if (!CopyStreamData(inputFileStream, *filterOutputStream, inputFileStream.GetLength()))
             return 1;
     }
 
-    if (archiveOutputStream->Close())
-    {
-        fileOutputStream.Commit();
-        wxPrintf("Created archive\n");
-        return 0;
-    }
-    else
-        return 1;
+    fileOutputStream.Commit();
+    wxPrintf("Created archive\n");
+    return 0;
 }
 
 int ArchiveApp::DoList()
@@ -197,26 +251,35 @@ int ArchiveApp::DoList()
     if (!fileInputStream.IsOk())
         return 1;
 
-    wxScopedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
-    wxPrintf("Archive: %s\n", m_archiveFileName);
-    wxPrintf("Length     Date       Time     Name\n");
-    wxPrintf("---------- ---------- -------- ----\n");
-
-    wxFileOffset combinedSize = 0;
-    int entryCount = 0;
-    for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
-         entry = archiveStream->GetNextEntry())
+    if (m_archiveClassFactory)
     {
-        combinedSize += entry->GetSize();
-        entryCount++;
-        wxPrintf("%10lld %s %s %s\n",
-                 entry->GetSize(),
-                 entry->GetDateTime().FormatISODate(),
-                 entry->GetDateTime().FormatISOTime(),
-                 entry->GetName());
+        wxScopedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
+        wxPrintf("Archive: %s\n", m_archiveFileName);
+        wxPrintf("Length     Date       Time     Name\n");
+        wxPrintf("---------- ---------- -------- ----\n");
+
+        wxFileOffset combinedSize = 0;
+        int entryCount = 0;
+        for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
+             entry = archiveStream->GetNextEntry())
+        {
+            combinedSize += entry->GetSize();
+            entryCount++;
+            wxPrintf("%10lld %s %s %s\n",
+                     entry->GetSize(),
+                     entry->GetDateTime().FormatISODate(),
+                     entry->GetDateTime().FormatISOTime(),
+                     entry->GetName());
+        }
+        wxPrintf("----------                     -------\n");
+        wxPrintf("%10lld                     %d files\n", combinedSize, entryCount);
     }
-    wxPrintf("----------                     -------\n");
-    wxPrintf("%10lld                     %d files\n", combinedSize, entryCount);
+    else
+    {
+        wxPrintf("Archive \"%s\" contains a single file named \"%s\"\n",
+                 m_archiveFileName, wxFileName(m_archiveFileName).GetName());
+    }
+
     return 0;
 }
 
@@ -226,18 +289,32 @@ int ArchiveApp::DoExtract()
     if (!fileInputStream.IsOk())
         return 1;
 
-    wxScopedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
-    wxPrintf("Extracting from: %s\n", m_archiveFileName);
-    for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
-         entry = archiveStream->GetNextEntry())
+    if (m_archiveClassFactory)
     {
-        wxPrintf("Extracting: %s...\n", entry->GetName());
-        wxTempFileOutputStream outputFileStream(entry->GetName());
-        if (!CopyStreamData(*archiveStream, outputFileStream, entry->GetSize()))
+        wxScopedPtr<wxArchiveInputStream> archiveStream(m_archiveClassFactory->NewStream(fileInputStream));
+        wxPrintf("Extracting from: %s\n", m_archiveFileName);
+        for (wxArchiveEntry* entry = archiveStream->GetNextEntry(); entry;
+             entry = archiveStream->GetNextEntry())
+        {
+            wxPrintf("Extracting: %s...\n", entry->GetName());
+            wxTempFileOutputStream outputFileStream(entry->GetName());
+            if (!CopyStreamData(*archiveStream, outputFileStream, entry->GetSize()))
+                return 1;
+            outputFileStream.Commit();
+        }
+        wxPrintf("Extracted all files\n");
+    }
+    else
+    {
+        wxScopedPtr<wxFilterInputStream> filterStream(m_filterClassFactory->NewStream(fileInputStream));
+        wxPrintf("Extracting single file from: %s\n", m_archiveFileName);
+        wxTempFileOutputStream outputFileStream(wxFileName(m_archiveFileName).GetName());
+        if (!CopyStreamData(*filterStream, outputFileStream, -1))
             return 1;
         outputFileStream.Commit();
+        wxPrintf("Extracted successfully\n");
     }
-    wxPrintf("Extracted all files\n");
+
     return 0;
 }
 
@@ -246,8 +323,13 @@ int ArchiveApp::OnRun()
     m_archiveClassFactory = wxArchiveClassFactory::Find(m_archiveFileName, wxSTREAM_FILEEXT);
     if (!m_archiveClassFactory)
     {
-        wxLogError("Unsupported file format");
-        return -1;
+        m_filterClassFactory = wxFilterClassFactory::Find(m_archiveFileName, wxSTREAM_FILEEXT);
+        if (!m_filterClassFactory)
+        {
+            wxLogError("File \"%s\" has unsupported extension, supported ones are: %s",
+                       m_archiveFileName, GetAllSupported(wxSTREAM_FILEEXT));
+            return -1;
+        }
     }
 
     int result = -1;

From bb492b99bd969629a52235fb8abbeb88d487a93a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Mar 2018 19:21:57 +0100
Subject: [PATCH 454/916] Don't include wx/treectrl.h from wx/treebook.h any
 more

Remove an unnecessary header dependency. This is not completely
backwards-compatible as it would break any code relying on getting e.g.
wxTextCtrl declaration after including wx/treebook.h, but, hopefully,
there shouldn't be that much such code out there and fixing it shouldn't
be difficult.

If either of these assumptions turns out to be false, this commit can
always be reverted later.
---
 docs/changes.txt      | 3 +++
 include/wx/treebook.h | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 423d79f114..1335498ddd 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -63,6 +63,9 @@ Changes in behaviour which may result in build errors
   This only affects code defining its own custom renderers, code just using
   wxGraphicsContext::CreatePen() continues to compile and work as before.
 
+- wx/treebook.h doesn't include wx/treectrl.h (and, via it, wx/textctrl.h) any
+  more, include these headers explicitly from your code if necessary.
+
 
 3.1.2: (released 2018-??-??)
 ----------------------------
diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index 8661349c78..9e93d9cb2a 100644
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -17,10 +17,11 @@
 
 #include "wx/bookctrl.h"
 #include "wx/containr.h"
-#include "wx/treectrl.h"        // for wxArrayTreeItemIds
+#include "wx/treebase.h"        // for wxTreeItemId
 
 typedef wxWindow wxTreebookPage;
 
+class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
 class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
 
 // ----------------------------------------------------------------------------

From 058c085b21ff69225bdbc88f5553c2d824a129ce Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Mar 2018 19:18:29 +0100
Subject: [PATCH 455/916] Use wxVector<> in wxTreebookPage implementation

No real changes, just replace the use of a macro-based array with
wxVector<>.
---
 include/wx/treebook.h   |  5 +++--
 src/generic/treebkg.cpp | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index 9e93d9cb2a..abc95a87bc 100644
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -18,6 +18,7 @@
 #include "wx/bookctrl.h"
 #include "wx/containr.h"
 #include "wx/treebase.h"        // for wxTreeItemId
+#include "wx/vector.h"
 
 typedef wxWindow wxTreebookPage;
 
@@ -150,7 +151,7 @@ protected:
     void OnTreeNodeExpandedCollapsed(wxTreeEvent& event);
 
     // array of page ids and page windows
-    wxArrayTreeItemIds m_treeIds;
+    wxVector<wxTreeItemId> m_treeIds;
 
     // in the situation when m_selection page is not wxNOT_FOUND but page is
     // NULL this is the first (sub)child that has a non-NULL page
@@ -217,7 +218,7 @@ private:
 
     // Returns internal number of pages which can be different from
     // GetPageCount() while performing a page insertion or removal.
-    size_t DoInternalGetPageCount() const { return m_treeIds.GetCount(); }
+    size_t DoInternalGetPageCount() const { return m_treeIds.size(); }
 
 
     wxDECLARE_EVENT_TABLE();
diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 7e3599564d..85d7158c93 100644
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -32,6 +32,7 @@
 #endif
 
 #include "wx/imaglist.h"
+#include "wx/treectrl.h"
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
@@ -140,7 +141,7 @@ bool wxTreebook::InsertSubPage(size_t pagePos,
 bool wxTreebook::AddPage(wxWindow *page, const wxString& text, bool bSelect,
                          int imageId)
 {
-    return DoInsertPage(m_treeIds.GetCount(), page, text, bSelect, imageId);
+    return DoInsertPage(m_treeIds.size(), page, text, bSelect, imageId);
 }
 
 // insertion time is linear to the number of top-pages
@@ -312,7 +313,7 @@ wxTreebookPage *wxTreebook::DoRemovePage(size_t pagePos)
 bool wxTreebook::DeleteAllPages()
 {
     wxBookCtrlBase::DeleteAllPages();
-    m_treeIds.Clear();
+    m_treeIds.clear();
     m_selection =
     m_actualSelection = wxNOT_FOUND;
 
@@ -326,20 +327,20 @@ void wxTreebook::DoInternalAddPage(size_t newPos,
                                    wxTreebookPage *page,
                                    wxTreeItemId pageId)
 {
-    wxASSERT_MSG( newPos <= m_treeIds.GetCount(), wxT("Ivalid index passed to wxTreebook::DoInternalAddPage") );
+    wxASSERT_MSG( newPos <= m_treeIds.size(), wxT("Ivalid index passed to wxTreebook::DoInternalAddPage") );
 
     // hide newly inserted page initially (it will be shown when selected)
     if ( page )
         page->Hide();
 
-    if ( newPos == m_treeIds.GetCount() )
+    if ( newPos == m_treeIds.size() )
     {
         // append
-        m_treeIds.Add(pageId);
+        m_treeIds.push_back(pageId);
     }
     else // insert
     {
-        m_treeIds.Insert(pageId, newPos);
+        m_treeIds.insert(m_treeIds.begin() + newPos, pageId);
 
         if ( m_selection != wxNOT_FOUND && newPos <= (size_t)m_selection )
         {
@@ -361,12 +362,13 @@ void wxTreebook::DoInternalRemovePageRange(size_t pagePos, size_t subCount)
     // Attention: this function is only for a situation when we delete a node
     // with all its children so pagePos is the node's index and subCount is the
     // node children count
-    wxASSERT_MSG( pagePos + subCount < m_treeIds.GetCount(),
+    wxASSERT_MSG( pagePos + subCount < m_treeIds.size(),
                     wxT("Ivalid page index") );
 
     wxTreeItemId pageId = m_treeIds[pagePos];
 
-    m_treeIds.RemoveAt(pagePos, subCount + 1);
+    wxVector<wxTreeItemId>::iterator itPos = m_treeIds.begin() + pagePos;
+    m_treeIds.erase(itPos, itPos + subCount + 1);
 
     if ( m_selection != wxNOT_FOUND )
     {
@@ -454,7 +456,7 @@ void wxTreebook::DoUpdateSelection(bool bSelect, int newPos)
 
 wxTreeItemId wxTreebook::DoInternalGetPage(size_t pagePos) const
 {
-    if ( pagePos >= m_treeIds.GetCount() )
+    if ( pagePos >= m_treeIds.size() )
     {
         // invalid position but ok here, in this internal function, don't assert
         // (the caller will do it)
@@ -466,7 +468,7 @@ wxTreeItemId wxTreebook::DoInternalGetPage(size_t pagePos) const
 
 int wxTreebook::DoInternalFindPageById(wxTreeItemId pageId) const
 {
-    const size_t count = m_treeIds.GetCount();
+    const size_t count = m_treeIds.size();
     for ( size_t i = 0; i < count; ++i )
     {
         if ( m_treeIds[i] == pageId )

From 966dc44c7273791cc2dfdcbbc2b7090ceafcddd0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Mar 2018 19:41:18 +0100
Subject: [PATCH 456/916] Slightly simplify wxBookCtrlBase::DoSetSelection()

No real changes, just simplify the check for whether the page change is
allowed: we can assume it is by default, which means we don't have to
test for SetSelection_SendEvent twice.
---
 src/common/bookctrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 25498b0fa4..969ae07a70 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -479,7 +479,7 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
     if ( n != (size_t)oldSel )
     {
         wxBookCtrlEvent *event = CreatePageChangingEvent();
-        bool allowed = false;
+        bool allowed = true;
 
         if ( flags & SetSelection_SendEvent )
         {
@@ -490,7 +490,7 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
             allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed();
         }
 
-        if ( !(flags & SetSelection_SendEvent) || allowed)
+        if ( allowed )
         {
             if ( oldSel != wxNOT_FOUND )
                 DoShowPage(m_pages[oldSel], false);

From a3d0748a76c9181b3e0fd88e938f9796db7c121c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Mar 2018 23:54:29 +0100
Subject: [PATCH 457/916] Fix typo in wxTreebook assert messages

Fix recurring typo in "Invalid".

No real changes.
---
 src/generic/treebkg.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 85d7158c93..5146bd7be2 100644
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -327,7 +327,8 @@ void wxTreebook::DoInternalAddPage(size_t newPos,
                                    wxTreebookPage *page,
                                    wxTreeItemId pageId)
 {
-    wxASSERT_MSG( newPos <= m_treeIds.size(), wxT("Ivalid index passed to wxTreebook::DoInternalAddPage") );
+    wxASSERT_MSG( newPos <= m_treeIds.size(),
+                  wxT("Invalid index passed to wxTreebook::DoInternalAddPage") );
 
     // hide newly inserted page initially (it will be shown when selected)
     if ( page )
@@ -363,7 +364,7 @@ void wxTreebook::DoInternalRemovePageRange(size_t pagePos, size_t subCount)
     // with all its children so pagePos is the node's index and subCount is the
     // node children count
     wxASSERT_MSG( pagePos + subCount < m_treeIds.size(),
-                    wxT("Ivalid page index") );
+                    wxT("Invalid page index") );
 
     wxTreeItemId pageId = m_treeIds[pagePos];
 

From af6a61e3a03f2f4f71a0a227ab2f984deb5be699 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Mar 2018 00:07:00 +0100
Subject: [PATCH 458/916] Update wxBookCtrlBase::m_selection outside
 UpdateSelectedPage()

Change m_selection in wxBookCtrlBase::DoSetSelection() itself instead of
requiring all the derived class overriding do it in their overridden
UpdateSelectedPage().

No real changes, this is just a small simplification.
---
 include/wx/choicebk.h   | 3 +--
 include/wx/simplebook.h | 5 +++--
 src/common/bookctrl.cpp | 1 +
 src/generic/listbkg.cpp | 1 -
 src/generic/toolbkg.cpp | 1 -
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index f32e8d3a0d..aca809932d 100644
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -86,8 +86,7 @@ protected:
 
     void UpdateSelectedPage(size_t newsel) wxOVERRIDE
     {
-        m_selection = static_cast<int>(newsel);
-        GetChoiceCtrl()->Select(m_selection);
+        GetChoiceCtrl()->Select(newsel);
     }
 
     wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE;
diff --git a/include/wx/simplebook.h b/include/wx/simplebook.h
index 7e819700fc..fa859d3044 100644
--- a/include/wx/simplebook.h
+++ b/include/wx/simplebook.h
@@ -155,9 +155,10 @@ public:
     }
 
 protected:
-    virtual void UpdateSelectedPage(size_t newsel) wxOVERRIDE
+    virtual void UpdateSelectedPage(size_t WXUNUSED(newsel)) wxOVERRIDE
     {
-        m_selection = (int)newsel;
+        // Nothing to do here, but must be overridden to avoid the assert in
+        // the base class version.
     }
 
     virtual wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE
diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index 969ae07a70..e027fd9052 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -500,6 +500,7 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
             DoShowPage(page, true);
 
             // change selection now to ignore the selection change event
+            m_selection = n;
             UpdateSelectedPage(n);
 
             if ( flags & SetSelection_SendEvent )
diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index a7f9229d5e..93084375a1 100644
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -293,7 +293,6 @@ void wxListbook::SetImageList(wxImageList *imageList)
 
 void wxListbook::UpdateSelectedPage(size_t newsel)
 {
-    m_selection = newsel;
     GetListView()->Select(newsel);
     GetListView()->Focus(newsel);
 }
diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 40ea3a99c2..07cd9fa962 100644
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -197,7 +197,6 @@ void wxToolbook::MakeChangedEvent(wxBookCtrlEvent &event)
 
 void wxToolbook::UpdateSelectedPage(size_t newsel)
 {
-    m_selection = newsel;
     GetToolBar()->ToggleTool(newsel + 1, true);
 }
 

From 02a92e23f35fe183901273ddfca2d6d604b921da Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Mar 2018 00:13:15 +0100
Subject: [PATCH 459/916] Reuse wxBookCtrlBase::DoSetSelection() in wxTreebook
 too

Avoid duplicating base class DoSetSelection() implementation in
wxTreebook, just extend it slightly by using DoGetNonNullPage() to allow
using a (sub-)page if the page associated to the selected item is null
and reuse it.

Also get rid of wxTreebook::m_actualSelection, it seems completely
unnecessary to bother keeping and updating it when we can just find it
whenever we need (which actually seems to only have been the case in the
now removed DoSetSelection() implementation anyhow).

As a side effect of this, wxTreebook pages should now be sizer correctly
when switching to them as DoSetSelection() in the base class does call
SetSize() on the page before showing it, unlike the previously used
version in wxTreebook, which omitted this call for some reason.

There should be no other user-visible changes.

Closes #4379.
---
 include/wx/bookctrl.h   |   6 ++
 include/wx/treebook.h   |  24 ++-----
 src/common/bookctrl.cpp |  13 +++-
 src/generic/treebkg.cpp | 139 +++++++++-------------------------------
 4 files changed, 53 insertions(+), 129 deletions(-)

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index aad4834a55..963de7a91a 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -292,6 +292,12 @@ protected:
     // having nodes without any associated page)
     virtual bool AllowNullPage() const { return false; }
 
+    // For classes that allow null pages, we also need a way to find the
+    // closest non-NULL page corresponding to the given index, e.g. the first
+    // leaf item in wxTreebook tree and this method must be overridden to
+    // return it if AllowNullPage() is overridden.
+    virtual wxWindow *DoGetNonNullPage(size_t page) { return m_pages[page]; }
+
     // Remove the page and return a pointer to it.
     //
     // It also needs to update the current selection if necessary, i.e. if the
diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index abc95a87bc..119eb7dddd 100644
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -38,7 +38,6 @@ public:
     // Default ctor doesn't create the control, use Create() afterwards
     wxTreebook()
     {
-        Init();
     }
 
     // This ctor creates the tree book control
@@ -49,8 +48,6 @@ public:
                long style = wxBK_DEFAULT,
                const wxString& name = wxEmptyString)
     {
-        Init();
-
         (void)Create(parent, id, pos, size, style, name);
     }
 
@@ -145,22 +142,16 @@ protected:
 
     // This subclass of wxBookCtrlBase accepts NULL page pointers (empty pages)
     virtual bool AllowNullPage() const wxOVERRIDE { return true; }
+    virtual wxWindow *DoGetNonNullPage(size_t page) wxOVERRIDE;
 
     // event handlers
     void OnTreeSelectionChange(wxTreeEvent& event);
     void OnTreeNodeExpandedCollapsed(wxTreeEvent& event);
 
-    // array of page ids and page windows
+    // array of tree item ids corresponding to the page indices
     wxVector<wxTreeItemId> m_treeIds;
 
-    // in the situation when m_selection page is not wxNOT_FOUND but page is
-    // NULL this is the first (sub)child that has a non-NULL page
-    int m_actualSelection;
-
 private:
-    // common part of all constructors
-    void Init();
-
     // The real implementations of page insertion functions
     // ------------------------------------------------------
     // All DoInsert/Add(Sub)Page functions add the page into :
@@ -182,12 +173,11 @@ private:
                          bool bSelect = false,
                          int imageId = NO_IMAGE);
 
-    // Sets selection in the tree control and updates the page being shown.
-    int DoSetSelection(size_t pos, int flags = 0) wxOVERRIDE;
-
-    // Returns currently shown page. In a case when selected the node
-    // has empty (NULL) page finds first (sub)child with not-empty page.
-    wxTreebookPage *DoGetCurrentPage() const;
+    // Overridden methods used by the base class DoSetSelection()
+    // implementation.
+    void UpdateSelectedPage(size_t newsel) wxOVERRIDE;
+    wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE;
+    void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE;
 
     // Does the selection update. Called from page insertion functions
     // to update selection if the selected page was pushed by the newly inserted
diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index e027fd9052..c2dde5fcfe 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -493,9 +493,9 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
         if ( allowed )
         {
             if ( oldSel != wxNOT_FOUND )
-                DoShowPage(m_pages[oldSel], false);
+                DoShowPage(DoGetNonNullPage(oldSel), false);
 
-            wxWindow *page = m_pages[n];
+            wxWindow* const page = DoGetNonNullPage(n);
             page->SetSize(GetPageRect());
             DoShowPage(page, true);
 
@@ -510,6 +510,15 @@ int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
                 (void)GetEventHandler()->ProcessEvent(*event);
             }
         }
+        else
+        {
+            // Selection in the control might have already had changed.
+            if ( oldSel != wxNOT_FOUND )
+            {
+                m_selection = oldSel;
+                UpdateSelectedPage(oldSel);
+            }
+        }
 
         delete event;
     }
diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 5146bd7be2..0abc57f62c 100644
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -66,12 +66,6 @@ wxEND_EVENT_TABLE()
 // wxTreebook creation
 // ----------------------------------------------------------------------------
 
-void wxTreebook::Init()
-{
-    m_selection =
-    m_actualSelection = wxNOT_FOUND;
-}
-
 bool
 wxTreebook::Create(wxWindow *parent,
                    wxWindowID id,
@@ -314,8 +308,6 @@ bool wxTreebook::DeleteAllPages()
 {
     wxBookCtrlBase::DeleteAllPages();
     m_treeIds.clear();
-    m_selection =
-    m_actualSelection = wxNOT_FOUND;
 
     wxTreeCtrl *tree = GetTreeCtrl();
     tree->DeleteChildren(tree->GetRootItem());
@@ -347,13 +339,6 @@ void wxTreebook::DoInternalAddPage(size_t newPos,
         {
             // selection has been moved one unit toward the end
             ++m_selection;
-            if ( m_actualSelection != wxNOT_FOUND )
-                ++m_actualSelection;
-        }
-        else if ( m_actualSelection != wxNOT_FOUND &&
-                    newPos <= (size_t)m_actualSelection )
-        {
-            DoSetSelection(m_selection);
         }
     }
 }
@@ -377,10 +362,6 @@ void wxTreebook::DoInternalRemovePageRange(size_t pagePos, size_t subCount)
         {
             // selection is far after the deleted page, so just update the index and move on
             m_selection -= 1 + subCount;
-            if ( m_actualSelection != wxNOT_FOUND)
-            {
-                m_actualSelection -= subCount + 1;
-            }
         }
         else if ( (size_t)m_selection >= pagePos )
         {
@@ -391,7 +372,6 @@ void wxTreebook::DoInternalRemovePageRange(size_t pagePos, size_t subCount)
             wxTreeItemId nodeId = tree->GetNextSibling(pageId);
 
             m_selection = wxNOT_FOUND;
-            m_actualSelection = wxNOT_FOUND;
 
             if ( nodeId.IsOk() )
             {
@@ -413,17 +393,6 @@ void wxTreebook::DoInternalRemovePageRange(size_t pagePos, size_t subCount)
                 }
             }
         }
-        else if ( m_actualSelection != wxNOT_FOUND &&
-                    (size_t)m_actualSelection >= pagePos )
-        {
-            // nothing to do -- selection is before the deleted node, but
-            // actually shown page (the first (sub)child with page != NULL) is
-            // already deleted
-            m_actualSelection = m_selection;
-
-            // send event as documented
-            DoSetSelection(m_selection, SetSelection_SendEvent);
-        }
         //else: nothing to do -- selection is before the deleted node
     }
     else
@@ -558,91 +527,41 @@ bool wxTreebook::SetPageImage(size_t n, int imageId)
     return true;
 }
 
-int wxTreebook::DoSetSelection(size_t pagePos, int flags)
+void wxTreebook::UpdateSelectedPage(size_t newsel)
 {
-    wxCHECK_MSG( IS_VALID_PAGE(pagePos), wxNOT_FOUND,
-                 wxT("invalid page index in wxListbook::DoSetSelection()") );
-    wxASSERT_MSG( GetPageCount() == DoInternalGetPageCount(),
-                  wxT("wxTreebook logic error: m_treeIds and m_pages not in sync!"));
-
-    wxBookCtrlEvent event(wxEVT_TREEBOOK_PAGE_CHANGING, m_windowId);
-    const int oldSel = m_selection;
-    wxTreeCtrl *tree = GetTreeCtrl();
-    bool allowed = false;
-
-    if (flags & SetSelection_SendEvent)
-    {
-        event.SetEventObject(this);
-        event.SetSelection(pagePos);
-        event.SetOldSelection(m_selection);
-
-        // don't send the event if the old and new pages are the same; do send it
-        // otherwise and be prepared for it to be vetoed
-        allowed = (int)pagePos == m_selection ||
-                  !GetEventHandler()->ProcessEvent(event) ||
-                  event.IsAllowed();
-    }
-
-    if ( !(flags & SetSelection_SendEvent) || allowed )
-    {
-        // hide the previously shown page
-        wxTreebookPage * const oldPage = DoGetCurrentPage();
-        if ( oldPage )
-            oldPage->Hide();
-
-        // then show the new one
-        m_selection = pagePos;
-        wxTreebookPage *page = wxBookCtrlBase::GetPage(m_selection);
-        if ( !page )
-        {
-            // find the next page suitable to be shown: the first (grand)child
-            // of this one with a non-NULL associated page
-            wxTreeItemId childId = m_treeIds[pagePos];
-            int actualPagePos = pagePos;
-            while ( !page && childId.IsOk() )
-            {
-                wxTreeItemIdValue cookie;
-                childId = tree->GetFirstChild( childId, cookie );
-                if ( childId.IsOk() )
-                {
-                    page = wxBookCtrlBase::GetPage(++actualPagePos);
-                }
-            }
-
-            m_actualSelection = page ? actualPagePos : m_selection;
-        }
-
-        if ( page )
-            page->Show();
-
-        tree->SelectItem(DoInternalGetPage(pagePos));
-
-        if (flags & SetSelection_SendEvent)
-        {
-            // notify about the (now completed) page change
-            event.SetEventType(wxEVT_TREEBOOK_PAGE_CHANGED);
-            (void)GetEventHandler()->ProcessEvent(event);
-        }
-    }
-    else if ( (flags & SetSelection_SendEvent) && !allowed) // page change vetoed
-    {
-        // tree selection might have already had changed
-        if ( oldSel != wxNOT_FOUND )
-            tree->SelectItem(DoInternalGetPage(oldSel));
-    }
-
-    return oldSel;
+    GetTreeCtrl()->SelectItem(DoInternalGetPage(newsel));
 }
 
-wxTreebookPage *wxTreebook::DoGetCurrentPage() const
+wxBookCtrlEvent* wxTreebook::CreatePageChangingEvent() const
 {
-    if ( m_selection == wxNOT_FOUND )
-        return NULL;
+    return new wxBookCtrlEvent(wxEVT_TREEBOOK_PAGE_CHANGING, m_windowId);
+}
 
-    wxTreebookPage *page = wxBookCtrlBase::GetPage(m_selection);
-    if ( !page && m_actualSelection != wxNOT_FOUND )
+void wxTreebook::MakeChangedEvent(wxBookCtrlEvent &event)
+{
+    event.SetEventType(wxEVT_TREEBOOK_PAGE_CHANGED);
+}
+
+wxWindow *wxTreebook::DoGetNonNullPage(size_t n)
+{
+    wxWindow* page = wxBookCtrlBase::GetPage(n);
+
+    if ( !page )
     {
-        page = wxBookCtrlBase::GetPage(m_actualSelection);
+        // Find the next suitable page, i.e. the first (grand)child
+        // of this one with a non-NULL associated page
+        wxTreeCtrl* const tree = GetTreeCtrl();
+        for ( wxTreeItemId childId = m_treeIds[n]; childId.IsOk(); )
+        {
+            wxTreeItemIdValue cookie;
+            childId = tree->GetFirstChild( childId, cookie );
+            if ( childId.IsOk() )
+            {
+                page = wxBookCtrlBase::GetPage(++n);
+                if ( page )
+                    break;
+            }
+        }
     }
 
     return page;

From 96f9a1289878570e3d5104252d6da660f11d8459 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Mar 2018 00:19:57 +0100
Subject: [PATCH 460/916] Stop resizing widgets sample pages when first showing
 them

The size of wxBookCtrl pages is determined by wxBookCtrl and can't be
changed, yet the sample tried to do it, making them larger than the
actually available space and cutting them off as the result.

Just stop doing this and simply layout the page using the available
space -- if there is not enough of it, that's too bad, but the user can
always resize the main window in this case.

See #4379.
---
 samples/widgets/widgets.cpp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 12e471fe26..2b5dfe9082 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -724,20 +724,7 @@ void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
     {
         wxWindowUpdateLocker noUpdates(curPage);
         curPage->CreateContent();
-        //curPage->Layout();
-        curPage->GetSizer()->Fit(curPage);
-
-        WidgetsBookCtrl *book = wxStaticCast(curPage->GetParent(), WidgetsBookCtrl);
-        wxSize size;
-        for ( size_t i = 0; i < book->GetPageCount(); ++i )
-        {
-            wxWindow *page = book->GetPage(i);
-            if ( page )
-            {
-                size.IncTo(page->GetSize());
-            }
-        }
-        curPage->SetSize(size);
+        curPage->Layout();
     }
     // re-apply the attributes to the widget(s)
     curPage->SetUpWidget();

From 3d37b8c72a1abb9abacee74b1f71ab982c2bae88 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Mar 2018 00:33:21 +0100
Subject: [PATCH 461/916] Reuse wxBookCtrlBase::DeleteAllPages() in wxNotebook

Don't duplicate the base class code unnecessarily.

No real changes.
---
 src/gtk1/notebook.cpp    |  1 -
 src/msw/notebook.cpp     | 10 +---------
 src/osx/notebook_osx.cpp |  5 ++---
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 79f6cb8ba8..7a11bc1c20 100644
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -586,7 +586,6 @@ bool wxNotebook::DeleteAllPages()
 
     wxASSERT_MSG( GetPageCount() == 0, wxT("all pages must have been deleted") );
 
-    InvalidateBestSize();
     return wxNotebookBase::DeleteAllPages();
 }
 
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 4ba23c88a7..62899bc39b 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -622,19 +622,11 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
-    size_t nPageCount = GetPageCount();
-    size_t nPage;
-    for ( nPage = 0; nPage < nPageCount; nPage++ )
-        delete m_pages[nPage];
-
-    m_pages.Clear();
+    wxBookCtrlBase::DeleteAllPages();
 
     if ( !TabCtrl_DeleteAllItems(GetHwnd()) )
         wxLogLastError(wxS("TabCtrl_DeleteAllItems()"));
 
-    m_selection = wxNOT_FOUND;
-
-    InvalidateBestSize();
     return true;
 }
 
diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index 29391e583c..fc94045154 100644
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -199,11 +199,10 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
-    WX_CLEAR_ARRAY(m_pages);
+    wxBookCtrlBase::DeleteAllPages();
+
     m_images.clear();
     MacSetupTabs();
-    m_selection = wxNOT_FOUND ;
-    InvalidateBestSize();
 
     return true;
 }

From bee28c2730ce94a4e0eead18139c7d28ad6186ed Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Mar 2018 00:38:16 +0100
Subject: [PATCH 462/916] Use wxVector<> for wxBookCtrlBase::m_pages array

Get rid of another macro-based array in favour of wxVector<>.

No real changes.
---
 include/wx/bookctrl.h    |  8 +++-----
 src/common/bookctrl.cpp  | 10 +++++-----
 src/gtk/notebook.cpp     |  2 +-
 src/gtk1/notebook.cpp    |  2 +-
 src/msw/notebook.cpp     | 14 +++++++-------
 src/osx/notebook_osx.cpp |  4 ++--
 src/qt/notebook.cpp      |  2 +-
 src/univ/notebook.cpp    |  4 ++--
 8 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 963de7a91a..267e81b692 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -20,11 +20,9 @@
 #if wxUSE_BOOKCTRL
 
 #include "wx/control.h"
-#include "wx/dynarray.h"
+#include "wx/vector.h"
 #include "wx/withimages.h"
 
-WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages);
-
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 class WXDLLIMPEXP_FWD_CORE wxBookCtrlEvent;
 
@@ -94,7 +92,7 @@ public:
     virtual size_t GetPageCount() const { return m_pages.size(); }
 
     // get the panel which represents the given page
-    virtual wxWindow *GetPage(size_t n) const { return m_pages[n]; }
+    virtual wxWindow *GetPage(size_t n) const { return m_pages.at(n); }
 
     // get the current page or NULL if none
     wxWindow *GetCurrentPage() const
@@ -331,7 +329,7 @@ protected:
 
 
     // the array of all pages of this control
-    wxArrayPages m_pages;
+    wxVector<wxWindow*> m_pages;
 
     // get the page area
     virtual wxRect GetPageRect() const;
diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp
index c2dde5fcfe..3ed66c98a1 100644
--- a/src/common/bookctrl.cpp
+++ b/src/common/bookctrl.cpp
@@ -241,8 +241,8 @@ void wxBookCtrlBase::DoSize()
 
     // resize all pages to fit the new control size
     const wxRect pageRect = GetPageRect();
-    const unsigned pagesCount = m_pages.GetCount();
-    for ( unsigned int i = 0; i < pagesCount; ++i )
+    const size_t pagesCount = m_pages.size();
+    for ( size_t i = 0; i < pagesCount; ++i )
     {
         wxWindow * const page = m_pages[i];
         if ( !page )
@@ -310,7 +310,7 @@ void wxBookCtrlBase::OnHelp(wxHelpEvent& event)
         source = source->GetParent();
     }
 
-    if ( source && m_pages.Index(source) == wxNOT_FOUND )
+    if ( source && FindPage(source) == wxNOT_FOUND )
     {
         // this event is for the book control itself, redirect it to the
         // corresponding page
@@ -368,7 +368,7 @@ wxBookCtrlBase::InsertPage(size_t nPage,
     wxCHECK_MSG( nPage <= m_pages.size(), false,
                  wxT("invalid page index in wxBookCtrlBase::InsertPage()") );
 
-    m_pages.Insert(page, nPage);
+    m_pages.insert(m_pages.begin() + nPage, page);
     if ( page )
         page->SetSize(GetPageRect());
 
@@ -395,7 +395,7 @@ wxWindow *wxBookCtrlBase::DoRemovePage(size_t nPage)
                  wxT("invalid page index in wxBookCtrlBase::DoRemovePage()") );
 
     wxWindow *pageRemoved = m_pages[nPage];
-    m_pages.RemoveAt(nPage);
+    m_pages.erase(m_pages.begin() + nPage);
     DoInvalidateBestSize();
 
     return pageRemoved;
diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 8f75c84c25..35cd915ca6 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -418,7 +418,7 @@ bool wxNotebook::InsertPage( size_t position,
 
     wxGtkNotebookPage* pageData = new wxGtkNotebookPage;
 
-    m_pages.Insert(win, position);
+    m_pages.insert(m_pages.begin() + position, win);
     m_pagesData.Insert(position, pageData);
 
     // set the label image and text
diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 7a11bc1c20..6dc0752862 100644
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -660,7 +660,7 @@ bool wxNotebook::InsertPage( size_t position,
     else
         m_pagesData.Insert( position, nb_page );
 
-    m_pages.Insert(win, position);
+    m_pages.insert(m_pages.begin() + position, win);
 
     nb_page->m_box = gtk_hbox_new( FALSE, 1 );
     gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 );
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 62899bc39b..62fa2d61b3 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -309,9 +309,9 @@ wxNotebook::~wxNotebook()
 size_t wxNotebook::GetPageCount() const
 {
     // consistency check
-    wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(GetHwnd()) );
+    wxASSERT( (int)m_pages.size() == TabCtrl_GetItemCount(GetHwnd()) );
 
-    return m_pages.Count();
+    return m_pages.size();
 }
 
 int wxNotebook::GetRowCount() const
@@ -404,7 +404,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
     if ( ret && rows != GetRowCount() )
     {
         const wxRect r = GetPageSize();
-        const size_t count = m_pages.Count();
+        const size_t count = m_pages.size();
         for ( size_t page = 0; page < count; page++ )
             m_pages[page]->SetSize(r);
     }
@@ -578,7 +578,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
     if ( !TabCtrl_DeleteItem(GetHwnd(), nPage) )
         wxLogLastError(wxS("TabCtrl_DeleteItem()"));
 
-    if ( m_pages.IsEmpty() )
+    if ( m_pages.empty() )
     {
         // no selection any more, the notebook becamse empty
         m_selection = wxNOT_FOUND;
@@ -693,13 +693,13 @@ bool wxNotebook::InsertPage(size_t nPage,
     }
 
     // succeeded: save the pointer to the page
-    m_pages.Insert(pPage, nPage);
+    m_pages.insert(m_pages.begin() + nPage, pPage);
 
     // we may need to adjust the size again if the notebook size changed:
     // normally this only happens for the first page we add (the tabs which
     // hadn't been there before are now shown) but for a multiline notebook it
     // can happen for any page at all as a new row could have been started
-    if ( m_pages.GetCount() == 1 || HasFlag(wxNB_MULTILINE) )
+    if ( m_pages.size() == 1 || HasFlag(wxNB_MULTILINE) )
     {
         AdjustPageSize(pPage);
 
@@ -959,7 +959,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
 
     int width = rc.right - rc.left,
         height = rc.bottom - rc.top;
-    size_t nCount = m_pages.Count();
+    size_t nCount = m_pages.size();
     for ( size_t nPage = 0; nPage < nCount; nPage++ ) {
         wxNotebookPage *pPage = m_pages[nPage];
         pPage->SetSize(rc.left, rc.top, width, height);
diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index fc94045154..144797a9dc 100644
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -173,7 +173,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
         wxT("DoRemovePage: invalid notebook page") );
 
     wxNotebookPage* page = m_pages[nPage] ;
-    m_pages.RemoveAt(nPage);
+    m_pages.erase(m_pages.begin() + nPage);
     m_images.RemoveAt(nPage);
 
     MacSetupTabs();
@@ -285,7 +285,7 @@ wxRect wxNotebook::GetPageRect() const
 //     time because doing it in ::Create() doesn't work (for unknown reasons)
 void wxNotebook::OnSize(wxSizeEvent& event)
 {
-    unsigned int nCount = m_pages.Count();
+    unsigned int nCount = m_pages.size();
     wxRect rect = GetPageRect() ;
 
     for ( unsigned int nPage = 0; nPage < nCount; nPage++ )
diff --git a/src/qt/notebook.cpp b/src/qt/notebook.cpp
index 5a3b8affcf..8fd294f1f5 100644
--- a/src/qt/notebook.cpp
+++ b/src/qt/notebook.cpp
@@ -150,7 +150,7 @@ bool wxNotebook::InsertPage(size_t n, wxWindow *page, const wxString& text,
         m_qtTabWidget->insertTab( n, page->GetHandle(), wxQtConvertString( text ));
     }
 
-    m_pages.Insert(page, n);
+    m_pages.insert(m_pages.begin() + n, page);
     m_images.insert(m_images.begin() + n, imageId);
 
     // reenable firing qt signals as internal wx initialization was completed
diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index e68d51f07e..143b8ec82c 100644
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -304,7 +304,7 @@ bool wxNotebook::InsertPage(size_t nPage,
                  wxT("invalid notebook page in InsertPage()") );
 
     // modify the data
-    m_pages.Insert(pPage, nPage);
+    m_pages.insert(m_pages.begin() + nPage, pPage);
 
     wxString label;
     m_accels.Insert(FindAccelIndex(strText, &label), nPage);
@@ -378,7 +378,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
     wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, wxT("invalid notebook page") );
 
     wxNotebookPage *page = m_pages[nPage];
-    m_pages.RemoveAt(nPage);
+    m_pages.erase(m_pages.begin() + nPage);
     m_titles.RemoveAt(nPage);
     m_accels.RemoveAt(nPage);
     m_widths.RemoveAt(nPage);

From 4cdd3001c249f3426e9ae720bff9d15242a9d4ae Mon Sep 17 00:00:00 2001
From: Teodor Petrov <fuscated@gmail.com>
Date: Sun, 1 Apr 2018 17:15:41 +0300
Subject: [PATCH 463/916] Keep wxSTC call tips inside the current display

Make it harder for the calltip to be invisible

* This required changes to the Window::SetPositionRelative.
* Use the Qt version as a base.
* The idea is to confine the window to the boundaries of the display the
  scintilla control is at the moment of the call.

Closes #18115.
---
 src/stc/PlatWX.cpp | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 303bfbf9d6..ecca096883 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -1852,8 +1852,35 @@ void Window::SetPosition(PRectangle rc) {
     GETWIN(wid)->SetSize(r);
 }
 
-void Window::SetPositionRelative(PRectangle rc, Window) {
-    SetPosition(rc);  // ????
+void Window::SetPositionRelative(PRectangle rc, Window relativeTo) {
+    wxWindow *relativeWin = GETWIN(relativeTo.wid);
+
+    wxPoint position = relativeWin->GetScreenPosition();
+    position.x = wxRound(position.x + rc.left);
+    position.y = wxRound(position.y + rc.top);
+
+    const int currentDisplay = wxDisplay::GetFromWindow(relativeWin);
+    const wxRect displayRect = wxDisplay(currentDisplay).GetClientArea();
+
+    if (position.x < displayRect.GetLeft())
+        position.x = displayRect.GetLeft();
+
+    const int width = rc.Width();
+    if (width > displayRect.GetWidth())
+    {
+        // We want to show at least the beginning of the window.
+        position.x = displayRect.GetLeft();
+    }
+    else if (position.x + width > displayRect.GetRight())
+        position.x = displayRect.GetRight() - width;
+
+    const int height = rc.Height();
+    if (position.y + height > displayRect.GetBottom())
+        position.y = displayRect.GetBottom() - height;
+
+    position = relativeWin->ScreenToClient(position);
+    wxWindow *window = GETWIN(wid);
+    window->SetSize(position.x, position.y, width, height);
 }
 
 PRectangle Window::GetClientPosition() {

From 6238f577dbe2506e7f65652ea4039a296eb83685 Mon Sep 17 00:00:00 2001
From: Jan Niklas Hasse <jhasse@bixense.com>
Date: Wed, 4 Apr 2018 14:17:29 +0200
Subject: [PATCH 464/916] Fix cross-compiling with CMake due to wrong ws2_32
 case

Use "ws2_32" in lower-case to ensure the library is found when
cross-compiling and using a case-sensitive filesystem.

Closes https://github.com/wxWidgets/wxWidgets/pull/772
---
 build/cmake/lib/net/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/lib/net/CMakeLists.txt b/build/cmake/lib/net/CMakeLists.txt
index 077148bae5..3d38412803 100644
--- a/build/cmake/lib/net/CMakeLists.txt
+++ b/build/cmake/lib/net/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 wx_add_library(net IS_BASE ${NET_FILES})
 
 if(WIN32)
-    wx_lib_link_libraries(net PRIVATE Ws2_32)
+    wx_lib_link_libraries(net PRIVATE ws2_32)
 endif()
 
 wx_finalize_lib(net)

From 311b2aee5f963a9dd9c77f4db1e0304d7b30da0d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 29 Mar 2018 00:26:38 +0200
Subject: [PATCH 465/916] Check for liblzma headers in configure too and add
 wxUSE_LIBLZMA

Prepare for using liblzma in wxWidgets code by adding the necessary
option and updating the configure check for it (which had been already
present due to libtiff possible dependency on liblzma).

No real changes yet.
---
 build/cmake/options.cmake  |   6 ++
 build/cmake/setup.h.in     |   2 +
 configure                  | 184 +++++++++++++++++++++----------------
 configure.in               |  43 +++++++--
 include/wx/android/setup.h |  16 ++++
 include/wx/gtk/setup0.h    |  16 ++++
 include/wx/motif/setup0.h  |  16 ++++
 include/wx/msw/setup0.h    |  16 ++++
 include/wx/osx/setup0.h    |  16 ++++
 include/wx/setup_inc.h     |  16 ++++
 include/wx/univ/setup0.h   |  16 ++++
 setup.h.in                 |   2 +
 12 files changed, 260 insertions(+), 89 deletions(-)

diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index b01db3261f..80042979e9 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -67,6 +67,12 @@ wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)")
 wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)")
 wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)")
 
+wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF)
+if(wxUSE_LIBLZMA)
+    find_package(LibLZMA REQUIRED)
+endif()
+set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBLZMA "use liblzma for LZMA compression")
+
 wx_option(wxUSE_OPENGL "use OpenGL (or Mesa)")
 
 if(NOT WIN32)
diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
index 4f244d7da4..ae4ade5175 100644
--- a/build/cmake/setup.h.in
+++ b/build/cmake/setup.h.in
@@ -275,6 +275,8 @@
 
 #cmakedefine01 wxUSE_ZLIB
 
+#cmakedefine01 wxUSE_LIBLZMA
+
 #cmakedefine01 wxUSE_APPLE_IEEE
 
 #cmakedefine01 wxUSE_JOYSTICK
diff --git a/configure b/configure
index a8b1da5c05..42edeae0c8 100755
--- a/configure
+++ b/configure
@@ -1092,7 +1092,6 @@ with_libpng
 with_libjpeg
 with_libtiff
 with_libjbig
-with_liblzma
 with_libxpm
 with_libiconv
 with_libmspack
@@ -1104,6 +1103,7 @@ with_xtest
 with_dmalloc
 with_sdl
 with_regex
+with_liblzma
 with_zlib
 with_expat
 with_macosx_sdk
@@ -2329,7 +2329,6 @@ Optional Packages:
   --with-libjpeg          use libjpeg (JPEG file format)
   --with-libtiff          use libtiff (TIFF file format)
   --without-libjbig       don't use libjbig in libtiff even if available)
-  --without-liblzma       don't use liblzma in libtiff even if available)
   --with-libxpm           use libxpm (XPM file format)
   --with-libiconv         use libiconv (character conversion)
   --with-libmspack        use libmspack (CHM help files loading)
@@ -2341,6 +2340,7 @@ Optional Packages:
   --with-dmalloc          use dmalloc library (http://dmalloc.com/)
   --with-sdl              use SDL for audio on Unix
   --with-regex            enable support for wxRegEx class
+  --with-liblzma          use LZMA compression)
   --with-zlib             use zlib for LZW compression
   --with-expat            enable XML support using expat parser
   --with-macosx-sdk=PATH  use an OS X SDK at PATH
@@ -3177,48 +3177,6 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_type
 
-# ac_fn_cxx_try_run LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_cxx_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_run
-
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -3309,6 +3267,48 @@ fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
+
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_run
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
@@ -4751,7 +4751,6 @@ fi
 
 if test "$wxUSE_LIBTIFF" = "builtin" ; then
     wxUSE_LIBJBIG=no
-    wxUSE_LIBLZMA=no
 else
 
           withstring=without
@@ -4782,35 +4781,6 @@ fi
 
           eval "$wx_cv_use_libjbig"
 
-
-          withstring=without
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$withstring" = xwithout; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-# Check whether --with-liblzma was given.
-if test "${with_liblzma+set}" = set; then :
-  withval=$with_liblzma;
-                        if test "$withval" = yes; then
-                          wx_cv_use_liblzma='wxUSE_LIBLZMA=yes'
-                        else
-                          wx_cv_use_liblzma='wxUSE_LIBLZMA=no'
-                        fi
-
-else
-
-                        wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_liblzma"
-
 fi
 
 
@@ -5150,6 +5120,35 @@ fi
           eval "$wx_cv_use_regex"
 
 
+          withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+# Check whether --with-liblzma was given.
+if test "${with_liblzma+set}" = set; then :
+  withval=$with_liblzma;
+                        if test "$withval" = yes; then
+                          wx_cv_use_liblzma='wxUSE_LIBLZMA=yes'
+                        else
+                          wx_cv_use_liblzma='wxUSE_LIBLZMA=no'
+                        fi
+
+else
+
+                        wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_liblzma"
+
+
 
 # Check whether --with-zlib was given.
 if test "${with_zlib+set}" = set; then :
@@ -23317,9 +23316,16 @@ fi
 fi
 
 
-LZMA_LINK=
-if test "$wxUSE_LIBLZMA" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5
+if test "$wxUSE_LIBLZMA" != "no"; then
+    ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
+if test "x$ac_cv_header_lzma_h" = xyes; then :
+
+fi
+
+
+
+    if test "$ac_cv_header_lzma_h" = "yes"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5
 $as_echo_n "checking for lzma_code in -llzma... " >&6; }
 if ${ac_cv_lib_lzma_lzma_code+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -23356,10 +23362,22 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5
 $as_echo "$ac_cv_lib_lzma_lzma_code" >&6; }
 if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then :
-  LZMA_LINK=" -llzma"
+
+                LZMA_LINK="-llzma"
+                LIBS="$LZMA_LINK $LIBS"
+                $as_echo "#define wxUSE_LIBLZMA 1" >>confdefs.h
+
+
 fi
 
-else
+    fi
+
+    if test -z "$LZMA_LINK"; then
+        wxUSE_LIBLZMA=no
+    fi
+fi
+
+if test "$HAVE_LZMA" = "no" -o "$wxUSE_LIBTIFF" = "builtin"; then
     ac_configure_args="$ac_configure_args --disable-lzma"
 fi
 
@@ -23424,7 +23442,7 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
         if test "$wxUSE_ZLIB" = "sys"; then
             TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
         fi
-        if test "$wxUSE_LIBLZMA" = "yes"; then
+        if test -n "$LZMA_LINK"; then
             TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
         fi
         if test "$wxUSE_LIBJBIG" = "yes"; then
@@ -38925,6 +38943,11 @@ case "$wxUSE_EXPAT" in
         WXCONFIG_LIBS="$EXPAT_LINK $WXCONFIG_LIBS"
         ;;
 esac
+if test "$wxUSE_LIBLZMA" = "yes"; then
+            if test "$wxUSE_GUI" != "yes" -o "$wxUSE_LIBTIFF" != "sys"; then
+        WXCONFIG_LIBS="$LZMA_LINK $WXCONFIG_LIBS"
+    fi
+fi
 case "$wxUSE_ZLIB" in
     builtin)
         wxconfig_3rdparty="zlib $wxconfig_3rdparty"
@@ -43251,6 +43274,7 @@ echo "                                       tiff               ${wxUSE_LIBTIFF-
 if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
 echo "                                       xpm                ${wxUSE_LIBXPM-none}"
 fi
+echo "                                       lzma               ${wxUSE_LIBLZMA}"
 echo "                                       zlib               ${wxUSE_ZLIB}"
 echo "                                       expat              ${wxUSE_EXPAT}"
 echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
diff --git a/configure.in b/configure.in
index 0919436ef2..e0f500ce93 100644
--- a/configure.in
+++ b/configure.in
@@ -525,14 +525,12 @@ WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image form
 WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
 WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
 
-dnl We don't provide built-in versions of these libraries, so if the use of
-dnl system libraries is explicitly disabled, we can't use them at all.
+dnl We don't provide built-in version of this library, so if the use of system
+dnl libraries is explicitly disabled, we can't use it at all.
 if test "$wxUSE_LIBTIFF" = "builtin" ; then
     wxUSE_LIBJBIG=no
-    wxUSE_LIBLZMA=no
 else
     WX_ARG_WITHOUT(libjbig,    [  --without-libjbig       don't use libjbig in libtiff even if available)], wxUSE_LIBJBIG)
-    WX_ARG_WITHOUT(liblzma,    [  --without-liblzma       don't use liblzma in libtiff even if available)], wxUSE_LIBLZMA)
 fi
 
 WX_ARG_SYS_WITH(libxpm,    [  --with-libxpm           use libxpm (XPM file format)], wxUSE_LIBXPM)
@@ -550,6 +548,7 @@ dnl for GUI only
 WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
 WX_ARG_WITH(sdl,           [  --with-sdl              use SDL for audio on Unix], wxUSE_LIBSDL)
 WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
+WX_ARG_WITH(liblzma,       [  --with-liblzma          use LZMA compression)], wxUSE_LIBLZMA)
 WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_SYS_WITH(expat,     [  --with-expat            enable XML support using expat parser], wxUSE_EXPAT)
 
@@ -2556,10 +2555,28 @@ dnl ------------------------------------------------------------------------
 dnl Check for lzma library
 dnl ------------------------------------------------------------------------
 
-LZMA_LINK=
-if test "$wxUSE_LIBLZMA" = "yes"; then
-    AC_CHECK_LIB(lzma, lzma_code, LZMA_LINK=" -llzma")
-else
+if test "$wxUSE_LIBLZMA" != "no"; then
+    AC_CHECK_HEADER(lzma.h,,,[])
+
+    if test "$ac_cv_header_lzma_h" = "yes"; then
+        AC_CHECK_LIB(lzma, lzma_code,
+            [
+                LZMA_LINK="-llzma"
+                LIBS="$LZMA_LINK $LIBS"
+                AC_DEFINE(wxUSE_LIBLZMA)
+            ])
+    fi
+
+    if test -z "$LZMA_LINK"; then
+        wxUSE_LIBLZMA=no
+    fi
+fi
+
+dnl We need to disable the use of lzma in built-in libtiff explicitly, as
+dnl otherwise we'd depend on the system lzma library, which is typically
+dnl undesirable when using builtin libraries. We also disable the use of lzma
+dnl if it's not available anyhow, just to speed up libtiff configure a little.
+if test "$HAVE_LZMA" = "no" -o "$wxUSE_LIBTIFF" = "builtin"; then
     ac_configure_args="$ac_configure_args --disable-lzma"
 fi
 
@@ -2592,7 +2609,7 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
         if test "$wxUSE_ZLIB" = "sys"; then
             TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
         fi
-        if test "$wxUSE_LIBLZMA" = "yes"; then
+        if test -n "$LZMA_LINK"; then
             TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
         fi
         if test "$wxUSE_LIBJBIG" = "yes"; then
@@ -7908,6 +7925,13 @@ case "$wxUSE_EXPAT" in
         WXCONFIG_LIBS="$EXPAT_LINK $WXCONFIG_LIBS"
         ;;
 esac
+if test "$wxUSE_LIBLZMA" = "yes"; then
+    dnl It could be already present in WXCONFIG_LIBS as tiff dependency, avoid
+    dnl adding it again in this case:
+    if test "$wxUSE_GUI" != "yes" -o "$wxUSE_LIBTIFF" != "sys"; then
+        WXCONFIG_LIBS="$LZMA_LINK $WXCONFIG_LIBS"
+    fi
+fi
 case "$wxUSE_ZLIB" in
     builtin)
         wxconfig_3rdparty="zlib $wxconfig_3rdparty"
@@ -8389,6 +8413,7 @@ echo "                                       tiff               ${wxUSE_LIBTIFF-
 if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
 echo "                                       xpm                ${wxUSE_LIBXPM-none}"
 fi
+echo "                                       lzma               ${wxUSE_LIBLZMA}"
 echo "                                       zlib               ${wxUSE_ZLIB}"
 echo "                                       expat              ${wxUSE_EXPAT}"
 echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h
index 8ca861908e..ccc99e7ad0 100644
--- a/include/wx/android/setup.h
+++ b/include/wx/android/setup.h
@@ -610,6 +610,22 @@
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 
+// Set to 1 if liblzma is available to enable wxLZMA{Input,Output}Stream
+// classes.
+//
+// Notice that if you enable this build option when not using configure or
+// CMake, you need to ensure that liblzma headers and libraries are available
+// (i.e. by building the library yourself or downloading its binaries) and can
+// be found, either by copying them to one of the locations searched by the
+// compiler/linker by default (e.g. any of the directories in the INCLUDE or
+// LIB environment variables, respectively, when using MSVC) or modify the
+// make- or project files to add references to these directories.
+//
+// Default is 0 under MSW, auto-detected by configure.
+//
+// Recommended setting: 1 if you need LZMA compression.
+#define wxUSE_LIBLZMA       0
+
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWidgets one.
diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h
index df78b80ef3..22ee07b8d0 100644
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -611,6 +611,22 @@
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 
+// Set to 1 if liblzma is available to enable wxLZMA{Input,Output}Stream
+// classes.
+//
+// Notice that if you enable this build option when not using configure or
+// CMake, you need to ensure that liblzma headers and libraries are available
+// (i.e. by building the library yourself or downloading its binaries) and can
+// be found, either by copying them to one of the locations searched by the
+// compiler/linker by default (e.g. any of the directories in the INCLUDE or
+// LIB environment variables, respectively, when using MSVC) or modify the
+// make- or project files to add references to these directories.
+//
+// Default is 0 under MSW, auto-detected by configure.
+//
+// Recommended setting: 1 if you need LZMA compression.
+#define wxUSE_LIBLZMA       0
+
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWidgets one.
diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 048281ec70..fc4c657c01 100644
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -611,6 +611,22 @@
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 
+// Set to 1 if liblzma is available to enable wxLZMA{Input,Output}Stream
+// classes.
+//
+// Notice that if you enable this build option when not using configure or
+// CMake, you need to ensure that liblzma headers and libraries are available
+// (i.e. by building the library yourself or downloading its binaries) and can
+// be found, either by copying them to one of the locations searched by the
+// compiler/linker by default (e.g. any of the directories in the INCLUDE or
+// LIB environment variables, respectively, when using MSVC) or modify the
+// make- or project files to add references to these directories.
+//
+// Default is 0 under MSW, auto-detected by configure.
+//
+// Recommended setting: 1 if you need LZMA compression.
+#define wxUSE_LIBLZMA       0
+
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWidgets one.
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index bd082d170c..dcbb2d7fde 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -611,6 +611,22 @@
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 
+// Set to 1 if liblzma is available to enable wxLZMA{Input,Output}Stream
+// classes.
+//
+// Notice that if you enable this build option when not using configure or
+// CMake, you need to ensure that liblzma headers and libraries are available
+// (i.e. by building the library yourself or downloading its binaries) and can
+// be found, either by copying them to one of the locations searched by the
+// compiler/linker by default (e.g. any of the directories in the INCLUDE or
+// LIB environment variables, respectively, when using MSVC) or modify the
+// make- or project files to add references to these directories.
+//
+// Default is 0 under MSW, auto-detected by configure.
+//
+// Recommended setting: 1 if you need LZMA compression.
+#define wxUSE_LIBLZMA       0
+
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWidgets one.
diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 3f6b48c69c..a1307bf4d4 100644
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -617,6 +617,22 @@
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 
+// Set to 1 if liblzma is available to enable wxLZMA{Input,Output}Stream
+// classes.
+//
+// Notice that if you enable this build option when not using configure or
+// CMake, you need to ensure that liblzma headers and libraries are available
+// (i.e. by building the library yourself or downloading its binaries) and can
+// be found, either by copying them to one of the locations searched by the
+// compiler/linker by default (e.g. any of the directories in the INCLUDE or
+// LIB environment variables, respectively, when using MSVC) or modify the
+// make- or project files to add references to these directories.
+//
+// Default is 0 under MSW, auto-detected by configure.
+//
+// Recommended setting: 1 if you need LZMA compression.
+#define wxUSE_LIBLZMA       0
+
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWidgets one.
diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index a58ec282f1..bece6430b8 100644
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -607,6 +607,22 @@
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 
+// Set to 1 if liblzma is available to enable wxLZMA{Input,Output}Stream
+// classes.
+//
+// Notice that if you enable this build option when not using configure or
+// CMake, you need to ensure that liblzma headers and libraries are available
+// (i.e. by building the library yourself or downloading its binaries) and can
+// be found, either by copying them to one of the locations searched by the
+// compiler/linker by default (e.g. any of the directories in the INCLUDE or
+// LIB environment variables, respectively, when using MSVC) or modify the
+// make- or project files to add references to these directories.
+//
+// Default is 0 under MSW, auto-detected by configure.
+//
+// Recommended setting: 1 if you need LZMA compression.
+#define wxUSE_LIBLZMA       0
+
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWidgets one.
diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 7544890848..11c7277097 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -610,6 +610,22 @@
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 
+// Set to 1 if liblzma is available to enable wxLZMA{Input,Output}Stream
+// classes.
+//
+// Notice that if you enable this build option when not using configure or
+// CMake, you need to ensure that liblzma headers and libraries are available
+// (i.e. by building the library yourself or downloading its binaries) and can
+// be found, either by copying them to one of the locations searched by the
+// compiler/linker by default (e.g. any of the directories in the INCLUDE or
+// LIB environment variables, respectively, when using MSVC) or modify the
+// make- or project files to add references to these directories.
+//
+// Default is 0 under MSW, auto-detected by configure.
+//
+// Recommended setting: 1 if you need LZMA compression.
+#define wxUSE_LIBLZMA       0
+
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWidgets one.
diff --git a/setup.h.in b/setup.h.in
index 981b45e1da..9f703405c1 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -287,6 +287,8 @@
 
 #define wxUSE_ZLIB          0
 
+#define wxUSE_LIBLZMA       0
+
 #define wxUSE_APPLE_IEEE          0
 
 #define wxUSE_JOYSTICK            0

From af7e2901fe63e81dd7c56501ee8277c985d98050 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 29 Mar 2018 23:25:18 +0200
Subject: [PATCH 466/916] Add wxLZMAInputStream for decompressing data in XZ
 format

No compression support yet.
---
 Makefile.in                          |  19 +++
 build/bakefiles/files.bkl            |   2 +
 build/cmake/files.cmake              |   2 +
 build/files                          |   2 +
 build/msw/makefile.bcc               |  16 ++
 build/msw/makefile.gcc               |  16 ++
 build/msw/makefile.vc                |  16 ++
 build/msw/wx_base.vcxproj            |   2 +
 build/msw/wx_base.vcxproj.filters    |   6 +
 build/msw/wx_vc7_base.vcproj         |   6 +
 build/msw/wx_vc8_base.vcproj         |   8 +
 build/msw/wx_vc9_base.vcproj         |   8 +
 docs/doxygen/mainpages/cat_classes.h |   1 +
 include/wx/lzmastream.h              |  54 +++++++
 interface/wx/lzmastream.h            |  60 ++++++++
 src/common/lzmastream.cpp            | 210 +++++++++++++++++++++++++++
 16 files changed, 428 insertions(+)
 create mode 100644 include/wx/lzmastream.h
 create mode 100644 interface/wx/lzmastream.h
 create mode 100644 src/common/lzmastream.cpp

diff --git a/Makefile.in b/Makefile.in
index 583620372a..d2b234ea11 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -530,6 +530,7 @@ ALL_BASE_HEADERS =  \
 	wx/fswatcher.h \
 	wx/generic/fswatcher.h \
 	wx/secretstore.h \
+	wx/lzmastream.h \
 	$(BASE_PLATFORM_HDR) \
 	wx/fs_inet.h \
 	wx/protocol/file.h \
@@ -713,6 +714,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/fswatcher.h \
 	wx/generic/fswatcher.h \
 	wx/secretstore.h \
+	wx/lzmastream.h \
 	wx/unix/app.h \
 	wx/unix/apptbase.h \
 	wx/unix/apptrait.h \
@@ -851,6 +853,7 @@ ALL_BASE_SOURCES =  \
 	src/common/fswatchercmn.cpp \
 	src/generic/fswatcherg.cpp \
 	src/common/secretstore.cpp \
+	src/common/lzmastream.cpp \
 	src/common/fdiodispatcher.cpp \
 	src/common/selectdispatcher.cpp \
 	src/unix/appunix.cpp \
@@ -1034,6 +1037,7 @@ MONODLL_OBJECTS =  \
 	monodll_fswatchercmn.o \
 	monodll_fswatcherg.o \
 	monodll_common_secretstore.o \
+	monodll_lzmastream.o \
 	$(__BASE_PLATFORM_SRC_OBJECTS) \
 	monodll_event.o \
 	monodll_fs_mem.o \
@@ -1176,6 +1180,7 @@ MONOLIB_OBJECTS =  \
 	monolib_fswatchercmn.o \
 	monolib_fswatcherg.o \
 	monolib_common_secretstore.o \
+	monolib_lzmastream.o \
 	$(__BASE_PLATFORM_SRC_OBJECTS_1) \
 	monolib_event.o \
 	monolib_fs_mem.o \
@@ -1307,6 +1312,7 @@ BASEDLL_OBJECTS =  \
 	basedll_fswatchercmn.o \
 	basedll_fswatcherg.o \
 	basedll_common_secretstore.o \
+	basedll_lzmastream.o \
 	$(__BASE_PLATFORM_SRC_OBJECTS_2) \
 	basedll_event.o \
 	basedll_fs_mem.o \
@@ -1421,6 +1427,7 @@ BASELIB_OBJECTS =  \
 	baselib_fswatchercmn.o \
 	baselib_fswatcherg.o \
 	baselib_common_secretstore.o \
+	baselib_lzmastream.o \
 	$(__BASE_PLATFORM_SRC_OBJECTS_3) \
 	baselib_event.o \
 	baselib_fs_mem.o \
@@ -16270,6 +16277,9 @@ monodll_fswatcherg.o: $(srcdir)/src/generic/fswatcherg.cpp $(MONODLL_ODEP)
 monodll_common_secretstore.o: $(srcdir)/src/common/secretstore.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/secretstore.cpp
 
+monodll_lzmastream.o: $(srcdir)/src/common/lzmastream.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/lzmastream.cpp
+
 monodll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
 
@@ -21529,6 +21539,9 @@ monolib_fswatcherg.o: $(srcdir)/src/generic/fswatcherg.cpp $(MONOLIB_ODEP)
 monolib_common_secretstore.o: $(srcdir)/src/common/secretstore.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/secretstore.cpp
 
+monolib_lzmastream.o: $(srcdir)/src/common/lzmastream.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/lzmastream.cpp
+
 monolib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
 
@@ -26788,6 +26801,9 @@ basedll_fswatcherg.o: $(srcdir)/src/generic/fswatcherg.cpp $(BASEDLL_ODEP)
 basedll_common_secretstore.o: $(srcdir)/src/common/secretstore.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/secretstore.cpp
 
+basedll_lzmastream.o: $(srcdir)/src/common/lzmastream.cpp $(BASEDLL_ODEP)
+	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/lzmastream.cpp
+
 basedll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
 
@@ -27265,6 +27281,9 @@ baselib_fswatcherg.o: $(srcdir)/src/generic/fswatcherg.cpp $(BASELIB_ODEP)
 baselib_common_secretstore.o: $(srcdir)/src/common/secretstore.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/secretstore.cpp
 
+baselib_lzmastream.o: $(srcdir)/src/common/lzmastream.cpp $(BASELIB_ODEP)
+	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/lzmastream.cpp
+
 baselib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0f38e0952f..d529b6d731 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -546,6 +546,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/fswatchercmn.cpp
     src/generic/fswatcherg.cpp
     src/common/secretstore.cpp
+    src/common/lzmastream.cpp
 </set>
 <set var="BASE_AND_GUI_CMN_SRC" hints="files">
     src/common/event.cpp
@@ -719,6 +720,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/fswatcher.h
     wx/generic/fswatcher.h
     wx/secretstore.h
+    wx/lzmastream.h
 </set>
 
 
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index d6d9c6becb..0acb0dc7df 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -458,6 +458,7 @@ set(BASE_CMN_SRC
     src/common/zstream.cpp
     src/common/fswatchercmn.cpp
     src/generic/fswatcherg.cpp
+    src/common/lzmastream.cpp
 )
 
 set(BASE_AND_GUI_CMN_SRC
@@ -633,6 +634,7 @@ set(BASE_CMN_HDR
     wx/meta/removeref.h
     wx/fswatcher.h
     wx/generic/fswatcher.h
+    wx/lzmastream.h
 )
 
 set(NET_UNIX_SRC
diff --git a/build/files b/build/files
index e81c72ebdc..166aab50a1 100644
--- a/build/files
+++ b/build/files
@@ -433,6 +433,7 @@ BASE_CMN_SRC =
     src/common/list.cpp
     src/common/log.cpp
     src/common/longlong.cpp
+    src/common/lzmastream.cpp
     src/common/memory.cpp
     src/common/mimecmn.cpp
     src/common/module.cpp
@@ -559,6 +560,7 @@ BASE_CMN_HDR =
     wx/listimpl.cpp
     wx/log.h
     wx/longlong.h
+    wx/lzmastream.h
     wx/math.h
     wx/memconf.h
     wx/memory.h
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 0c23f0a938..334895a139 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -455,6 +455,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_fswatchercmn.obj \
 	$(OBJS)\monodll_fswatcherg.obj \
 	$(OBJS)\monodll_common_secretstore.obj \
+	$(OBJS)\monodll_lzmastream.obj \
 	$(OBJS)\monodll_basemsw.obj \
 	$(OBJS)\monodll_crashrpt.obj \
 	$(OBJS)\monodll_debughlp.obj \
@@ -607,6 +608,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_fswatchercmn.obj \
 	$(OBJS)\monolib_fswatcherg.obj \
 	$(OBJS)\monolib_common_secretstore.obj \
+	$(OBJS)\monolib_lzmastream.obj \
 	$(OBJS)\monolib_basemsw.obj \
 	$(OBJS)\monolib_crashrpt.obj \
 	$(OBJS)\monolib_debughlp.obj \
@@ -755,6 +757,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_fswatchercmn.obj \
 	$(OBJS)\basedll_fswatcherg.obj \
 	$(OBJS)\basedll_common_secretstore.obj \
+	$(OBJS)\basedll_lzmastream.obj \
 	$(OBJS)\basedll_basemsw.obj \
 	$(OBJS)\basedll_crashrpt.obj \
 	$(OBJS)\basedll_debughlp.obj \
@@ -888,6 +891,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_fswatchercmn.obj \
 	$(OBJS)\baselib_fswatcherg.obj \
 	$(OBJS)\baselib_common_secretstore.obj \
+	$(OBJS)\baselib_lzmastream.obj \
 	$(OBJS)\baselib_basemsw.obj \
 	$(OBJS)\baselib_crashrpt.obj \
 	$(OBJS)\baselib_debughlp.obj \
@@ -6690,6 +6694,9 @@ $(OBJS)\monodll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
 $(OBJS)\monodll_common_secretstore.obj: ..\..\src\common\secretstore.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\secretstore.cpp
 
+$(OBJS)\monodll_lzmastream.obj: ..\..\src\common\lzmastream.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\lzmastream.cpp
+
 $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
@@ -9236,6 +9243,9 @@ $(OBJS)\monolib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
 $(OBJS)\monolib_common_secretstore.obj: ..\..\src\common\secretstore.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\secretstore.cpp
 
+$(OBJS)\monolib_lzmastream.obj: ..\..\src\common\lzmastream.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\lzmastream.cpp
+
 $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
@@ -11782,6 +11792,9 @@ $(OBJS)\basedll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
 $(OBJS)\basedll_common_secretstore.obj: ..\..\src\common\secretstore.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\secretstore.cpp
 
+$(OBJS)\basedll_lzmastream.obj: ..\..\src\common\lzmastream.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\lzmastream.cpp
+
 $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
@@ -12127,6 +12140,9 @@ $(OBJS)\baselib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
 $(OBJS)\baselib_common_secretstore.obj: ..\..\src\common\secretstore.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\secretstore.cpp
 
+$(OBJS)\baselib_lzmastream.obj: ..\..\src\common\lzmastream.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\lzmastream.cpp
+
 $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 4272f38c1a..7a686f28c3 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -443,6 +443,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_fswatchercmn.o \
 	$(OBJS)\monodll_fswatcherg.o \
 	$(OBJS)\monodll_common_secretstore.o \
+	$(OBJS)\monodll_lzmastream.o \
 	$(OBJS)\monodll_basemsw.o \
 	$(OBJS)\monodll_crashrpt.o \
 	$(OBJS)\monodll_debughlp.o \
@@ -596,6 +597,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_fswatchercmn.o \
 	$(OBJS)\monolib_fswatcherg.o \
 	$(OBJS)\monolib_common_secretstore.o \
+	$(OBJS)\monolib_lzmastream.o \
 	$(OBJS)\monolib_basemsw.o \
 	$(OBJS)\monolib_crashrpt.o \
 	$(OBJS)\monolib_debughlp.o \
@@ -745,6 +747,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_fswatchercmn.o \
 	$(OBJS)\basedll_fswatcherg.o \
 	$(OBJS)\basedll_common_secretstore.o \
+	$(OBJS)\basedll_lzmastream.o \
 	$(OBJS)\basedll_basemsw.o \
 	$(OBJS)\basedll_crashrpt.o \
 	$(OBJS)\basedll_debughlp.o \
@@ -878,6 +881,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_fswatchercmn.o \
 	$(OBJS)\baselib_fswatcherg.o \
 	$(OBJS)\baselib_common_secretstore.o \
+	$(OBJS)\baselib_lzmastream.o \
 	$(OBJS)\baselib_basemsw.o \
 	$(OBJS)\baselib_crashrpt.o \
 	$(OBJS)\baselib_debughlp.o \
@@ -6872,6 +6876,9 @@ $(OBJS)\monodll_fswatcherg.o: ../../src/generic/fswatcherg.cpp
 $(OBJS)\monodll_common_secretstore.o: ../../src/common/secretstore.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monodll_lzmastream.o: ../../src/common/lzmastream.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_basemsw.o: ../../src/msw/basemsw.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9420,6 +9427,9 @@ $(OBJS)\monolib_fswatcherg.o: ../../src/generic/fswatcherg.cpp
 $(OBJS)\monolib_common_secretstore.o: ../../src/common/secretstore.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monolib_lzmastream.o: ../../src/common/lzmastream.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_basemsw.o: ../../src/msw/basemsw.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -11968,6 +11978,9 @@ $(OBJS)\basedll_fswatcherg.o: ../../src/generic/fswatcherg.cpp
 $(OBJS)\basedll_common_secretstore.o: ../../src/common/secretstore.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\basedll_lzmastream.o: ../../src/common/lzmastream.cpp
+	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\basedll_basemsw.o: ../../src/msw/basemsw.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -12313,6 +12326,9 @@ $(OBJS)\baselib_fswatcherg.o: ../../src/generic/fswatcherg.cpp
 $(OBJS)\baselib_common_secretstore.o: ../../src/common/secretstore.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\baselib_lzmastream.o: ../../src/common/lzmastream.cpp
+	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\baselib_basemsw.o: ../../src/msw/basemsw.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index b2965f5f63..1015011203 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -475,6 +475,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_fswatchercmn.obj \
 	$(OBJS)\monodll_fswatcherg.obj \
 	$(OBJS)\monodll_common_secretstore.obj \
+	$(OBJS)\monodll_lzmastream.obj \
 	$(OBJS)\monodll_basemsw.obj \
 	$(OBJS)\monodll_crashrpt.obj \
 	$(OBJS)\monodll_debughlp.obj \
@@ -637,6 +638,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_fswatchercmn.obj \
 	$(OBJS)\monolib_fswatcherg.obj \
 	$(OBJS)\monolib_common_secretstore.obj \
+	$(OBJS)\monolib_lzmastream.obj \
 	$(OBJS)\monolib_basemsw.obj \
 	$(OBJS)\monolib_crashrpt.obj \
 	$(OBJS)\monolib_debughlp.obj \
@@ -793,6 +795,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_fswatchercmn.obj \
 	$(OBJS)\basedll_fswatcherg.obj \
 	$(OBJS)\basedll_common_secretstore.obj \
+	$(OBJS)\basedll_lzmastream.obj \
 	$(OBJS)\basedll_basemsw.obj \
 	$(OBJS)\basedll_crashrpt.obj \
 	$(OBJS)\basedll_debughlp.obj \
@@ -936,6 +939,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_fswatchercmn.obj \
 	$(OBJS)\baselib_fswatcherg.obj \
 	$(OBJS)\baselib_common_secretstore.obj \
+	$(OBJS)\baselib_lzmastream.obj \
 	$(OBJS)\baselib_basemsw.obj \
 	$(OBJS)\baselib_crashrpt.obj \
 	$(OBJS)\baselib_debughlp.obj \
@@ -7387,6 +7391,9 @@ $(OBJS)\monodll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
 $(OBJS)\monodll_common_secretstore.obj: ..\..\src\common\secretstore.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\secretstore.cpp
 
+$(OBJS)\monodll_lzmastream.obj: ..\..\src\common\lzmastream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\lzmastream.cpp
+
 $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
@@ -9933,6 +9940,9 @@ $(OBJS)\monolib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
 $(OBJS)\monolib_common_secretstore.obj: ..\..\src\common\secretstore.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\secretstore.cpp
 
+$(OBJS)\monolib_lzmastream.obj: ..\..\src\common\lzmastream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\lzmastream.cpp
+
 $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
@@ -12479,6 +12489,9 @@ $(OBJS)\basedll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
 $(OBJS)\basedll_common_secretstore.obj: ..\..\src\common\secretstore.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\secretstore.cpp
 
+$(OBJS)\basedll_lzmastream.obj: ..\..\src\common\lzmastream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\lzmastream.cpp
+
 $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
@@ -12824,6 +12837,9 @@ $(OBJS)\baselib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
 $(OBJS)\baselib_common_secretstore.obj: ..\..\src\common\secretstore.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\secretstore.cpp
 
+$(OBJS)\baselib_lzmastream.obj: ..\..\src\common\lzmastream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\lzmastream.cpp
+
 $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
 
diff --git a/build/msw/wx_base.vcxproj b/build/msw/wx_base.vcxproj
index bdf09a2b7d..920df8bae3 100644
--- a/build/msw/wx_base.vcxproj
+++ b/build/msw/wx_base.vcxproj
@@ -605,6 +605,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)common_%(Filename).obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)common_%(Filename).obj</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\common\lzmastream.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -822,6 +823,7 @@
     <ClInclude Include="..\..\include\wx\arrimpl.cpp" />
     <ClInclude Include="..\..\include\wx\secretstore.h" />
     <ClInclude Include="..\..\include\wx\evtloopsrc.h" />
+    <ClInclude Include="..\..\include\wx\lzmastream.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/msw/wx_base.vcxproj.filters b/build/msw/wx_base.vcxproj.filters
index 6e1b1cace5..30fff49b7e 100644
--- a/build/msw/wx_base.vcxproj.filters
+++ b/build/msw/wx_base.vcxproj.filters
@@ -162,6 +162,9 @@
     <ClCompile Include="..\..\src\common\longlong.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\common\lzmastream.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\memory.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -604,6 +607,9 @@
     <ClInclude Include="..\..\include\wx\longlong.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\lzmastream.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\math.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 509f9cba53..007b65e75f 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -462,6 +462,9 @@
 			<File
 				RelativePath="..\..\src\common\longlong.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\common\lzmastream.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\memory.cpp">
 			</File>
@@ -1135,6 +1138,9 @@
 			<File
 				RelativePath="..\..\include\wx\longlong.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\lzmastream.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\math.h">
 			</File>
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index 3a22b0bd71..a2014a225b 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1053,6 +1053,10 @@
 				RelativePath="..\..\src\common\longlong.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\lzmastream.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\memory.cpp"
 				>
@@ -2111,6 +2115,10 @@
 				RelativePath="..\..\include\wx\longlong.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\lzmastream.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\math.h"
 				>
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 2c435c44bb..7b04347201 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1049,6 +1049,10 @@
 				RelativePath="..\..\src\common\longlong.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\common\lzmastream.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\common\memory.cpp"
 				>
@@ -2107,6 +2111,10 @@
 				RelativePath="..\..\include\wx\longlong.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\lzmastream.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\math.h"
 				>
diff --git a/docs/doxygen/mainpages/cat_classes.h b/docs/doxygen/mainpages/cat_classes.h
index 50a6485224..66bad14a00 100644
--- a/docs/doxygen/mainpages/cat_classes.h
+++ b/docs/doxygen/mainpages/cat_classes.h
@@ -703,6 +703,7 @@ Related overview: @ref overview_stream
 @li wxTempFileOutputStream: Stream to safely replace an existing file
 @li wxStringInputStream: String input stream class
 @li wxStringOutputStream: String output stream class
+@li wxLZMAInputStream: LZMA decompression stream class
 @li wxZlibInputStream: Zlib and gzip (compression) input stream class
 @li wxZlibOutputStream: Zlib and gzip (compression) output stream class
 @li wxZipInputStream: Input stream for reading from ZIP archives
diff --git a/include/wx/lzmastream.h b/include/wx/lzmastream.h
new file mode 100644
index 0000000000..3c2a77808f
--- /dev/null
+++ b/include/wx/lzmastream.h
@@ -0,0 +1,54 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/lzmastream.h
+// Purpose:     Filters streams using LZMA(2) compression
+// Author:      Vadim Zeitlin
+// Created:     2018-03-29
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_LZMASTREAM_H_
+#define _WX_LZMASTREAM_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_LIBLZMA && wxUSE_STREAMS
+
+#include "wx/stream.h"
+#include "wx/versioninfo.h"
+
+struct wxLZMAStream;
+
+// ----------------------------------------------------------------------------
+// Filter for decompressing data compressed using LZMA
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxLZMAInputStream : public wxFilterInputStream
+{
+public:
+    explicit wxLZMAInputStream(wxInputStream& stream);
+    explicit wxLZMAInputStream(wxInputStream* stream);
+    virtual ~wxLZMAInputStream();
+
+    char Peek() wxOVERRIDE { return wxInputStream::Peek(); }
+    wxFileOffset GetLength() const wxOVERRIDE { return wxInputStream::GetLength(); }
+
+protected:
+    size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
+    wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
+
+private:
+    void Init();
+
+    wxLZMAStream* m_stream;
+    wxUint8* m_inbuf;
+    wxFileOffset m_pos;
+
+    wxDECLARE_NO_COPY_CLASS(wxLZMAInputStream);
+};
+
+WXDLLIMPEXP_BASE wxVersionInfo wxGetLibLZMAVersionInfo();
+
+#endif // wxUSE_LIBLZMA && wxUSE_STREAMS
+
+#endif // _WX_LZMASTREAM_H_
diff --git a/interface/wx/lzmastream.h b/interface/wx/lzmastream.h
new file mode 100644
index 0000000000..7ca8fb5d32
--- /dev/null
+++ b/interface/wx/lzmastream.h
@@ -0,0 +1,60 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/lzmastream.h
+// Purpose:     LZMA [de]compression classes documentation
+// Author:      Vadim Zeitlin
+// Created:     2018-03-29
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+    @class wxLZMAInputStream
+
+    This filter stream decompresses data in XZ format.
+
+    XZ format uses LZMA2 algorithm for compression used for .xz files and is
+    similar to GZip or BZip2 format. Notice that it is different from, and
+    incompatible with, 7z archive format even although it uses the same
+    compression algorithm.
+
+    To decompress contents of standard input to standard output, the following
+    (not optimally efficient) code could be used:
+    @code
+    wxFFileInputStream fin(stdin);
+    wxLZMAInputStream zin(fin);
+    wxFFileOutputStream fout(stdout);
+    zin.Read(fout);
+
+    if ( zin.GetLastError() != wxSTREAM_EOF ) {
+        ... handle error ...
+    }
+    @endcode
+
+    @library{wxbase}
+    @category{archive,streams}
+
+    @see wxInputStream, wxZlibInputStream
+
+    @since 3.1.2
+*/
+class wxLZMAInputStream : public wxFilterInputStream
+{
+public:
+    /**
+        Create decompressing stream associated with the given underlying
+        stream.
+
+        This overload does not take ownership of the @a stream.
+    */
+    wxLZMAInputStream(wxInputStream& stream);
+
+    /**
+        Create decompressing stream associated with the given underlying
+        stream and takes ownership of it.
+
+        As with the base wxFilterInputStream class, passing @a stream by
+        pointer indicates that this object takes ownership of it and will
+        delete it when it is itself destroyed.
+     */
+    wxLZMAInputStream(wxInputStream* stream);
+};
diff --git a/src/common/lzmastream.cpp b/src/common/lzmastream.cpp
new file mode 100644
index 0000000000..b8aae286f1
--- /dev/null
+++ b/src/common/lzmastream.cpp
@@ -0,0 +1,210 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/lzmastream.cpp
+// Purpose:     Implementation of LZMA stream classes
+// Author:      Vadim Zeitlin
+// Created:     2018-03-29
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_LIBLZMA && wxUSE_STREAMS
+
+#include "wx/lzmastream.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/translation.h"
+#endif // WX_PRECOMP
+
+#include <lzma.h>
+
+// ----------------------------------------------------------------------------
+// Constants
+// ----------------------------------------------------------------------------
+
+static const size_t wxLZMA_BUF_SIZE = 4096;
+
+// ----------------------------------------------------------------------------
+// Private helpers
+// ----------------------------------------------------------------------------
+
+// Simpler wrapper around lzma_stream, taking care of initializing and
+// finalizing it.
+struct wxLZMAStream : lzma_stream
+{
+    wxLZMAStream()
+    {
+        memset(this, 0, sizeof(lzma_stream));
+    }
+
+    ~wxLZMAStream()
+    {
+        lzma_end(this);
+    }
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// Functions
+// ----------------------------------------------------------------------------
+
+wxVersionInfo wxGetLibLZMAVersionInfo()
+{
+    const uint32_t ver = lzma_version_number();
+
+    // For now ignore the "stability" part of the version.
+    return wxVersionInfo
+           (
+            "liblzma",
+            ver / 10000000,
+            (ver % 10000000) / 10000,
+            (ver % 10000) / 10
+           );
+}
+
+// ----------------------------------------------------------------------------
+// wxLZMAInputStream: decompression
+// ----------------------------------------------------------------------------
+
+wxLZMAInputStream::wxLZMAInputStream(wxInputStream& stream)
+    : wxFilterInputStream(stream)
+{
+    Init();
+}
+
+wxLZMAInputStream::wxLZMAInputStream(wxInputStream* stream)
+    : wxFilterInputStream(stream)
+{
+    Init();
+}
+
+void wxLZMAInputStream::Init()
+{
+    m_stream = new wxLZMAStream;
+    m_inbuf = new wxUint8[wxLZMA_BUF_SIZE];
+    m_pos = 0;
+
+    // We don't specify any memory usage limit nor any flags, not even
+    // LZMA_CONCATENATED recommended by liblzma documentation, because we don't
+    // foresee the need to support concatenated compressed files for now.
+    const lzma_ret rc = lzma_stream_decoder(m_stream, UINT64_MAX, 0);
+    switch ( rc )
+    {
+        case LZMA_OK:
+            // Skip setting m_lasterror below.
+            return;
+
+        case LZMA_MEM_ERROR:
+            wxLogError(_("Failed to allocate memory for LZMA decompression."));
+            break;
+
+        default:
+            wxLogError(_("Failed to initialize LZMA decompression: "
+                         "unexpected error %u."),
+                       rc);
+            break;
+    }
+
+    m_lasterror = wxSTREAM_READ_ERROR;
+}
+
+wxLZMAInputStream::~wxLZMAInputStream()
+{
+    delete [] m_inbuf;
+    delete m_stream;
+}
+
+size_t wxLZMAInputStream::OnSysRead(void* outbuf, size_t size)
+{
+    m_stream->next_out = static_cast<uint8_t*>(outbuf);
+    m_stream->avail_out = size;
+
+    // Decompress input as long as we don't have any errors (including EOF, as
+    // it doesn't make sense to continue after it neither) and have space to
+    // decompress it to.
+    while ( m_lasterror == wxSTREAM_NO_ERROR && m_stream->avail_out > 0 )
+    {
+        // Get more input data if needed.
+        if ( !m_stream->avail_in )
+        {
+            m_parent_i_stream->Read(m_inbuf, wxLZMA_BUF_SIZE);
+            m_stream->next_in = m_inbuf;
+            m_stream->avail_in = m_parent_i_stream->LastRead();
+
+            if ( !m_stream->avail_in )
+            {
+                if ( m_parent_i_stream->GetLastError() == wxSTREAM_EOF )
+                {
+                    // We have reached end of the underlying stream.
+                    m_lasterror = wxSTREAM_EOF;
+                    break;
+                }
+
+                m_lasterror = wxSTREAM_READ_ERROR;
+                return 0;
+            }
+        }
+
+        // Do decompress.
+        const lzma_ret rc = lzma_code(m_stream, LZMA_RUN);
+
+        wxString err;
+        switch ( rc )
+        {
+            case LZMA_OK:
+                continue;
+
+            case LZMA_STREAM_END:
+                m_lasterror = wxSTREAM_EOF;
+                continue;
+
+            case LZMA_FORMAT_ERROR:
+                err = wxTRANSLATE("input is not in XZ format");
+                break;
+
+            case LZMA_OPTIONS_ERROR:
+                err = wxTRANSLATE("input compressed using unknown XZ option");
+                break;
+
+            case LZMA_DATA_ERROR:
+            case LZMA_BUF_ERROR:
+                err = wxTRANSLATE("input is corrupted");
+                break;
+
+            default:
+                err = wxTRANSLATE("unknown decompression error");
+                break;
+        }
+
+        wxLogError(_("LZMA decompression error: %s"), wxGetTranslation(err));
+
+        m_lasterror = wxSTREAM_READ_ERROR;
+        return 0;
+    }
+
+    // Return the number of bytes actually read, this may be less than the
+    // requested size if we hit EOF.
+    size -= m_stream->avail_out;
+    m_pos += size;
+    return size;
+}
+
+#endif // wxUSE_LIBLZMA && wxUSE_STREAMS

From e66ade1b8496d9086a6e9189e5a33cb3a6e73e22 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 30 Mar 2018 00:11:31 +0200
Subject: [PATCH 467/916] Factor out reusable part of wxLZMAInputStream into
 wxLZMAData

No changes yet, this is a pure refactoring in preparation for adding
wxLZMAOutputStream.
---
 include/wx/lzmastream.h   | 44 +++++++++++++++++++++++++--------
 src/common/lzmastream.cpp | 52 ++++++++++++++++++++-------------------
 2 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/include/wx/lzmastream.h b/include/wx/lzmastream.h
index 3c2a77808f..604a2543a2 100644
--- a/include/wx/lzmastream.h
+++ b/include/wx/lzmastream.h
@@ -17,18 +17,48 @@
 #include "wx/stream.h"
 #include "wx/versioninfo.h"
 
+namespace wxPrivate
+{
+
+// Private wrapper for lzma_stream struct.
 struct wxLZMAStream;
 
+// Common part of input and output LZMA streams: this is just an implementation
+// detail and is not part of the public API.
+class WXDLLIMPEXP_BASE wxLZMAData
+{
+protected:
+    wxLZMAData();
+    ~wxLZMAData();
+
+    wxLZMAStream* m_stream;
+    wxUint8* m_streamBuf;
+    wxFileOffset m_pos;
+
+    wxDECLARE_NO_COPY_CLASS(wxLZMAData);
+};
+
+} // namespace wxPrivate
+
 // ----------------------------------------------------------------------------
 // Filter for decompressing data compressed using LZMA
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxLZMAInputStream : public wxFilterInputStream
+class WXDLLIMPEXP_BASE wxLZMAInputStream : public wxFilterInputStream,
+                                           private wxPrivate::wxLZMAData
 {
 public:
-    explicit wxLZMAInputStream(wxInputStream& stream);
-    explicit wxLZMAInputStream(wxInputStream* stream);
-    virtual ~wxLZMAInputStream();
+    explicit wxLZMAInputStream(wxInputStream& stream)
+        : wxFilterInputStream(stream)
+    {
+        Init();
+    }
+
+    explicit wxLZMAInputStream(wxInputStream* stream)
+        : wxFilterInputStream(stream)
+    {
+        Init();
+    }
 
     char Peek() wxOVERRIDE { return wxInputStream::Peek(); }
     wxFileOffset GetLength() const wxOVERRIDE { return wxInputStream::GetLength(); }
@@ -39,12 +69,6 @@ protected:
 
 private:
     void Init();
-
-    wxLZMAStream* m_stream;
-    wxUint8* m_inbuf;
-    wxFileOffset m_pos;
-
-    wxDECLARE_NO_COPY_CLASS(wxLZMAInputStream);
 };
 
 WXDLLIMPEXP_BASE wxVersionInfo wxGetLibLZMAVersionInfo();
diff --git a/src/common/lzmastream.cpp b/src/common/lzmastream.cpp
index b8aae286f1..e07460b7df 100644
--- a/src/common/lzmastream.cpp
+++ b/src/common/lzmastream.cpp
@@ -33,11 +33,14 @@
 
 #include <lzma.h>
 
+namespace wxPrivate
+{
+
 // ----------------------------------------------------------------------------
 // Constants
 // ----------------------------------------------------------------------------
 
-static const size_t wxLZMA_BUF_SIZE = 4096;
+const size_t wxLZMA_BUF_SIZE = 4096;
 
 // ----------------------------------------------------------------------------
 // Private helpers
@@ -58,6 +61,10 @@ struct wxLZMAStream : lzma_stream
     }
 };
 
+} // namespace wxPrivate
+
+using namespace wxPrivate;
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -80,28 +87,29 @@ wxVersionInfo wxGetLibLZMAVersionInfo()
            );
 }
 
+// ----------------------------------------------------------------------------
+// wxLZMAData: common helpers for compression and decompression
+// ----------------------------------------------------------------------------
+
+wxLZMAData::wxLZMAData()
+{
+    m_stream = new wxLZMAStream;
+    m_streamBuf = new wxUint8[wxLZMA_BUF_SIZE];
+    m_pos = 0;
+}
+
+wxLZMAData::~wxLZMAData()
+{
+    delete [] m_streamBuf;
+    delete m_stream;
+}
+
 // ----------------------------------------------------------------------------
 // wxLZMAInputStream: decompression
 // ----------------------------------------------------------------------------
 
-wxLZMAInputStream::wxLZMAInputStream(wxInputStream& stream)
-    : wxFilterInputStream(stream)
-{
-    Init();
-}
-
-wxLZMAInputStream::wxLZMAInputStream(wxInputStream* stream)
-    : wxFilterInputStream(stream)
-{
-    Init();
-}
-
 void wxLZMAInputStream::Init()
 {
-    m_stream = new wxLZMAStream;
-    m_inbuf = new wxUint8[wxLZMA_BUF_SIZE];
-    m_pos = 0;
-
     // We don't specify any memory usage limit nor any flags, not even
     // LZMA_CONCATENATED recommended by liblzma documentation, because we don't
     // foresee the need to support concatenated compressed files for now.
@@ -126,12 +134,6 @@ void wxLZMAInputStream::Init()
     m_lasterror = wxSTREAM_READ_ERROR;
 }
 
-wxLZMAInputStream::~wxLZMAInputStream()
-{
-    delete [] m_inbuf;
-    delete m_stream;
-}
-
 size_t wxLZMAInputStream::OnSysRead(void* outbuf, size_t size)
 {
     m_stream->next_out = static_cast<uint8_t*>(outbuf);
@@ -145,8 +147,8 @@ size_t wxLZMAInputStream::OnSysRead(void* outbuf, size_t size)
         // Get more input data if needed.
         if ( !m_stream->avail_in )
         {
-            m_parent_i_stream->Read(m_inbuf, wxLZMA_BUF_SIZE);
-            m_stream->next_in = m_inbuf;
+            m_parent_i_stream->Read(m_streamBuf, wxLZMA_BUF_SIZE);
+            m_stream->next_in = m_streamBuf;
             m_stream->avail_in = m_parent_i_stream->LastRead();
 
             if ( !m_stream->avail_in )

From 50b102ffd2bf1727f6324ba7aca0e061000f19b1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 30 Mar 2018 01:57:02 +0200
Subject: [PATCH 468/916] Add wxLZMAOutputStream for compressing data using
 LZMA

As liblzma API is similar to zlib API, this class is also close to
wxZlibOutputStream, except that it uses reusable functions instead of
repeating their code.
---
 docs/doxygen/mainpages/cat_classes.h |   1 +
 include/wx/lzmastream.h              |  46 ++++++++
 interface/wx/lzmastream.h            |  40 ++++++-
 src/common/lzmastream.cpp            | 160 +++++++++++++++++++++++++++
 4 files changed, 246 insertions(+), 1 deletion(-)

diff --git a/docs/doxygen/mainpages/cat_classes.h b/docs/doxygen/mainpages/cat_classes.h
index 66bad14a00..f48a4b032a 100644
--- a/docs/doxygen/mainpages/cat_classes.h
+++ b/docs/doxygen/mainpages/cat_classes.h
@@ -704,6 +704,7 @@ Related overview: @ref overview_stream
 @li wxStringInputStream: String input stream class
 @li wxStringOutputStream: String output stream class
 @li wxLZMAInputStream: LZMA decompression stream class
+@li wxLZMAOutputStream: LZMA compression stream class
 @li wxZlibInputStream: Zlib and gzip (compression) input stream class
 @li wxZlibOutputStream: Zlib and gzip (compression) output stream class
 @li wxZipInputStream: Input stream for reading from ZIP archives
diff --git a/include/wx/lzmastream.h b/include/wx/lzmastream.h
index 604a2543a2..5164d67f86 100644
--- a/include/wx/lzmastream.h
+++ b/include/wx/lzmastream.h
@@ -71,6 +71,52 @@ private:
     void Init();
 };
 
+// ----------------------------------------------------------------------------
+// Filter for compressing data using LZMA(2) algorithm
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxLZMAOutputStream : public wxFilterOutputStream,
+                                            private wxPrivate::wxLZMAData
+{
+public:
+    explicit wxLZMAOutputStream(wxOutputStream& stream, int level = -1)
+        : wxFilterOutputStream(stream)
+    {
+        Init(level);
+    }
+
+    explicit wxLZMAOutputStream(wxOutputStream* stream, int level = -1)
+        : wxFilterOutputStream(stream)
+    {
+        Init(level);
+    }
+
+    virtual ~wxLZMAOutputStream() { Close(); }
+
+    void Sync() wxOVERRIDE { DoFlush(false); }
+    bool Close() wxOVERRIDE;
+    wxFileOffset GetLength() const wxOVERRIDE { return m_pos; }
+
+protected:
+    size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE;
+    wxFileOffset OnSysTell() const wxOVERRIDE { return m_pos; }
+
+private:
+    void Init(int level);
+
+    // Write the contents of the internal buffer to the output stream.
+    bool UpdateOutput();
+
+    // Write out the current buffer if necessary, i.e. if no space remains in
+    // it, and reinitialize m_stream to point to it. Returns false on success
+    // or false on error, in which case m_lasterror is updated.
+    bool UpdateOutputIfNecessary();
+
+    // Run LZMA_FINISH (if argument is true) or LZMA_FULL_FLUSH, return true on
+    // success or false on error.
+    bool DoFlush(bool finish);
+};
+
 WXDLLIMPEXP_BASE wxVersionInfo wxGetLibLZMAVersionInfo();
 
 #endif // wxUSE_LIBLZMA && wxUSE_STREAMS
diff --git a/interface/wx/lzmastream.h b/interface/wx/lzmastream.h
index 7ca8fb5d32..58c5ad5288 100644
--- a/interface/wx/lzmastream.h
+++ b/interface/wx/lzmastream.h
@@ -33,7 +33,7 @@
     @library{wxbase}
     @category{archive,streams}
 
-    @see wxInputStream, wxZlibInputStream
+    @see wxInputStream, wxZlibInputStream, wxLZMAOutputStream.
 
     @since 3.1.2
 */
@@ -58,3 +58,41 @@ public:
      */
     wxLZMAInputStream(wxInputStream* stream);
 };
+
+/**
+    @class wxLZMAOutputStream
+
+    This filter stream compresses data using XZ format.
+
+    XZ format uses LZMA compression, making it (significantly) more efficient
+    than Gzip format used by wxZlibOutputStream. Output generated by this class
+    is compatible with xz utilities working with .xz files and also supported
+    by 7-Zip program, even though it is different from its native .7z format.
+
+    @library{wxbase}
+    @category{archive,streams}
+
+    @see wxOutputStream, wxZlibOutputStream, wxLZMAInputStream
+
+    @since 3.1.2
+*/
+class wxLZMAOutputStream : public wxFilterOutputStream
+{
+    /**
+        Create compressing stream associated with the given underlying
+        stream.
+
+        This overload does not take ownership of the @a stream.
+    */
+    wxLZMAOutputStream(wxOutputStream& stream);
+
+    /**
+        Create compressing stream associated with the given underlying
+        stream and takes ownership of it.
+
+        As with the base wxFilterOutputStream class, passing @a stream by
+        pointer indicates that this object takes ownership of it and will
+        delete it when it is itself destroyed.
+     */
+    wxLZMAOutputStream(wxOutputStream* stream);
+};
diff --git a/src/common/lzmastream.cpp b/src/common/lzmastream.cpp
index e07460b7df..f931c83f6e 100644
--- a/src/common/lzmastream.cpp
+++ b/src/common/lzmastream.cpp
@@ -209,4 +209,164 @@ size_t wxLZMAInputStream::OnSysRead(void* outbuf, size_t size)
     return size;
 }
 
+// ----------------------------------------------------------------------------
+// wxLZMAOutputStream: compression
+// ----------------------------------------------------------------------------
+
+void wxLZMAOutputStream::Init(int level)
+{
+    if ( level == -1 )
+        level = LZMA_PRESET_DEFAULT;
+
+    // Use the check type recommended by liblzma documentation.
+    const lzma_ret rc = lzma_easy_encoder(m_stream, level, LZMA_CHECK_CRC64);
+    switch ( rc )
+    {
+        case LZMA_OK:
+            // Prepare for the first call to OnSysWrite().
+            m_stream->next_out = m_streamBuf;
+            m_stream->avail_out = wxLZMA_BUF_SIZE;
+
+            // Skip setting m_lasterror below.
+            return;
+
+        case LZMA_MEM_ERROR:
+            wxLogError(_("Failed to allocate memory for LZMA compression."));
+            break;
+
+        default:
+            wxLogError(_("Failed to initialize LZMA compression: "
+                         "unexpected error %u."),
+                       rc);
+            break;
+    }
+
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+}
+
+size_t wxLZMAOutputStream::OnSysWrite(const void *inbuf, size_t size)
+{
+    m_stream->next_in = static_cast<const uint8_t*>(inbuf);
+    m_stream->avail_in = size;
+
+    // Compress as long as we have any input data, but stop at first error as
+    // it's useless to try to continue after it (or even starting if the stream
+    // had already been in an error state).
+    while ( m_lasterror == wxSTREAM_NO_ERROR && m_stream->avail_in > 0 )
+    {
+        // Flush the output buffer if necessary.
+        if ( !UpdateOutputIfNecessary() )
+            return 0;
+
+        const lzma_ret rc = lzma_code(m_stream, LZMA_RUN);
+
+        wxString err;
+        switch ( rc )
+        {
+            case LZMA_OK:
+                continue;
+
+            case LZMA_MEM_ERROR:
+                err = wxTRANSLATE("out of memory");
+                break;
+
+            case LZMA_STREAM_END:
+                // This is unexpected as we don't use LZMA_FINISH here.
+                wxFAIL_MSG( "Unexpected LZMA stream end" );
+                wxFALLTHROUGH;
+
+            default:
+                err = wxTRANSLATE("unknown compression error");
+                break;
+        }
+
+        wxLogError(_("LZMA compression error: %s"), wxGetTranslation(err));
+
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+        return 0;
+    }
+
+    m_pos += size;
+    return size;
+}
+
+bool wxLZMAOutputStream::UpdateOutput()
+{
+    // Write the buffer contents to the real output, taking care only to write
+    // as much of it as we actually have, as the buffer can (and very likely
+    // will) be incomplete.
+    const size_t numOut = wxLZMA_BUF_SIZE - m_stream->avail_out;
+    m_parent_o_stream->Write(m_streamBuf, numOut);
+    if ( m_parent_o_stream->LastWrite() != numOut )
+    {
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+        return false;
+    }
+
+    return true;
+}
+
+bool wxLZMAOutputStream::UpdateOutputIfNecessary()
+{
+    if ( !m_stream->avail_out )
+    {
+        if ( !UpdateOutput() )
+            return false;
+
+        m_stream->next_out = m_streamBuf;
+        m_stream->avail_out = wxLZMA_BUF_SIZE;
+    }
+
+    return true;
+}
+
+bool wxLZMAOutputStream::DoFlush(bool finish)
+{
+    const lzma_action action = finish ? LZMA_FINISH : LZMA_FULL_FLUSH;
+
+    while ( m_lasterror == wxSTREAM_NO_ERROR )
+    {
+        if ( !UpdateOutputIfNecessary() )
+            break;
+
+        const lzma_ret rc = lzma_code(m_stream, action);
+
+        wxString err;
+        switch ( rc )
+        {
+            case LZMA_OK:
+                continue;
+
+            case LZMA_STREAM_END:
+                // Don't forget to output the last part of the data.
+                return UpdateOutput();
+
+            case LZMA_MEM_ERROR:
+                err = wxTRANSLATE("out of memory");
+
+            default:
+                err = wxTRANSLATE("unknown compression error");
+                break;
+        }
+
+        wxLogError(_("LZMA compression error when flushing output: %s"),
+                   wxGetTranslation(err));
+
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    }
+
+    return false;
+}
+
+bool wxLZMAOutputStream::Close()
+{
+    if ( !DoFlush(true) )
+        return false;
+
+    m_stream->next_out = m_streamBuf;
+    m_stream->avail_out = wxLZMA_BUF_SIZE;
+
+    return wxFilterOutputStream::Close() && IsOk();
+}
+
 #endif // wxUSE_LIBLZMA && wxUSE_STREAMS

From 7c34ca65a0b30d81b5fba000c259407148006063 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 30 Mar 2018 21:55:36 +0200
Subject: [PATCH 469/916] Add unit test for wxLZMA{Input,Output}Stream classes

Create another generic stream test using BaseStreamTestCase framework.
---
 tests/Makefile.in            |  4 ++
 tests/makefile.bcc           |  4 ++
 tests/makefile.gcc           |  4 ++
 tests/makefile.vc            |  4 ++
 tests/streams/lzmastream.cpp | 90 ++++++++++++++++++++++++++++++++++++
 tests/test.bkl               |  1 +
 tests/test.vcxproj           |  3 +-
 tests/test.vcxproj.filters   |  5 +-
 tests/test_vc7_test.vcproj   |  3 ++
 tests/test_vc8_test.vcproj   |  4 ++
 tests/test_vc9_test.vcproj   |  4 ++
 11 files changed, 124 insertions(+), 2 deletions(-)
 create mode 100644 tests/streams/lzmastream.cpp

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 69d960b891..d20559e8fe 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -120,6 +120,7 @@ TEST_OBJECTS =  \
 	test_filestream.o \
 	test_iostreams.o \
 	test_largefile.o \
+	test_lzmastream.o \
 	test_memstream.o \
 	test_socketstream.o \
 	test_sstream.o \
@@ -687,6 +688,9 @@ test_iostreams.o: $(srcdir)/streams/iostreams.cpp $(TEST_ODEP)
 test_largefile.o: $(srcdir)/streams/largefile.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/largefile.cpp
 
+test_lzmastream.o: $(srcdir)/streams/lzmastream.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/lzmastream.cpp
+
 test_memstream.o: $(srcdir)/streams/memstream.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/streams/memstream.cpp
 
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 25f9fc68d1..30897885eb 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -102,6 +102,7 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_filestream.obj \
 	$(OBJS)\test_iostreams.obj \
 	$(OBJS)\test_largefile.obj \
+	$(OBJS)\test_lzmastream.obj \
 	$(OBJS)\test_memstream.obj \
 	$(OBJS)\test_socketstream.obj \
 	$(OBJS)\test_sstream.obj \
@@ -734,6 +735,9 @@ $(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
 $(OBJS)\test_largefile.obj: .\streams\largefile.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
 
+$(OBJS)\test_lzmastream.obj: .\streams\lzmastream.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\lzmastream.cpp
+
 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index c6971bac0b..b9a05edb64 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -94,6 +94,7 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_filestream.o \
 	$(OBJS)\test_iostreams.o \
 	$(OBJS)\test_largefile.o \
+	$(OBJS)\test_lzmastream.o \
 	$(OBJS)\test_memstream.o \
 	$(OBJS)\test_socketstream.o \
 	$(OBJS)\test_sstream.o \
@@ -711,6 +712,9 @@ $(OBJS)\test_iostreams.o: ./streams/iostreams.cpp
 $(OBJS)\test_largefile.o: ./streams/largefile.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_lzmastream.o: ./streams/lzmastream.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_memstream.o: ./streams/memstream.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 9ccebcdd66..8ae6c6c439 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -97,6 +97,7 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_filestream.obj \
 	$(OBJS)\test_iostreams.obj \
 	$(OBJS)\test_largefile.obj \
+	$(OBJS)\test_lzmastream.obj \
 	$(OBJS)\test_memstream.obj \
 	$(OBJS)\test_socketstream.obj \
 	$(OBJS)\test_sstream.obj \
@@ -913,6 +914,9 @@ $(OBJS)\test_iostreams.obj: .\streams\iostreams.cpp
 $(OBJS)\test_largefile.obj: .\streams\largefile.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\largefile.cpp
 
+$(OBJS)\test_lzmastream.obj: .\streams\lzmastream.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\lzmastream.cpp
+
 $(OBJS)\test_memstream.obj: .\streams\memstream.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\streams\memstream.cpp
 
diff --git a/tests/streams/lzmastream.cpp b/tests/streams/lzmastream.cpp
new file mode 100644
index 0000000000..6bd6f2dd61
--- /dev/null
+++ b/tests/streams/lzmastream.cpp
@@ -0,0 +1,90 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/streams/lzmastream.cpp
+// Purpose:     Unit tests for LZMA stream classes
+// Author:      Vadim Zeitlin
+// Created:     2018-03-30
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_LIBLZMA && wxUSE_STREAMS
+
+#include "wx/mstream.h"
+#include "wx/lzmastream.h"
+
+#include "bstream.h"
+
+class LZMAStream : public BaseStreamTestCase<wxLZMAInputStream, wxLZMAOutputStream>
+{
+public:
+    LZMAStream();
+
+    CPPUNIT_TEST_SUITE(zlibStream);
+        // Base class stream tests.
+        CPPUNIT_TEST(Input_GetSizeFail);
+        CPPUNIT_TEST(Input_GetC);
+        CPPUNIT_TEST(Input_Read);
+        CPPUNIT_TEST(Input_Eof);
+        CPPUNIT_TEST(Input_LastRead);
+        CPPUNIT_TEST(Input_CanRead);
+        CPPUNIT_TEST(Input_SeekIFail);
+        CPPUNIT_TEST(Input_TellI);
+        CPPUNIT_TEST(Input_Peek);
+        CPPUNIT_TEST(Input_Ungetch);
+
+        CPPUNIT_TEST(Output_PutC);
+        CPPUNIT_TEST(Output_Write);
+        CPPUNIT_TEST(Output_LastWrite);
+        CPPUNIT_TEST(Output_SeekOFail);
+        CPPUNIT_TEST(Output_TellO);
+    CPPUNIT_TEST_SUITE_END();
+
+protected:
+    wxLZMAInputStream *DoCreateInStream() wxOVERRIDE;
+    wxLZMAOutputStream *DoCreateOutStream() wxOVERRIDE;
+
+private:
+    wxDECLARE_NO_COPY_CLASS(LZMAStream);
+};
+
+STREAM_TEST_SUBSUITE_NAMED_REGISTRATION(LZMAStream)
+
+LZMAStream::LZMAStream()
+{
+    // Disable TellI() and TellO() tests in the base class which don't work
+    // with the compressed streams.
+    m_bSimpleTellITest =
+    m_bSimpleTellOTest = true;
+}
+
+wxLZMAInputStream *LZMAStream::DoCreateInStream()
+{
+    // Compress some data.
+    const char data[] = "This is just some test data for LZMA streams unit test";
+    const size_t len = sizeof(data);
+
+    wxMemoryOutputStream outmem;
+    wxLZMAOutputStream outz(outmem);
+    outz.Write(data, len);
+    REQUIRE( outz.LastWrite() == len );
+    REQUIRE( outz.Close() );
+
+    wxMemoryInputStream* const inmem = new wxMemoryInputStream(outmem);
+    REQUIRE( inmem->IsOk() );
+
+    // Give ownership of the memory input stream to the LZMA stream.
+    return new wxLZMAInputStream(inmem);
+}
+
+wxLZMAOutputStream *LZMAStream::DoCreateOutStream()
+{
+    return new wxLZMAOutputStream(new wxMemoryOutputStream());
+}
+
+#endif // wxUSE_LIBLZMA && wxUSE_STREAMS
diff --git a/tests/test.bkl b/tests/test.bkl
index 95007b4836..47016bcf33 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -90,6 +90,7 @@
             streams/filestream.cpp
             streams/iostreams.cpp
             streams/largefile.cpp
+            streams/lzmastream.cpp
             streams/memstream.cpp
             streams/socketstream.cpp
             streams/sstream.cpp
diff --git a/tests/test.vcxproj b/tests/test.vcxproj
index 0844c93994..d4626936c7 100644
--- a/tests/test.vcxproj
+++ b/tests/test.vcxproj
@@ -517,6 +517,7 @@
     <ClCompile Include="streams\filestream.cpp" />
     <ClCompile Include="streams\iostreams.cpp" />
     <ClCompile Include="streams\largefile.cpp" />
+    <ClCompile Include="streams\lzmastream.cpp" />
     <ClCompile Include="streams\memstream.cpp" />
     <ClCompile Include="streams\socketstream.cpp" />
     <ClCompile Include="streams\sstream.cpp" />
@@ -553,4 +554,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/test.vcxproj.filters b/tests/test.vcxproj.filters
index d3365dc7e6..502e186b28 100644
--- a/tests/test.vcxproj.filters
+++ b/tests/test.vcxproj.filters
@@ -262,5 +262,8 @@
     <ClCompile Include="streams\zlibstream.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="streams\lzmastream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 45b3604544..9443e3b8c9 100644
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -448,6 +448,9 @@
 			<File
 				RelativePath=".\longlong\longlongtest.cpp">
 			</File>
+			<File
+				RelativePath=".\streams\lzmastream.cpp">
+			</File>
 			<File
 				RelativePath=".\mbconv\mbconvtest.cpp">
 			</File>
diff --git a/tests/test_vc8_test.vcproj b/tests/test_vc8_test.vcproj
index 6501c9dc08..d085fdc4a3 100644
--- a/tests/test_vc8_test.vcproj
+++ b/tests/test_vc8_test.vcproj
@@ -1066,6 +1066,10 @@
 				RelativePath=".\longlong\longlongtest.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\streams\lzmastream.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\mbconv\mbconvtest.cpp"
 				>
diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index 1c9cfd4b7c..4570595312 100644
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -1038,6 +1038,10 @@
 				RelativePath=".\longlong\longlongtest.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\streams\lzmastream.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\mbconv\mbconvtest.cpp"
 				>

From 1cdb384d7bf73eb650654a692d23a14443e37beb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 30 Mar 2018 22:11:07 +0200
Subject: [PATCH 470/916] Add wxLZMAClassFactory for run-time LZMA stream
 creation

This should allow handling .xz files in wxFileSystem, for example.
---
 include/wx/lzmastream.h   | 25 +++++++++++++++++++++++++
 src/common/lzmastream.cpp | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/include/wx/lzmastream.h b/include/wx/lzmastream.h
index 5164d67f86..9bd2ab1bab 100644
--- a/include/wx/lzmastream.h
+++ b/include/wx/lzmastream.h
@@ -117,6 +117,31 @@ private:
     bool DoFlush(bool finish);
 };
 
+// ----------------------------------------------------------------------------
+// Support for creating LZMA streams from extension/MIME type
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxLZMAClassFactory: public wxFilterClassFactory
+{
+public:
+    wxLZMAClassFactory();
+
+    wxFilterInputStream *NewStream(wxInputStream& stream) const wxOVERRIDE
+        { return new wxLZMAInputStream(stream); }
+    wxFilterOutputStream *NewStream(wxOutputStream& stream) const wxOVERRIDE
+        { return new wxLZMAOutputStream(stream, -1); }
+    wxFilterInputStream *NewStream(wxInputStream *stream) const wxOVERRIDE
+        { return new wxLZMAInputStream(stream); }
+    wxFilterOutputStream *NewStream(wxOutputStream *stream) const wxOVERRIDE
+        { return new wxLZMAOutputStream(stream, -1); }
+
+    const wxChar * const *GetProtocols(wxStreamProtocolType type
+                                       = wxSTREAM_PROTOCOL) const wxOVERRIDE;
+
+private:
+    wxDECLARE_DYNAMIC_CLASS(wxLZMAClassFactory);
+};
+
 WXDLLIMPEXP_BASE wxVersionInfo wxGetLibLZMAVersionInfo();
 
 #endif // wxUSE_LIBLZMA && wxUSE_STREAMS
diff --git a/src/common/lzmastream.cpp b/src/common/lzmastream.cpp
index f931c83f6e..7c4c62a335 100644
--- a/src/common/lzmastream.cpp
+++ b/src/common/lzmastream.cpp
@@ -369,4 +369,37 @@ bool wxLZMAOutputStream::Close()
     return wxFilterOutputStream::Close() && IsOk();
 }
 
+// ----------------------------------------------------------------------------
+// wxLZMAClassFactory: allow creating streams from extension/MIME type
+// ----------------------------------------------------------------------------
+
+wxIMPLEMENT_DYNAMIC_CLASS(wxLZMAClassFactory, wxFilterClassFactory);
+
+static wxLZMAClassFactory g_wxLZMAClassFactory;
+
+wxLZMAClassFactory::wxLZMAClassFactory()
+{
+    if ( this == &g_wxLZMAClassFactory )
+        PushFront();
+}
+
+const wxChar * const *
+wxLZMAClassFactory::GetProtocols(wxStreamProtocolType type) const
+{
+    static const wxChar *mime[] = { wxT("application/xz"), NULL };
+    static const wxChar *encs[] = { wxT("xz"), NULL };
+    static const wxChar *exts[] = { wxT(".xz"), NULL };
+
+    const wxChar* const* ret = NULL;
+    switch ( type )
+    {
+        case wxSTREAM_PROTOCOL: ret = encs; break;
+        case wxSTREAM_MIMETYPE: ret = mime; break;
+        case wxSTREAM_ENCODING: ret = encs; break;
+        case wxSTREAM_FILEEXT:  ret = exts; break;
+    }
+
+    return ret;
+}
+
 #endif // wxUSE_LIBLZMA && wxUSE_STREAMS

From 251569496b9902bf82754e8f820f6b9946d3475b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 30 Mar 2018 22:21:37 +0200
Subject: [PATCH 471/916] Document wxGetLibLZMAVersionInfo() function

Add initially forgotten documentation.
---
 interface/wx/lzmastream.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/interface/wx/lzmastream.h b/interface/wx/lzmastream.h
index 58c5ad5288..2a6dd5626e 100644
--- a/interface/wx/lzmastream.h
+++ b/interface/wx/lzmastream.h
@@ -96,3 +96,15 @@ class wxLZMAOutputStream : public wxFilterOutputStream
      */
     wxLZMAOutputStream(wxOutputStream* stream);
 };
+
+/**
+    Return the version of liblzma library used by LZMA stream classes.
+
+    @see wxVersionInfo
+
+    @header{wx/lzmastream.h}
+    @library{wxbase}
+
+    @since 3.1.2
+*/
+wxVersionInfo wxGetLibLZMAVersionInfo();

From deee5c19eb7890decd31b3440943946e8fbba808 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 1 Apr 2018 19:07:12 +0200
Subject: [PATCH 472/916] Document how to build wxWidgets with liblzma support

Explain what needs to be done under MSW in order to use LZMA compression
classes.
---
 docs/doxygen/mainpages/const_wxusedef.h |   1 +
 docs/doxygen/mainpages/liblzma.h        | 140 ++++++++++++++++++++++++
 interface/wx/lzmastream.h               |   6 +
 3 files changed, 147 insertions(+)
 create mode 100644 docs/doxygen/mainpages/liblzma.h

diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h
index 3753cab329..3c2040bcb8 100644
--- a/docs/doxygen/mainpages/const_wxusedef.h
+++ b/docs/doxygen/mainpages/const_wxusedef.h
@@ -148,6 +148,7 @@ library:
 @itemdef{wxUSE_IPV6, Use experimental wxIPV6address and related classes.}
 @itemdef{wxUSE_JOYSTICK, Use wxJoystick class.}
 @itemdef{wxUSE_LIBJPEG, Enables JPEG format support (requires libjpeg).}
+@itemdef{wxUSE_LIBLZMA, Enables LZMA compression support (see @ref page_build_liblzma).}
 @itemdef{wxUSE_LIBPNG, Enables PNG format support (requires libpng). Also requires wxUSE_ZLIB.}
 @itemdef{wxUSE_LIBTIFF, Enables TIFF format support (requires libtiff).}
 @itemdef{wxUSE_LISTBOOK, Use wxListbook class.}
diff --git a/docs/doxygen/mainpages/liblzma.h b/docs/doxygen/mainpages/liblzma.h
new file mode 100644
index 0000000000..e3d5b5d189
--- /dev/null
+++ b/docs/doxygen/mainpages/liblzma.h
@@ -0,0 +1,140 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        liblzma.h
+// Purpose:     Documentation of the use of liblzma with wxWidgets
+// Author:      Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/**
+
+@page page_build_liblzma Using LZMA compression with liblzma
+
+To use wxLZMAInputStream and wxLZMAOutputStream classes, a public domain
+liblzma library is required when building wxWidgets. This guide explains how to
+make liblzma available and let wxWidgets build system use it. The exact steps
+depend on the operating system and compiler used, please refer to the
+section appropriate for your environment below.
+
+@section page_build_liblzma_unix Unix-like operating system (including Cygwin)
+
+Under many Unix or Unix-like (including Cygwin) systems, liblzma is available
+as a system package and the simplest thing to do is to just install it using
+the system-specific tool (apt, yum, ...). Just note that you need to install
+the liblzma-dev or liblzma-devel package in order to obtain the library headers
+and not just the library itself.
+
+If your system doesn't provide such package or you need to use a newer version
+than is available in the system repositories, it is also simple to build
+liblzma from sources: basically, just download the library sources from
+https://tukaani.org/xz/ or clone its repository and perform the usual
+
+@code
+    $ ./configure
+    $ make
+    $ make install
+@endcode
+
+commands sequence.
+
+As wxWidgets is built using either configure or CMake under Unix-like systems,
+there is nothing special to do to let wxWidgets use liblzma, as it will be
+detected automatically -- just check the end of configure or CMake output to
+confirm that it was found. If this is not the case because the library was
+installed in some non-default location, you need to provide @c CPPFLAGS and @c
+LDFLAGS on configure command line, e.g.:
+
+@code
+    $ ../configure CPPFLAGS=-I/opt/liblzma/include LDFLAGS=-L/opt/liblzma/lib
+@endcode
+
+
+@section page_build_liblzma_msw MSW not using configure
+
+When not using configure, you must edit @c wx/msw/setup.h file and change the
+value of @c wxUSE_LIBLZMA option to @c 1 manually in order to enable LZMA
+support, which is disabled by default.
+
+Next, you need to actually ensure that the library is available to be able to
+build wxWidgets:
+
+@subsection page_build_liblzma_msw_vcpkg MSW using MSVS 2015 with Vcpkg
+
+If you build wxWidgets with Microsoft Visual Studio 2015.3 or later, you can
+use Microsoft vcpkg tool (see https://github.com/Microsoft/vcpkg) to install
+liblzma as any other library and integrate it with Microsoft Visual Studio
+automatically. Please see vcpkg documentation for details, but, basically, it's
+as simple as executing the following commands:
+
+@code
+    > git clone https://github.com/Microsoft/vcpkg.git
+    > cd vcpkg
+    > .\bootstrap-vcpkg.bat
+    > .\vcpkg integrate install
+    > .\vcpkg install liblzma
+@endcode
+
+Afterwards, liblzma headers and libraries (in DLL form) will be available to
+all C++ Visual Studio projects, including wxWidgets, so you just need to build
+it as usual, i.e. by opening @c build/msw/wx_vcXX.sln file and building it.
+
+
+@section page_build_liblzma_msw_manual MSW manual setup
+
+First of all, you need to either build or download liblzma binaries. Building
+the library from source with gcc requires configure, and as you don't use an
+environment capable of running it (if you're, you're reading the wrong section
+of this guide, please go to the first one instead), it might be simpler to just
+download the binaries from https://tukaani.org/xz/
+
+However these binaries don't provide import libraries for MSVC, so you may
+prefer building from source when using this compiler, provided it is at least
+2013.2 or later (otherwise, you must use the binaries and create the import
+library from the DLL). To do it, simply open the MSVS solution provided under
+@c windows directory of the source archive corresponding to your compiler
+version and build all the relevant configurations. Notice that you may build it
+as either a static or a dynamic library, but if you choose the former, you must
+also predefine @c LZMA_API_STATIC when building wxWidgets.
+
+
+Second, you need to let wxWidgets build system know about the liblzma headers
+and libraries location. When using makefiles, with either gcc or MSVC compiler,
+this can be done simply by specifying @c CPPFLAGS and @c LDFLAGS on make
+command line, e.g.
+
+@code
+    > make -f makefile.gcc CPPFLAGS=-Ic:/dev/include LDFLAGS=-Lc:/dev/lib
+@endcode
+
+If you built liblzma as a static library, change @c CPPFLAGS to also include @c
+-DLZMA_API_STATIC.
+
+
+When building wxWidgets with MSVC project files, you must update them to use
+liblzma. For this, start by copying build\\msw\\wx_setup.props file to
+build\\msw\\wx_local.props, if you don't have the latter file yet. Then open
+this file in your favourite editor and locate the @c Link tag inside an @c
+ItemDefinitionGroup tag and add a new @c AdditionalIncludeDirectories line
+inside the @c ClCompile tag as well as add @c liblzma.lib to the @c
+AdditionalDependencies tag under @c Link itself. The result should look like
+the following, assuming liblzma sources are in c:\\src\\liblzma:
+
+@code
+  <ItemDefinitionGroup>
+    <ClCompile>
+      ... any existing lines here ...
+      <AdditionalIncludeDirectories>c:\src\liblzma\src\liblzma\api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <!--
+        Uncomment this line if, and only if, you link with liblzma statically.
+      <PreprocessorDefinitions>LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+        -->
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>... all the previously listed libraries;c:\src\liblzma\windows\vs2017\$(Configuration)\$(Platform)\liblzma_dll\liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+@endcode
+
+Afterwards, build wxWidgets as usual and don't forget to provide @c liblzma.dll
+when distributing your application unless you have decided to link it
+statically.
+ */
diff --git a/interface/wx/lzmastream.h b/interface/wx/lzmastream.h
index 2a6dd5626e..0b59499aa0 100644
--- a/interface/wx/lzmastream.h
+++ b/interface/wx/lzmastream.h
@@ -30,6 +30,9 @@
     }
     @endcode
 
+    See @ref page_build_liblzma for information about liblzma, required in
+    order to use this class.
+
     @library{wxbase}
     @category{archive,streams}
 
@@ -69,6 +72,9 @@ public:
     is compatible with xz utilities working with .xz files and also supported
     by 7-Zip program, even though it is different from its native .7z format.
 
+    See @ref page_build_liblzma for information about liblzma, required in
+    order to use this class.
+
     @library{wxbase}
     @category{archive,streams}
 

From 748c0150c23bdef9f6fd5f6a4fa2923e63c623dc Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Sat, 7 Apr 2018 21:51:08 +0200
Subject: [PATCH 473/916] Clarify wxSL_SELRANGE description

The user cannot select a range, the selection range can be changed only programatically.
---
 interface/wx/slider.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/wx/slider.h b/interface/wx/slider.h
index b97122ba53..68815389c5 100644
--- a/interface/wx/slider.h
+++ b/interface/wx/slider.h
@@ -58,7 +58,7 @@
     @style{wxSL_BOTTOM}
            Displays ticks on the bottom (this is the default).
     @style{wxSL_SELRANGE}
-           Allows the user to select a range on the slider. Windows only.
+           Displays a highlighted selection range. Windows only.
     @style{wxSL_INVERSE}
            Inverses the minimum and maximum endpoints on the slider. Not
            compatible with wxSL_SELRANGE.

From f9aeb2669bcf6fde8eae3975e77fd732d132c277 Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Sat, 7 Apr 2018 22:01:18 +0200
Subject: [PATCH 474/916] Fix memory leak in taskbarbutton sample

wxTaskBarButton::RemoveThumbBarButton() removes the button but does not
delete it. In the sample removed buttons must be deleted manually
because they are also removed from m_thumbBarButtons which automatically
deletes the stored buttons in its destructor.

Closes https://github.com/wxWidgets/wxWidgets/pull/778
---
 samples/taskbarbutton/taskbarbutton.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/taskbarbutton/taskbarbutton.cpp b/samples/taskbarbutton/taskbarbutton.cpp
index bbca20d60d..16241b5a93 100644
--- a/samples/taskbarbutton/taskbarbutton.cpp
+++ b/samples/taskbarbutton/taskbarbutton.cpp
@@ -429,7 +429,7 @@ void MyFrame::OnRemoveThubmBarButton(wxCommandEvent& WXUNUSED(event))
 
     wxThumbBarButton* button = m_thumbBarButtons.back();
     m_thumbBarButtons.pop_back();
-    MSWGetTaskBarButton()->RemoveThumbBarButton(button);
+    delete MSWGetTaskBarButton()->RemoveThumbBarButton(button);
 }
 
 void MyFrame::OnThumbnailToolbarBtnClicked(wxCommandEvent& event)

From ee9c0267247c97ddac48b12383686c66c7da1922 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Apr 2018 12:43:59 +0200
Subject: [PATCH 475/916] Canonicalize PBForDev email address in Git mailmap

Use the same name/email combination instead of several similar but
different ones.
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index b56d2a70a3..841645f418 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,6 +22,7 @@ Micha Ahrweiler							<mbaschnitzi@users.noreply.github.com>
 ousnius			<ousnius@users.noreply.github.com>	<denis41@hotmail.de>
 Paul Cornett		<paulcor@bullseye.com>			<paulcor@users.noreply.github.com>
 Paul Kulchenko		<paul@kulchenko.com>			<paulclinger@gmail.com>
+pbfordev		<PBforDev@gmail.com>			<pbfordev@gmail.com>
 Richard Fath							<richard.fath@t-online.de>
 Steve Browne		<swbrowne@gmail.com>			<sbrowne@unknown>
 			<swbrowne@gmail.com>			<amn3sia@gmail.com>

From 8e33c693e5e1b04cad4b5dd1e24ebe55f579fcf9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Apr 2018 14:41:14 +0200
Subject: [PATCH 476/916] Normalize email case of the commits done by PB

Canonicalize all the existing versions of the email used by PB to use
PBfordev as the local part.
---
 .mailmap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 841645f418..af77a98fea 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,7 +22,8 @@ Micha Ahrweiler							<mbaschnitzi@users.noreply.github.com>
 ousnius			<ousnius@users.noreply.github.com>	<denis41@hotmail.de>
 Paul Cornett		<paulcor@bullseye.com>			<paulcor@users.noreply.github.com>
 Paul Kulchenko		<paul@kulchenko.com>			<paulclinger@gmail.com>
-pbfordev		<PBforDev@gmail.com>			<pbfordev@gmail.com>
+PB			<PBfordev@gmail.com>			<pbfordev@gmail.com>
+			<PBfordev@gmail.com>			<PBforDev@gmail.com>
 Richard Fath							<richard.fath@t-online.de>
 Steve Browne		<swbrowne@gmail.com>			<sbrowne@unknown>
 			<swbrowne@gmail.com>			<amn3sia@gmail.com>

From f751f15b9fa13f0617055e7792605e323e9083c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Thu, 12 Apr 2018 05:22:55 +0300
Subject: [PATCH 477/916] Shuffle code a bit to make it easier to skip
 deferring window position

---
 src/msw/window.cpp | 67 ++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 113b3b715d..ab5f008a14 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1935,38 +1935,6 @@ void wxWindowMSW::DoClientToScreen(int *x, int *y) const
 bool
 wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
 {
-#if wxUSE_DEFERRED_SIZING
-    // if our parent had prepared a defer window handle for us, use it (unless
-    // we are a top level window)
-    wxWindowMSW * const parent = IsTopLevel() ? NULL : GetParent();
-
-    HDWP hdwp = parent ? (HDWP)parent->m_hDWP : NULL;
-    if ( hdwp )
-    {
-        hdwp = ::DeferWindowPos(hdwp, (HWND)hwnd, NULL, x, y, width, height,
-                                SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE);
-        if ( !hdwp )
-        {
-            wxLogLastError(wxT("DeferWindowPos"));
-        }
-    }
-
-    if ( parent )
-    {
-        // hdwp must be updated as it may have been changed
-        parent->m_hDWP = (WXHANDLE)hdwp;
-    }
-
-    if ( hdwp )
-    {
-        // did deferred move, remember new coordinates of the window as they're
-        // different from what Windows would return for it
-        return true;
-    }
-
-    // otherwise (or if deferring failed) move the window in place immediately
-#endif // wxUSE_DEFERRED_SIZING
-
     // toplevel window's coordinates are mirrored if the TLW is a child of another
     // RTL window and changing width without moving the position would enlarge the
     // window in the wrong direction, so we need to adjust for it
@@ -1986,6 +1954,41 @@ wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
         }
     }
 
+#if wxUSE_DEFERRED_SIZING
+    else
+    {
+        // if our parent had prepared a defer window handle for us, use it (unless
+        // we are a top level window)
+        wxWindowMSW * const parent = GetParent();
+
+        HDWP hdwp = parent ? (HDWP)parent->m_hDWP : NULL;
+        if ( hdwp )
+        {
+            hdwp = ::DeferWindowPos(hdwp, (HWND)hwnd, NULL, x, y, width, height,
+                                    SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE);
+            if ( !hdwp )
+            {
+                wxLogLastError(wxT("DeferWindowPos"));
+            }
+        }
+
+        if ( parent )
+        {
+            // hdwp must be updated as it may have been changed
+            parent->m_hDWP = (WXHANDLE)hdwp;
+        }
+
+        if ( hdwp )
+        {
+            // did deferred move, remember new coordinates of the window as they're
+            // different from what Windows would return for it
+            return true;
+        }
+
+        // otherwise (or if deferring failed) move the window in place immediately
+    }
+#endif // wxUSE_DEFERRED_SIZING
+
     if ( !::MoveWindow((HWND)hwnd, x, y, width, height, IsShown()) )
     {
         wxLogLastError(wxT("MoveWindow"));

From e905b94436096187e2452aefe480c617946adaeb Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Sun, 15 Apr 2018 22:32:41 -0400
Subject: [PATCH 478/916] Fix video sink fallback in wxMediaCtrl when
 xvimagesink present but not working

In certain cases (e.g., virtual machines), the XVideo extension may be
present, but there are no working adaptors.  In this case, wxMediaCtrl
will select xvimagesink, but then when it tries to actually play some
media, it will fail.  Fix this by attemping to set the video sink to
GST_STATE_READY in TryVideoSink().  Doing this causes gstreamer to run
some checks against the XVideo extension.  If this fails, then we should
fall back to the next sink type (ximagesink).
---
 src/unix/mediactrl.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index fbedbbe954..bdcb909b4b 100644
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -826,6 +826,13 @@ bool wxGStreamerMediaBackend::TryVideoSink(GstElement* videosink)
         g_object_unref(videosink);
         return false;
     }
+
+    if ( gst_element_set_state (videosink,
+                                GST_STATE_READY) == GST_STATE_CHANGE_FAILURE )
+    {
+        g_object_unref(videosink);
+        return false;
+    }
 #else
     // Check if the video sink either is an xoverlay or might contain one...
     if( !GST_IS_BIN(videosink) && !GST_IS_X_OVERLAY(videosink) )

From 8d02384792bf090e2f21d65f65b67faae3b90807 Mon Sep 17 00:00:00 2001
From: Jan Niklas Hasse <jhasse@bixense.com>
Date: Wed, 11 Apr 2018 16:21:11 +0200
Subject: [PATCH 479/916] Use wxString() instead of "" for empty strings

This will allow this code to work even when implicit conversion from
"const char*" is disabled in wxString and is already marginally more
efficient even now.

See https://github.com/wxWidgets/wxWidgets/pull/782
---
 include/wx/bmpbuttn.h        |  2 +-
 include/wx/stc/stc.h         |  2 +-
 include/wx/string.h          |  4 ++--
 src/common/docview.cpp       |  2 +-
 src/common/filename.cpp      |  2 +-
 src/common/fldlgcmn.cpp      |  2 +-
 src/common/imagtiff.cpp      |  2 +-
 src/common/translation.cpp   |  4 ++--
 src/common/uri.cpp           | 10 +++++-----
 src/generic/infobar.cpp      |  2 +-
 src/generic/richtooltipg.cpp |  2 +-
 src/gtk/nativewin.cpp        |  2 +-
 src/xrc/xmlres.cpp           |  2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 2aec670359..4bf85e0b53 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -59,7 +59,7 @@ public:
         // And we also use wxBU_EXACTFIT to avoid being resized up to the
         // standard button size as this doesn't make sense for bitmap buttons
         // which are not standard anyhow and should fit their bitmap size.
-        return wxButton::Create(parent, winid, "",
+        return wxButton::Create(parent, winid, wxString(),
                                 pos, size,
                                 style | wxBU_NOTEXT | wxBU_EXACTFIT,
                                 validator, name);
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 43b4e97b6f..d14ad5511f 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -5239,7 +5239,7 @@ public:
 
     virtual void Remove(long from, long to) wxOVERRIDE
     {
-        Replace(from, to, "");
+        Replace(from, to, wxString());
     }
     virtual void Replace(long from, long to, const wxString& text) wxOVERRIDE
     {
diff --git a/include/wx/string.h b/include/wx/string.h
index a4e682b8ff..031cff5a60 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -1617,7 +1617,7 @@ public:
     static wxString FromUTF8(const char *utf8)
     {
         if ( !utf8 || !wxStringOperations::IsValidUtf8String(utf8) )
-            return "";
+            return wxString();
 
         return FromImpl(wxStringImpl(utf8));
     }
@@ -1627,7 +1627,7 @@ public:
             return FromUTF8(utf8);
 
         if ( !utf8 || !wxStringOperations::IsValidUtf8String(utf8, len) )
-            return "";
+            return wxString();
 
         return FromImpl(wxStringImpl(utf8, len));
     }
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 5be66f1190..54c4f6a5f7 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1124,7 +1124,7 @@ void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
 {
-    if ( !CreateDocument("") )
+    if ( !CreateDocument(wxString()) )
     {
         OnOpenFileFailure();
     }
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index a733643d71..a1460b5d94 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -2464,7 +2464,7 @@ void wxFileName::SplitPath(const wxString& fullpath,
 wxString wxFileName::StripExtension(const wxString& fullpath)
 {
     wxFileName fn(fullpath);
-    fn.SetExt("");
+    fn.SetExt(wxString());
     return fn.GetFullPath();
 }
 
diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index a908d3fb44..69f28d5320 100644
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -190,7 +190,7 @@ wxSize wxFileDialogBase::GetExtraControlSize()
     // create the extra control in an empty dialog just to find its size: this
     // is not terribly efficient but we do need to know the size before
     // creating the native dialog and this seems to be the only way
-    wxDialog dlg(NULL, wxID_ANY, "");
+    wxDialog dlg(NULL, wxID_ANY, wxString());
     return (*m_extraControlCreator)(&dlg)->GetSize();
 }
 
diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index ed8cb22fd4..081b2a58bd 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -895,7 +895,7 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 
     wxString copyright;
     const wxString desc = ver.BeforeFirst('\n', &copyright);
-    copyright.Replace("\n", "");
+    copyright.Replace("\n", wxString());
 
     return wxVersionInfo("libtiff", major, minor, micro, desc, copyright);
 }
diff --git a/src/common/translation.cpp b/src/common/translation.cpp
index 21dc0daf50..b092eaa9f9 100644
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@@ -1456,7 +1456,7 @@ void wxTranslations::SetLoader(wxTranslationsLoader *loader)
 void wxTranslations::SetLanguage(wxLanguage lang)
 {
     if ( lang == wxLANGUAGE_DEFAULT )
-        SetLanguage("");
+        SetLanguage(wxString());
     else
         SetLanguage(wxLocale::GetLanguageCanonicalName(lang));
 }
@@ -1926,7 +1926,7 @@ wxArrayString wxFileTranslationsLoader::GetAvailableTranslations(const wxString&
             continue;
 
         wxString lang;
-        for ( bool ok = dir.GetFirst(&lang, "", wxDIR_DIRS);
+        for ( bool ok = dir.GetFirst(&lang, wxString(), wxDIR_DIRS);
               ok;
               ok = dir.GetNext(&lang) )
         {
diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 959f4ea2c9..e46b0e13d4 100644
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -177,7 +177,7 @@ wxString wxURI::GetPassword() const
       size_t posColon = m_userinfo.find(':');
 
       if ( posColon == wxString::npos )
-          return "";
+          return wxString();
 
       return m_userinfo(posColon + 1, wxString::npos);
 }
@@ -742,7 +742,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
             // if we have an empty path it means we were constructed from a "."
             // string or something similar (e.g. "././././"), it should count
             // as (empty) segment
-            our.push_back("");
+            our.push_back(wxString());
         }
 
         const wxArrayString::const_iterator end = our.end();
@@ -753,7 +753,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
                 // as in ParsePath(), while normally we ignore the empty
                 // segments, we need to take account of them at the end
                 if ( i == end - 1 )
-                    result.push_back("");
+                    result.push_back(wxString());
                 continue;
             }
 
@@ -764,7 +764,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
                     result.pop_back();
 
                     if ( i == end - 1 )
-                        result.push_back("");
+                        result.push_back(wxString());
                 }
                 //else: just ignore, extra ".." don't accumulate
             }
@@ -773,7 +773,7 @@ void wxURI::Resolve(const wxURI& base, int flags)
                 if ( result.empty() )
                 {
                     // ensure that the resulting path will always be absolute
-                    result.push_back("");
+                    result.push_back(wxString());
                 }
 
                 result.push_back(*i);
diff --git a/src/generic/infobar.cpp b/src/generic/infobar.cpp
index 2ca258faf9..9d270e9735 100644
--- a/src/generic/infobar.cpp
+++ b/src/generic/infobar.cpp
@@ -77,7 +77,7 @@ bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid)
     // the icon is not shown unless it's assigned a valid bitmap
     m_icon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap);
 
-    m_text = new wxStaticText(this, wxID_ANY, "");
+    m_text = new wxStaticText(this, wxID_ANY, wxString());
     m_text->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
 
     m_button = wxBitmapButton::NewCloseButton(this, wxID_ANY);
diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp
index 5ebc1603ef..d9dd480d96 100644
--- a/src/generic/richtooltipg.cpp
+++ b/src/generic/richtooltipg.cpp
@@ -77,7 +77,7 @@ public:
         }
         //else: Simply don't show any icon.
 
-        wxStaticText* const labelTitle = new wxStaticText(this, wxID_ANY, "");
+        wxStaticText* const labelTitle = new wxStaticText(this, wxID_ANY, wxString());
         labelTitle->SetLabelText(title);
 
         wxFont titleFont(titleFont_);
diff --git a/src/gtk/nativewin.cpp b/src/gtk/nativewin.cpp
index 03baa60d35..b3664b55b0 100644
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -110,7 +110,7 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win)
 {
     wxCHECK( win, false );
 
-    if ( !wxTopLevelWindow::Create(NULL, wxID_ANY, "") )
+    if ( !wxTopLevelWindow::Create(NULL, wxID_ANY, wxString()) )
         return false;
 
     // we need to realize the window first before reparenting it
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 1963ba9d73..1ac4e51b51 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -2584,7 +2584,7 @@ void wxXmlResource::ReportError(const wxXmlNode *context, const wxString& messag
 {
     if ( !context )
     {
-        DoReportError("", NULL, message);
+        DoReportError(wxString(), NULL, message);
         return;
     }
 

From 496da2e550ce1f562f727230babc363da190530e Mon Sep 17 00:00:00 2001
From: Jan Niklas Hasse <jhasse@bixense.com>
Date: Wed, 11 Apr 2018 16:15:09 +0200
Subject: [PATCH 480/916] Remove trailing whitespace from several files

No real changes.

See https://github.com/wxWidgets/wxWidgets/pull/787
---
 include/wx/any.h                     |   4 +-
 include/wx/generic/dcpsg.h           |   2 +-
 include/wx/generic/dirctrlg.h        |   2 +-
 include/wx/notebook.h                |  16 ++---
 include/wx/qt/tglbtn.h               |   2 +-
 include/wx/stc/stc.h                 |   6 +-
 include/wx/tbarbase.h                |   2 +-
 include/wx/xrc/xmlreshandler.h       |   2 +-
 interface/wx/cmdline.h               |  20 +++---
 interface/wx/xrc/xmlres.h            |   8 +--
 src/common/accelcmn.cpp              |   2 +-
 src/common/appbase.cpp               |   4 +-
 src/common/cairo.cpp                 |  10 +--
 src/common/cmdline.cpp               |   4 +-
 src/common/combocmn.cpp              |   4 +-
 src/common/ctrlcmn.cpp               |   4 +-
 src/common/filefn.cpp                |   2 +-
 src/common/filename.cpp              |   2 +-
 src/common/listctrlcmn.cpp           |   2 +-
 src/common/wincmn.cpp                |  10 +--
 src/generic/dirctrlg.cpp             |   4 +-
 src/generic/graphicc.cpp             |  12 ++--
 src/generic/grid.cpp                 |  12 ++--
 src/gtk/dataview.cpp                 |  10 +--
 src/richtext/richtextbuffer.cpp      | 100 +++++++++++++--------------
 src/richtext/richtextindentspage.cpp |   2 +-
 src/stc/ScintillaWX.cpp              |   4 +-
 src/stc/stc.cpp                      |   8 +--
 src/stc/stc.h.in                     |   6 +-
 src/xrc/xh_tglbtn.cpp                |   2 +-
 30 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/include/wx/any.h b/include/wx/any.h
index 2b37bafa5e..bd61b1e7a0 100644
--- a/include/wx/any.h
+++ b/include/wx/any.h
@@ -317,7 +317,7 @@ public:
         return Ops::GetValue(buf);
     }
 #if wxUSE_EXTENDED_RTTI
-    virtual const wxTypeInfo* GetTypeInfo() const 
+    virtual const wxTypeInfo* GetTypeInfo() const
     {
         return wxGetTypeInfo((T*)NULL);
     }
@@ -377,7 +377,7 @@ public: \
         const UseDataType* sptr = \
             reinterpret_cast<const UseDataType*>(voidPtr); \
         return static_cast<T>(*sptr); \
-    } 
+    }
 
 #if wxUSE_EXTENDED_RTTI
 #define WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE) \
diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 21fb648b85..972f533475 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -94,7 +94,7 @@ public:
     virtual wxRect GetPaperRect() const wxOVERRIDE;
 
     virtual void* GetHandle() const wxOVERRIDE { return NULL; }
-    
+
 protected:
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
                      wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index 26e8a0532d..8804fb44ac 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -304,7 +304,7 @@ public:
 
     const wxSize& GetSize() const { return m_size; }
     void SetSize(const wxSize& sz) { m_size = sz; }
-    
+
     bool IsOk() const { return m_smallImageList != NULL; }
 
 protected:
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 8416c695a5..ee89a44c4c 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -65,7 +65,7 @@ class WXDLLEXPORT wxNotebookPageInfo : public wxObject
 public:
     wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; }
     virtual ~wxNotebookPageInfo() { }
-    
+
     bool Create(wxNotebookPage *page,
                 const wxString& text,
                 bool selected,
@@ -77,18 +77,18 @@ public:
         m_imageId = imageId;
         return true;
     }
-    
+
     wxNotebookPage* GetPage() const { return m_page; }
     wxString GetText() const { return m_text; }
     bool GetSelected() const { return m_selected; }
     int GetImageId() const { return m_imageId; }
-    
+
 private:
     wxNotebookPage *m_page;
     wxString m_text;
     bool m_selected;
     int m_imageId;
-    
+
     wxDECLARE_DYNAMIC_CLASS(wxNotebookPageInfo);
 };
 
@@ -139,16 +139,16 @@ public:
     // new is wxNOT_FOUND)
     void SendPageChangedEvent(int nPageOld, int nPageNew = wxNOT_FOUND);
 
-#if wxUSE_EXTENDED_RTTI    
+#if wxUSE_EXTENDED_RTTI
     // XTI accessors
     virtual void AddPageInfo( wxNotebookPageInfo* info );
     virtual const wxNotebookPageInfoList& GetPageInfos() const;
 #endif
-        
+
 protected:
-#if wxUSE_EXTENDED_RTTI    
+#if wxUSE_EXTENDED_RTTI
     wxNotebookPageInfoList m_pageInfos;
-#endif    
+#endif
     wxDECLARE_NO_COPY_CLASS(wxNotebookBase);
 };
 
diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h
index 3eaa69e044..de7f16e926 100644
--- a/include/wx/qt/tglbtn.h
+++ b/include/wx/qt/tglbtn.h
@@ -57,7 +57,7 @@ public:
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxCheckBoxNameStr);
-    
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& label,
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index d14ad5511f..9348a023a8 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -5542,7 +5542,7 @@ public:
     int  GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
     int  GetUpdated() const               { return m_updated; }
     int  GetListCompletionMethod() const  { return m_listCompletionMethod; }
-    
+
 #ifdef STC_USE_DND
     // Kept for backwards compatibility, use GetString().
     wxString GetDragText()           { return GetString(); }
@@ -5583,8 +5583,8 @@ private:
     int m_x;
     int m_y;
 
-    int m_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER 
-    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION 
+    int m_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
+    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION
     int m_updated;              // wxEVT_STC_UPDATEUI
     int m_listCompletionMethod;
 
diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 2a643ae047..35d1700841 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -593,7 +593,7 @@ public:
                           wxEmptyString, wxEmptyString);
     }
 
-    
+
     // implementation only from now on
     // -------------------------------
 
diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h
index cdf7f0ab17..475a9d57af 100644
--- a/include/wx/xrc/xmlreshandler.h
+++ b/include/wx/xrc/xmlreshandler.h
@@ -407,7 +407,7 @@ protected:
     wxObject* GetInstance() const             { return m_instance; }
     wxWindow* GetParentAsWindow() const       { return m_parentAsWindow; }
 
-    
+
     wxArrayString m_styleNames;
     wxArrayInt m_styleValues;
 
diff --git a/interface/wx/cmdline.h b/interface/wx/cmdline.h
index e5457e0ba8..0a35e1630f 100644
--- a/interface/wx/cmdline.h
+++ b/interface/wx/cmdline.h
@@ -13,7 +13,7 @@
     parameter - this may be changed by giving non-default flags to it, i.e. use
     @c wxCMD_LINE_OPTION_MANDATORY to require that the option is given and
     @c wxCMD_LINE_PARAM_OPTIONAL to make a parameter optional.
-    
+
     Also, @c wxCMD_LINE_PARAM_MULTIPLE may be specified if the programs accepts a
     variable number of parameters - but it only can be given for the last
     parameter in the command line description. If you use this flag, you will
@@ -67,17 +67,17 @@ enum wxCmdLineEntryType
 {
     /// A boolean argument of the program; e.g. @c -v to enable verbose mode.
     wxCMD_LINE_SWITCH,
-    
+
     /// An argument with an associated value; e.g. @c "-o filename" to specify
     /// an optional output filename.
     wxCMD_LINE_OPTION,
-    
+
     /// A parameter: a required program argument.
     wxCMD_LINE_PARAM,
-    
+
     /// Additional usage text. See wxCmdLineParser::AddUsageText.
     wxCMD_LINE_USAGE_TEXT,
-    
+
     wxCMD_LINE_NONE     ///< Use this to terminate the list.
 };
 
@@ -126,7 +126,7 @@ struct wxCmdLineEntryDesc
 
     /**
         The usual, short, name of the switch or the option.
-        
+
         It may contain only letters, digits and the underscores.
         This field is unused if <tt>kind == wxCMD_LINE_PARAM</tt>.
     */
@@ -135,7 +135,7 @@ struct wxCmdLineEntryDesc
     /**
         The long name for this program argument (may be empty if the option
         has no long name).
-        
+
         It may contain only letters, digits and the underscores.
         This field is unused if <tt>kind == wxCMD_LINE_PARAM</tt>.
     */
@@ -152,7 +152,7 @@ struct wxCmdLineEntryDesc
         See ::wxCmdLineParamType for more info.
     */
     wxCmdLineParamType type;
-    
+
     /**
         A combination of one or more ::wxCmdLineEntryFlags enum values.
     */
@@ -348,12 +348,12 @@ public:
 
     In the documentation below the following terminology is used:
 
-    - @b switch: a boolean option which can be given or not, but which doesn't have 
+    - @b switch: a boolean option which can be given or not, but which doesn't have
                  any value. We use the word @e switch to distinguish
                  such boolean options from more generic options like those
                  described below. For example, @c "-v" might be a switch
                  meaning "enable verbose mode".
-    - @b option: a switch with a value associated to it. 
+    - @b option: a switch with a value associated to it.
                  For example, @c "-o filename" might be an
                  option for specifying the name of the output file.
     - @b parameter: a required program argument.
diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
index 363081bcd3..d420678bdb 100644
--- a/interface/wx/xrc/xmlres.h
+++ b/interface/wx/xrc/xmlres.h
@@ -93,7 +93,7 @@ public:
      */
     void InsertHandler(wxXmlResourceHandler *handler);
 
-    
+
     /**
         Attaches an unknown control to the given panel/window/dialog.
         Unknown controls are used in conjunction with \<object class="unknown"\>.
@@ -115,7 +115,7 @@ public:
     */
     static void AddSubclassFactory(wxXmlSubclassFactory *factory);
 
-    
+
     /**
         Compares the XRC version to the argument.
 
@@ -785,7 +785,7 @@ protected:
     /**
        After CreateResource has been called this will return the current
        wxXmlResource object.
-       
+
        @since 2.9.5
     */
     wxXmlResource* GetResource() const;
@@ -829,6 +829,6 @@ protected:
 
        @since 2.9.5
     */
-    wxWindow* GetParentAsWindow() const;    
+    wxWindow* GetParentAsWindow() const;
 };
 
diff --git a/src/common/accelcmn.cpp b/src/common/accelcmn.cpp
index 132c7edb0c..f15681541e 100644
--- a/src/common/accelcmn.cpp
+++ b/src/common/accelcmn.cpp
@@ -337,7 +337,7 @@ wxString wxAcceleratorEntry::AsPossiblyLocalizedString(bool localized) const
     if ( flags & wxACCEL_RAW_CTRL )
         text += PossiblyLocalize(wxTRANSLATE("RawCtrl+"), localized);
 #endif
-    
+
     const int code = GetKeyCode();
 
     if ( code >= WXK_F1 && code <= WXK_F12 )
diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 49cbd36114..d40861f7dd 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -302,7 +302,7 @@ int wxAppConsoleBase::OnRun()
 }
 
 void wxAppConsoleBase::OnLaunched()
-{    
+{
 }
 
 int wxAppConsoleBase::OnExit()
@@ -376,7 +376,7 @@ int wxAppConsoleBase::MainLoop()
 
     if (wxTheApp)
         wxTheApp->OnLaunched();
-    
+
     return m_mainLoop ? m_mainLoop->Run() : -1;
 }
 
diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index 171f7dbeec..940299dad0 100644
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -19,7 +19,7 @@
 
 // keep cairo.h from defining dllimport as we're defining the symbols inside
 // the wx dll in order to load them dynamically.
-#define cairo_public 
+#define cairo_public
 
 #include <cairo.h>
 #include "wx/dynlib.h"
@@ -40,7 +40,7 @@
 
 #define wxCAIRO_METHOD_TYPE(name) \
     wxCairo##name##_t
-    
+
 #define wxCAIRO_STATIC_METHOD_DEFINE(rettype, name, args, argnames, defret) \
    static wxCAIRO_METHOD_TYPE(name) name;
 
@@ -192,7 +192,7 @@
     m( HDC, cairo_win32_surface_get_dc, \
        (cairo_surface_t *surface), (surface), NULL )
 #else
-#define wxCAIRO_PLATFORM_METHODS(m) 
+#define wxCAIRO_PLATFORM_METHODS(m)
 #endif
 
 #define wxFOR_ALL_CAIRO_METHODS(m) \
@@ -252,7 +252,7 @@
 
 #define wxCAIRO_DECLARE_VOIDTYPE(name, args, argnames) \
    wxCAIRO_DECLARE_TYPE(void, name, args, argnames, NULL)
-   
+
 wxFOR_ALL_CAIRO_VOIDMETHODS(wxCAIRO_DECLARE_VOIDTYPE)
 wxFOR_ALL_CAIRO_METHODS(wxCAIRO_DECLARE_TYPE)
 
@@ -334,7 +334,7 @@ wxCairo::wxCairo()
     }
 #endif
 
-    
+
 #define wxDO_LOAD_FUNC(name, nameStr)                                     \
     name = (wxCAIRO_METHOD_TYPE(name))m_libCairo.RawGetSymbol(nameStr);      \
     if ( !name )                                                          \
diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index 318527fb5c..01bc3661bc 100644
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -850,11 +850,11 @@ int wxCmdLineParser::Parse(bool showUsage)
         {
             maybeOption = false;
             n++;
-            
+
             continue;
         }
 #endif
-        
+
         // empty argument or just '-' is not an option but a parameter
         if ( maybeOption && arg.length() > 1 &&
                 // FIXME-UTF8: use wc_str() after removing ANSI build
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 283b0f687c..e3bab06d47 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -2078,7 +2078,7 @@ void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
 {
     // On Mac, setting focus here led to infinite recursion so
     // m_resetFocus is used as a guard
-    
+
     if ( event.GetEventType() == wxEVT_SET_FOCUS )
     {
         if ( !m_resetFocus && GetTextCtrl() && !GetTextCtrl()->HasFocus() )
@@ -2088,7 +2088,7 @@ void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
             m_resetFocus = false;
         }
     }
-    
+
     Refresh();
 }
 
diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 1489fd129b..3b0627b903 100644
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -275,7 +275,7 @@ struct EllipsizeCalculator
 {
     EllipsizeCalculator(const wxString& s, const wxDC& dc,
                         int maxFinalWidthPx, int replacementWidthPx)
-        : 
+        :
           m_initialCharToRemove(0),
           m_nCharsToRemove(0),
           m_outputNeedsUpdate(true),
@@ -522,7 +522,7 @@ wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc,
 {
     if (mode == wxELLIPSIZE_NONE)
         return label;
-    
+
     wxString ret;
 
     // these cannot be cached between different Ellipsize() calls as they can
diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index ff894392ed..d2b88ca7c6 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -806,7 +806,7 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
     fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
     if ( fullURLRef == NULL)
         return wxEmptyString;
-    
+
     if ( additionalPathComponent )
     {
         CFURLRef parentURLRef = fullURLRef ;
diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index a1460b5d94..d7f1e1ce43 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -634,7 +634,7 @@ void RemoveTrailingSeparatorsFromPath(wxString& strPath)
     }
 }
 
-#endif // __WINDOWS_ 
+#endif // __WINDOWS_
 
 bool
 wxFileSystemObjectExists(const wxString& path, int flags)
diff --git a/src/common/listctrlcmn.cpp b/src/common/listctrlcmn.cpp
index 518718e94f..70f2bf7e48 100644
--- a/src/common/listctrlcmn.cpp
+++ b/src/common/listctrlcmn.cpp
@@ -125,7 +125,7 @@ wxCONSTRUCTOR_5( wxListCtrl, wxWindow*, Parent, wxWindowID, Id, \
                 wxPoint, Position, wxSize, Size, long, WindowStyle )
 
 /*
- TODO : Expose more information of a list's layout etc. via appropriate objects 
+ TODO : Expose more information of a list's layout etc. via appropriate objects
  (see NotebookPageInfo)
  */
 
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index cf33f259dd..497c075bce 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -137,13 +137,13 @@ wxEND_EVENT_TABLE()
 
 #if wxUSE_EXTENDED_RTTI
 
-// windows that are created from a parent window during its Create method, 
-// eg. spin controls in a calendar controls must never been streamed out 
-// separately otherwise chaos occurs. Right now easiest is to test for negative ids, 
+// windows that are created from a parent window during its Create method,
+// eg. spin controls in a calendar controls must never been streamed out
+// separately otherwise chaos occurs. Right now easiest is to test for negative ids,
 // as windows with negative ids never can be recreated anyway
 
 
-bool wxWindowStreamingCallback( const wxObject *object, wxObjectWriter *, 
+bool wxWindowStreamingCallback( const wxObject *object, wxObjectWriter *,
                                wxObjectWriterCallback *, const wxStringToAnyHashMap & )
 {
     const wxWindow * win = wx_dynamic_cast(const wxWindow*, object);
@@ -159,7 +159,7 @@ wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxWindow, wxWindowBase, "wx/window.h", \
 
 wxCOLLECTION_TYPE_INFO( wxWindow*, wxWindowList );
 
-template<> void wxCollectionToVariantArray( wxWindowList const &theList, 
+template<> void wxCollectionToVariantArray( wxWindowList const &theList,
                                            wxAnyList &value)
 {
     wxListCollectionToAnyList<wxWindowList::compatibility_iterator>( theList, value );
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index f0c84581cc..2080009ac1 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -426,7 +426,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     // instead of scaling.
     // if (!wxTheFileIconsTable->IsOk())
     //     wxTheFileIconsTable->SetSize(scaledSize);
-        
+
     // Meanwhile, in your application initialisation, where you have better knowledge of what
     // icons are available and whether to scale, you can do this:
     //
@@ -1608,7 +1608,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
             {
                 // Double, using normal quality scaling.
                 img.Rescale(2*img.GetWidth(), 2*img.GetHeight());
-                
+
                 // Then scale to the desired size. This gives the best quality,
                 // and better than CreateAntialiasedBitmap.
                 if ((img.GetWidth() != size) || (img.GetHeight() != size))
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index fa7cea6226..e228db9e1c 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -22,7 +22,7 @@
 
 // keep cairo.h from defining dllimport as we're defining the symbols inside
 // the wx dll in order to load them dynamically.
-#define cairo_public 
+#define cairo_public
 
 #include <cairo.h>
 #include <float.h>
@@ -440,7 +440,7 @@ public:
     {
         if ( !m_enableOffset )
             return false;
-        
+
         int penwidth = 0 ;
         if ( !m_pen.IsNull() )
         {
@@ -478,7 +478,7 @@ public:
     virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE ) wxOVERRIDE;
     virtual void ClearRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) wxOVERRIDE;
     virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h) wxOVERRIDE;
-    
+
     virtual void Translate( wxDouble dx , wxDouble dy ) wxOVERRIDE;
     virtual void Scale( wxDouble xScale , wxDouble yScale ) wxOVERRIDE;
     virtual void Rotate( wxDouble angle ) wxOVERRIDE;
@@ -1544,7 +1544,7 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
     }
 
 #if defined(__WXMSW__) || defined(__WXGTK3__) || defined(__WXOSX__)
-    // if there is a mask, set the alpha bytes in the target buffer to 
+    // if there is a mask, set the alpha bytes in the target buffer to
     // fully transparent or fully opaque
 #if defined(__WXMSW__)
     if (bmp.GetMask() != NULL && !bmp.HasAlpha())
@@ -1782,7 +1782,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC&
 : wxGraphicsContext(renderer)
 {
 #ifdef __WXMSW__
-    // wxMSW contexts always use MM_ANISOTROPIC, which messes up 
+    // wxMSW contexts always use MM_ANISOTROPIC, which messes up
     // text rendering when printing using Cairo. Switch it to MM_TEXT
     // map mode to avoid this problem.
     HDC hdc = (HDC)dc.GetHDC();
@@ -2045,7 +2045,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
     if ( adjustTransformFromDC )
         ApplyTransformFromDC(dc);
 #endif // __WXMSW__
-    
+
 #ifdef __WXGTK3__
     cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext());
     Init(cr ? cairo_reference(cr) : NULL);
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 16f624b3bc..083d1e0d34 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -151,7 +151,7 @@ wxDEFINE_EVENT( wxEVT_GRID_TABBING, wxGridEvent );
 
 namespace
 {
-    
+
     // ensure that first is less or equal to second, swapping the values if
     // necessary
     void EnsureFirstLessThanSecond(int& first, int& second)
@@ -159,7 +159,7 @@ namespace
         if ( first > second )
             wxSwap(first, second);
     }
-    
+
 } // anonymous namespace
 
 // ============================================================================
@@ -3941,7 +3941,7 @@ wxGrid::DoGridCellDrag(wxMouseEvent& event,
                        bool isFirstDrag)
 {
     bool performDefault = true ;
-    
+
     if ( coords == wxGridNoCellCoords )
         return performDefault; // we're outside any valid cell
 
@@ -3973,7 +3973,7 @@ wxGrid::DoGridCellDrag(wxMouseEvent& event,
                     // if event is handled by user code, no further processing
                     if ( SendEvent(wxEVT_GRID_CELL_BEGIN_DRAG, coords, event) != 0 )
                         performDefault = false;
-                    
+
                     return performDefault;
                 }
             }
@@ -3985,7 +3985,7 @@ wxGrid::DoGridCellDrag(wxMouseEvent& event,
             // we don't handle the other key modifiers
             event.Skip();
     }
-    
+
     return performDefault;
 }
 
@@ -4700,7 +4700,7 @@ wxGrid::SendEvent(wxEventType type,
            // explicitly allow the event for it to take place
            gridEvt.Veto();
        }
-              
+
        claimed = GetEventHandler()->ProcessEvent(gridEvt);
        vetoed = !gridEvt.IsAllowed();
    }
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 6ed97b47b7..2877a9996c 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -5219,11 +5219,11 @@ void wxDataViewCtrl::HitTest(const wxPoint& point,
     GtkTreeViewDropPosition pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER;
     gint cell_x = 0;
     gint cell_y = 0;
-    
+
     // cannot directly call GtkGetTreeView(), HitTest is const and so is this pointer
     wxDataViewCtrl* self = const_cast<wxDataViewCtrl *>(this); // ugly workaround, self is NOT const
     GtkTreeView* treeView = GTK_TREE_VIEW(self->GtkGetTreeView());
-    
+
     // is there possibly a better suited function to get the column?
     gtk_tree_view_get_path_at_pos(                // and this is the wrong call but it delivers the column
       treeView,
@@ -5232,13 +5232,13 @@ void wxDataViewCtrl::HitTest(const wxPoint& point,
       &GtkColumn,                                 // here we get the GtkColumn
       &cell_x,
       &cell_y );
-      
+
     if ( GtkColumn != NULL )
-    {                                             
+    {
         // we got GTK column
         // the right call now which takes the header into account
         gtk_tree_view_get_dest_row_at_pos( treeView, (int) point.x, (int) point.y, path.ByRef(), &pos);
-          
+
         if (path)
             item = wxDataViewItem(GTKPathToItem(path));
         // else we got a GTK column but the position is not over an item, e.g. below last item
diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index af41437237..e18b39c433 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -463,7 +463,7 @@ int wxRichTextFloatCollector::HitTestFloat(const wxRichTextFloatRectMapArray& ar
                 return result;
             }
         }
-        
+
         textPosition = array[i]->anchor->GetRange().GetStart();
         * obj = array[i]->anchor;
         * contextObj = array[i]->anchor->GetParentContainer();
@@ -1679,31 +1679,31 @@ bool wxRichTextCompositeObject::Defragment(wxRichTextDrawingContext& context, co
                     if (child->CanSplit(context))
                     {
                         childAfterSplit = child->Split(context);
-                        node = m_children.Find(childAfterSplit);                        
+                        node = m_children.Find(childAfterSplit);
                     }
 
                     if (node->GetNext())
                     {
                         wxRichTextObject* nextChild = node->GetNext()->GetData();
-                        
+
                         // First split child and nextChild so we have smaller fragments to merge.
                         // Then Merge only has to test per-object virtual attributes
                         // because for an object with all the same sub-object attributes,
                         // then any general virtual attributes should be merged with sub-objects by
                         // the implementation.
-                        
+
                         wxRichTextObject* nextChildAfterSplit = nextChild;
 
                         if (nextChildAfterSplit->CanSplit(context))
                             nextChildAfterSplit = nextChild->Split(context);
 
                         bool splitNextChild = nextChild != nextChildAfterSplit;
-                            
+
                         // See if we can merge this new fragment with (perhaps the first part of) the next object.
                         // Note that we use nextChild because if we had split nextChild, the first object always
                         // remains (and further parts are appended). However we must use childAfterSplit since
                         // it's the last part of a possibly split child.
-                        
+
                         if (childAfterSplit->CanMerge(nextChild, context) && childAfterSplit->Merge(nextChild, context))
                         {
                             nextChild->Dereference();
@@ -2107,7 +2107,7 @@ bool wxRichTextParagraphLayoutBox::Draw(wxDC& dc, wxRichTextDrawingContext& cont
 
     if (wxRichTextBuffer::GetFloatingLayoutMode())
         DrawFloats(dc, context, range, selection, rect, descent, style);
-    
+
     wxRichTextObjectList::compatibility_iterator node = m_children.GetFirst();
     while (node)
     {
@@ -2324,7 +2324,7 @@ bool wxRichTextParagraphLayoutBox::Layout(wxDC& dc, wxRichTextDrawingContext& co
 
                             child->LayoutToBestSize(dc, context, GetBuffer(),
                                 attr, child->GetAttributes(), availableSpace, rect, style&~wxRICHTEXT_LAYOUT_SPECIFIED_RECT);
-                            
+
                             availableSpace.y += child->GetCachedSize().y;
                             maxWidth = wxMax(maxWidth, child->GetCachedSize().x);
                             maxMinWidth = wxMax(maxMinWidth, child->GetMinSize().x);
@@ -5431,7 +5431,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, co
         int startOffset = (lineCount == 0 ? startPositionFirstLine : startPositionSubsequentLines);
         availableRect = wxRect(rect.x + startOffset, rect.y + currentPosition.y,
                                      rect.width - startOffset - rightIndent, rect.height);
-        
+
         // Take into account floating objects for the last line
         if (wxRichTextBuffer::GetFloatingLayoutMode() && collector)
         {
@@ -5460,7 +5460,7 @@ bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, co
             wxCheckSetFont(dc, font);
             lineHeight = dc.GetCharHeight();
         }
-        
+
         if (maxDescent == 0)
         {
             int w, h;
@@ -7446,13 +7446,13 @@ bool wxRichTextPlainText::CanMerge(wxRichTextObject* object, wxRichTextDrawingCo
         wxRichTextPlainText* otherObj = wxDynamicCast(object, wxRichTextPlainText);
         if (!otherObj || m_text.empty())
             return false;
-            
+
         if (!wxTextAttrEq(GetAttributes(), object->GetAttributes()) || !(m_properties == object->GetProperties()))
             return false;
-            
+
         // Check if differing virtual attributes makes it impossible to merge
         // these strings.
-        
+
         bool hasVirtualAttr1 = context.HasVirtualAttributes((wxRichTextObject*) this);
         bool hasVirtualAttr2 = context.HasVirtualAttributes((wxRichTextObject*) object);
         if (!hasVirtualAttr1 && !hasVirtualAttr2)
@@ -7504,18 +7504,18 @@ wxRichTextObject* wxRichTextPlainText::Split(wxRichTextDrawingContext& context)
         {
             const wxRichTextAttr emptyAttr;
             wxRichTextObjectList::compatibility_iterator next = node->GetNext();
-    
+
             wxArrayInt positions;
             wxRichTextAttrArray attributes;
             if (context.GetVirtualSubobjectAttributes(this, positions, attributes) && positions.GetCount() > 0)
             {
                 wxASSERT(positions.GetCount() == attributes.GetCount());
-                
+
                 // We will gather up runs of text with the same virtual attributes
-                
+
                 int len = m_text.Length();
                 int i = 0;
-                
+
                 // runStart and runEnd represent the accumulated run with a consistent attribute
                 // that hasn't yet been appended
                 int runStart = -1;
@@ -7523,7 +7523,7 @@ wxRichTextObject* wxRichTextPlainText::Split(wxRichTextDrawingContext& context)
                 wxRichTextAttr currentAttr;
                 wxString text = m_text;
                 wxRichTextPlainText* lastPlainText = this;
-                
+
                 for (i = 0; i < (int) positions.GetCount(); i++)
                 {
                     int pos = positions[i];
@@ -7531,7 +7531,7 @@ wxRichTextObject* wxRichTextPlainText::Split(wxRichTextDrawingContext& context)
                     if (pos >= 0 && pos < len)
                     {
                         const wxRichTextAttr& attr = attributes[i];
-                        
+
                         if (pos == 0)
                         {
                             runStart = 0;
@@ -7578,7 +7578,7 @@ wxRichTextObject* wxRichTextPlainText::Split(wxRichTextDrawingContext& context)
                                         else
                                             parent->GetChildren().Append(obj);
                                     }
-                                    
+
                                     runStart = runEnd+1;
                                     runEnd = pos-1;
 
@@ -7586,7 +7586,7 @@ wxRichTextObject* wxRichTextPlainText::Split(wxRichTextDrawingContext& context)
                                 }
                             }
                         }
-                            
+
                         wxASSERT(runEnd == pos-1);
 
                         // Now we only have to deal with the previous run
@@ -7629,7 +7629,7 @@ wxRichTextObject* wxRichTextPlainText::Split(wxRichTextDrawingContext& context)
                         }
                     }
                 }
-                
+
                 // We may still have a run to add, and possibly a no-attribute text fragment after that.
                 // If the whole string was already a single attribute (the run covers the whole string), don't split.
                 if ((runStart != -1) && !(runStart == 0 && runEnd == (len-1)))
@@ -7654,14 +7654,14 @@ wxRichTextObject* wxRichTextPlainText::Split(wxRichTextDrawingContext& context)
                             obj->SetAttributes(GetAttributes());
                             obj->SetProperties(GetProperties());
                             obj->SetParent(parent);
-                        
+
                             obj->SetText(text.Mid(runStart, runEnd - runStart + 1));
                             if (next)
                                 parent->GetChildren().Insert(next, obj);
                             else
-                                parent->GetChildren().Append(obj);                        
+                                parent->GetChildren().Append(obj);
                         }
-                        
+
                         runStart = runEnd+1;
                         runEnd = (len-1);
                     }
@@ -7675,17 +7675,17 @@ wxRichTextObject* wxRichTextPlainText::Split(wxRichTextDrawingContext& context)
                         obj->SetAttributes(GetAttributes());
                         obj->SetProperties(GetProperties());
                         obj->SetParent(parent);
-                        
+
                         obj->SetText(text.Mid(runStart, runEnd - runStart + 1));
                         if (next)
                             parent->GetChildren().Insert(next, obj);
                         else
                             parent->GetChildren().Append(obj);
-                        
+
                         lastPlainText = obj;
                     }
                 }
-                
+
                 return lastPlainText;
             }
         }
@@ -8892,7 +8892,7 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
                     if (richTextBuffer->GetStyleSheet())
                     {
                         delete richTextBuffer->GetStyleSheet();
-                        richTextBuffer->SetStyleSheet(NULL);                        
+                        richTextBuffer->SetStyleSheet(NULL);
                     }
                     delete richTextBuffer;
                 }
@@ -9934,7 +9934,7 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
     wxRichTextSelection sel;
     if (buffer && buffer->GetRichTextCtrl())
         sel = buffer->GetRichTextCtrl()->GetSelection();
-        
+
     if (table && buffer && buffer->GetRichTextCtrl() && sel.IsValid() &&
         sel.GetContainer() == GetParent())
     {
@@ -10112,7 +10112,7 @@ int GetRowspanDisplacement(const wxRichTextTable* table, int row, int col, int p
     // will have been hidden and have width 0. As a result they are ignored by the layout algorithm,
     // and all cells to their right are effectively shifted left. As a result there's no hole for
     // the spanning cell to fill.
-    // So search back along the current row for hidden cells. However there's also the annoying issue of a 
+    // So search back along the current row for hidden cells. However there's also the annoying issue of a
     // rowspanning cell that also has colspam. So we can't rely on the rowspanning cell being directly above
     // the first hidden one we come to. We also can't rely on a cell being hidden only by one type of span;
     // there's nothing to stop a cell being hidden by colspan, and then again hidden from above by rowspan.
@@ -10133,7 +10133,7 @@ int GetRowspanDisplacement(const wxRichTextTable* table, int row, int col, int p
                     if (rowSpan > 1 && rowSpan > (row-prevrow))
                     {
                         // There is a rowspanning cell above above the hidden one, so we need
-                        // to right-shift the index cell by this column's width. Furthermore, 
+                        // to right-shift the index cell by this column's width. Furthermore,
                         // if the cell also colspans, we need to shift by all affected columns
                         for (int colSpan = 0; colSpan < cell->GetColSpan(); ++colSpan)
                             deltaX += (colWidths[prevcol+colSpan] + paddingX);
@@ -10152,7 +10152,7 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
 {
     // This is called when the table's cell layout is otherwise complete.
     // For any cell with rowspan > 1, expand downwards into the row(s) below.
-    
+
     // Start by finding the current 'y' of the top of each row, plus the bottom of the available area for cells.
     // Deduce this from the top of a visible cell in the row below. (If none are visible, the row will be invisible anyway and can be ignored.)
     const int rowCount = table->GetRowCount();
@@ -10173,7 +10173,7 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
         }
     }
     rowTops[rowCount] = bottomY + paddingY;  // The table bottom, which was passed to us
-    
+
     bool needsRelay = false;
 
     for (row = 0; row < rowCount-1; ++row) // -1 as the bottom row can't rowspan
@@ -10189,7 +10189,7 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
                     span = wxMin(span, rowCount-row); // Don't try to span below the table!
                     if (span < 2)
                         continue;
-                    
+
                     int availableHeight = rowTops[row+span] - rowTops[row] - paddingY;
                     wxSize newSize = wxSize(cell->GetCachedSize().GetWidth(), availableHeight);
                     wxRect availableCellSpace = wxRect(cell->GetPosition(), newSize);
@@ -10207,19 +10207,19 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
                         // 3) The cell with the rowspan shouldn't be touched in 2); its height will be set to the whole span later.
                         int deltaY = overhang / span;
                         int spare  = overhang % span;
-                        
+
                         // Each row in the span needs to by deepened by its share of the overhang (give the first row any spare).
                         // This is achieved by increasing the value stored in the following row's rowTops
                         for (int spannedRows = 0; spannedRows < span; ++spannedRows)
                         {
                             rowTops[row+spannedRows+1] += ((deltaY * (spannedRows+1))  + (spannedRows == 0 ? spare:0));
                         }
-                        
+
                         // Any rows below the span need shifting down
                         for (int rowsBelow = row + span+1; rowsBelow <= rowCount; ++rowsBelow)
                         {
                             rowTops[rowsBelow] += overhang;
-                        }                        
+                        }
 
                         needsRelay = true;
                     }
@@ -10227,7 +10227,7 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
             }
         }
     }
-   
+
     if (!needsRelay)
         return;
 
@@ -10249,7 +10249,7 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
                 cell->Layout(dc, context, availableCellSpace, availableSpace, style|wxRICHTEXT_FIXED_WIDTH|wxRICHTEXT_FIXED_HEIGHT);
             }
         }
-        
+
         bottomY = rowTops[rowCount] - paddingY;
     }
 }
@@ -10460,7 +10460,7 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
             }
         }
 
-        // Cell width percentages are for the overall cell width, so ignore margins and 
+        // Cell width percentages are for the overall cell width, so ignore margins and
         // only take into account table margins and inter-cell padding.
         int availableWidthForPercentageCellWidths = internalTableWidth - ((visibleCellCount-1) * paddingX);
         wxTextAttrDimensionConverter cellConverter(dc, scale, wxSize(availableWidthForPercentageCellWidths, 0));
@@ -10558,7 +10558,7 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
             }
         }
 
-        // Cell width percentages are for the overall cell width, so ignore margins and 
+        // Cell width percentages are for the overall cell width, so ignore margins and
         // only take into account table margins and inter-cell padding.
         int availableWidthForPercentageCellWidths = internalTableWidth - ((visibleCellCount-1) * paddingX);
         wxTextAttrDimensionConverter cellConverter(dc, scale, wxSize(availableWidthForPercentageCellWidths, 0));
@@ -10585,7 +10585,7 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
                         else
                         {
                             cellWidth = cell->GetMinSize().x;
-                            
+
                             if (cell->GetMaxSize().x > cellWidth)
                                 cellWidth = cell->GetMaxSize().x;
                         }
@@ -10900,7 +10900,7 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
         if (j < (m_rowCount-1))
             y += paddingY;
     }
-    
+
     // Finally we need to expand any cell with rowspan > 1. We couldn't earlier; lower rows' heights weren't known
     ExpandCellsWithRowspan(this, paddingY, y, dc, context, availableSpace, style);
 
@@ -11351,7 +11351,7 @@ bool wxRichTextTable::DeleteColumns(int startCol, int noCols)
     for (i = 0; i < m_rowCount; i++)
     {
         wxRichTextObjectPtrArray& colArray = m_cells[deleteRows ? 0 : i];
-        for (j = 0; j < noCols; j++) 
+        for (j = 0; j < noCols; j++)
         {
             wxRichTextObject* cell = colArray[startCol];
             RemoveChild(cell, true);
@@ -11385,7 +11385,7 @@ bool wxRichTextTable::AddRows(int startRow, int noRows, const wxRichTextAttr& at
     wxRichTextBuffer* buffer = GetBuffer();
     wxRichTextAction* action = NULL;
     wxRichTextTable* clone = NULL;
-    
+
     if (!buffer->GetRichTextCtrl()->SuppressingUndo())
     {
         // Create a clone containing the current state of the table. It will be used to Undo the action
@@ -11817,7 +11817,7 @@ void wxRichTextAction::CalculateRefreshOptimizations(wxArrayInt& optimizationLin
             if (node)
                 node = node->GetNext();
         }
-        
+
         if (wxRichTextBuffer::GetFloatingLayoutMode() && container->GetFloatingObjectCount() > 0)
         {
             // We will use a simple criterion - if any of the paragraphs following the
@@ -12051,7 +12051,7 @@ bool wxRichTextAction::Do()
             // before deciding to Undo() or Redo(). So play safe and set focus to the buffer.
             if (m_ctrl)
                 m_ctrl->SetFocusObject(m_buffer, false);
-            
+
             // InvalidateHierarchy goes up the hierarchy as well as down, otherwise with a nested object,
             // Layout() would stop prematurely at the top level.
             // Invalidate the whole buffer if there were floating objects
@@ -12706,7 +12706,7 @@ bool wxRichTextImage::LoadAndScaleImageCache(wxImage& image, const wxSize& sz, w
             }
             else
                 img = image.Scale(width*scaleFactor, height*scaleFactor, wxIMAGE_QUALITY_HIGH);
-                
+
             // On Mac, this will create a bitmap that is twice as big as the required dimensions,
             // with a scale factor that indicates that the extra detail should be used on HiDPI displays.
             m_imageCache = wxBitmap(img, wxBITMAP_SCREEN_DEPTH, scaleFactor);
@@ -15754,7 +15754,7 @@ bool wxTextAttrShadow::RemoveStyle(const wxTextAttrShadow& attr)
         GetOpacity().Reset();
     if (attr.HasColour() && HasColour())
         RemoveFlag(wxTEXT_BOX_ATTR_BORDER_COLOUR);
-    
+
     return true;
 }
 
diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp
index b694c6b04b..ae0d6576c1 100644
--- a/src/richtext/richtextindentspage.cpp
+++ b/src/richtext/richtextindentspage.cpp
@@ -319,7 +319,7 @@ void wxRichTextIndentsSpacingPage::CreateControls()
     outlineLevelCtrlStrings.Add("8");
     outlineLevelCtrlStrings.Add("9");
     outlineLevelCtrlStrings.Add("10");
-    
+
     m_outlineLevelCtrl->Freeze();
     m_outlineLevelCtrl->Append(outlineLevelCtrlStrings);
     m_outlineLevelCtrl->Thaw();
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index ba6b2641e5..b7e33cda26 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -782,7 +782,7 @@ sptr_t ScintillaWX::DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, spt
 sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
       switch (iMessage) {
 #if 0  // TODO: check this
-          
+
       case SCI_CALLTIPSHOW: {
           // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx
           // because of the little tweak that needs done below for wxGTK.
@@ -896,7 +896,7 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
         // highlight positions.  So trigger a new paint event that will
         // repaint the whole window.
         stc->Refresh(false);
-        
+
 #if defined(__WXOSX__)
         // On Mac we also need to finish the current paint to make sure that
         // everything is on the screen that needs to be there between now and
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 620e0b9197..98bb61cdd8 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -675,7 +675,7 @@ void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp)
         buff[len] = 0;
         SendMsg(SCI_MARKERDEFINEPIXMAP, markerNumber, (sptr_t)buff);
         delete [] buff;
-        
+
 }
 
 // Add a set of markers to a line.
@@ -1478,7 +1478,7 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
         buff[len] = 0;
         SendMsg(SCI_REGISTERIMAGE, type, (sptr_t)buff);
         delete [] buff;
-     
+
 }
 
 // Clear all the registered images.
@@ -4491,7 +4491,7 @@ int wxStyledTextCtrl::GetTechnology() const
 
 // Create an ILoader*.
 void* wxStyledTextCtrl::CreateLoader(int bytes) const {
-         return (void*)(sptr_t)SendMsg(SCI_CREATELOADER, bytes); 
+         return (void*)(sptr_t)SendMsg(SCI_CREATELOADER, bytes);
 }
 
 // Move caret to before first visible character on display line.
@@ -4665,7 +4665,7 @@ wxString wxStyledTextCtrl::GetLexerLanguage() const {
 
 // For private communication between an application and a known lexer.
 void* wxStyledTextCtrl::PrivateLexerCall(int operation, void* pointer) {
-           return (void*)(sptr_t)SendMsg(SCI_PRIVATELEXERCALL, operation, (sptr_t)pointer); 
+           return (void*)(sptr_t)SendMsg(SCI_PRIVATELEXERCALL, operation, (sptr_t)pointer);
 }
 
 // Retrieve a '\\n' separated list of properties understood by the current lexer.
diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 7baf51ada4..9b71452c8d 100644
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -659,7 +659,7 @@ public:
     int  GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
     int  GetUpdated() const               { return m_updated; }
     int  GetListCompletionMethod() const  { return m_listCompletionMethod; }
-    
+
 #ifdef STC_USE_DND
     // Kept for backwards compatibility, use GetString().
     wxString GetDragText()           { return GetString(); }
@@ -700,8 +700,8 @@ private:
     int m_x;
     int m_y;
 
-    int m_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER 
-    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION 
+    int m_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
+    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION
     int m_updated;              // wxEVT_STC_UPDATEUI
     int m_listCompletionMethod;
 
diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 983b0f8f11..5af2de5581 100644
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -89,7 +89,7 @@ void wxToggleButtonXmlHandler::DoCreateToggleButton(wxObject *control)
                           GetDirection("bitmapposition"));
     }
 #endif
-   
+
     button->SetValue(GetBool( wxT("checked")));
 }
 

From 6226e3b0d3ab5601d8ec8bc497b0ab90bbe6438a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bron?= <frederic.bron@m4x.org>
Date: Wed, 18 Apr 2018 09:58:22 +0200
Subject: [PATCH 481/916] Emphasize the need for Realize() in wxToolBar
 documentation

As it is essential for a correct behaviour of wxToolBar, explain in the
main documentation of the class that Realize() must be called to
construct the tools. Note: it is already explained in the constructor's
documentation and in AddTool's documentation.

Closes https://github.com/wxWidgets/wxWidgets/pull/786
---
 interface/wx/toolbar.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h
index 783531ab65..e6b43df03b 100644
--- a/interface/wx/toolbar.h
+++ b/interface/wx/toolbar.h
@@ -168,6 +168,9 @@ public:
     Calls to @c wxToolBarToolBase methods (undocumented by purpose) will not change
     the visible state of the item within the tool bar.
 
+    After you have added all the tools you need, you must call Realize() to
+    effectively construct and display the toolbar.
+
     <b>wxMSW note</b>: Note that under wxMSW toolbar paints tools to reflect
     system-wide colours. If you use more than 16 colours in your tool bitmaps,
     you may wish to suppress this behaviour, otherwise system colours in your

From 52e5b561cbd0a8a1198139a0d511ae4e948d03d4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 18 Apr 2018 18:06:43 +0200
Subject: [PATCH 482/916] Apply Mac double buffering workaround for wxSTC
 correctly

The changes of bf418320b7e0c1659a768e439372d9eafb33c36b only modified
the generated file instead of modifying the file it's generated from, so
were lost during subsequent regenerations.

Fix this by back-propagating them to the correct place.

See #18085.
---
 src/stc/stc.cpp.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index d4af95790c..827633364d 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -224,8 +224,9 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
     // STC doesn't support RTL languages at all
     SetLayoutDirection(wxLayout_LeftToRight);
 
-    // Rely on native double buffering by default.
-#if wxALWAYS_NATIVE_DOUBLE_BUFFER
+    // Rely on native double buffering by default, except under Mac where it
+    // doesn't work for some reason, see #18085.
+#if wxALWAYS_NATIVE_DOUBLE_BUFFER && !defined(__WXMAC__)
     SetBufferedDraw(false);
 #else
     SetBufferedDraw(true);

From 03d942002d258393fd2749012f6de85d9229b956 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 18 Apr 2018 18:08:10 +0200
Subject: [PATCH 483/916] Really fix trailing spaces in the generated wxSTC
 file

Commit 496da2e550ce1f562f727230babc363da190530e removed the trailing
spaces from the generated file, but they were reintroduced whenever it
was regenerated.

Really fix this by removing the extra spaces from the script generating
the file.

See https://github.com/wxWidgets/wxWidgets/pull/787
---
 src/stc/gen_iface.py | 10 ++++------
 src/stc/stc.cpp      |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index deabf2962b..2de2832169 100755
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -228,8 +228,7 @@ methodOverrideMap = {
         strm.CopyTo(buff, len);
         buff[len] = 0;
         SendMsg(%s, markerNumber, (sptr_t)buff);
-        delete [] buff;
-        '''
+        delete [] buff;'''
     ),
 
     'GetMargins' : ('GetMarginCount', 0, 0),
@@ -552,8 +551,7 @@ methodOverrideMap = {
         strm.CopyTo(buff, len);
         buff[len] = 0;
         SendMsg(%s, type, (sptr_t)buff);
-        delete [] buff;
-     '''
+        delete [] buff;'''
     ),
 
     'SetHScrollBar' : ('SetUseHorizontalScrollBar', 0, 0),
@@ -1049,7 +1047,7 @@ methodOverrideMap = {
     (0,
      'void* %s(int bytes) const;',
      """void* %s(int bytes) const {
-         return (void*)(sptr_t)SendMsg(%s, bytes); """
+         return (void*)(sptr_t)SendMsg(%s, bytes);"""
     ),
 
     'GetRepresentation' :
@@ -1070,7 +1068,7 @@ methodOverrideMap = {
      (0,
       'void* %s(int operation, void* pointer);',
       """void* %s(int operation, void* pointer) {
-           return (void*)(sptr_t)SendMsg(%s, operation, (sptr_t)pointer); """
+           return (void*)(sptr_t)SendMsg(%s, operation, (sptr_t)pointer);"""
      ),
 
     'GetSubStyleBases' :
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 98bb61cdd8..61eea8dad3 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -675,7 +675,6 @@ void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp)
         buff[len] = 0;
         SendMsg(SCI_MARKERDEFINEPIXMAP, markerNumber, (sptr_t)buff);
         delete [] buff;
-
 }
 
 // Add a set of markers to a line.
@@ -1478,7 +1477,6 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
         buff[len] = 0;
         SendMsg(SCI_REGISTERIMAGE, type, (sptr_t)buff);
         delete [] buff;
-
 }
 
 // Clear all the registered images.

From aaa9670dd16c62079ada725be771232b28702c52 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 18 Apr 2018 18:29:47 +0200
Subject: [PATCH 484/916] Apply replacement of "" with wxString() to wxSTC
 correctly

The changes of 8d02384792bf090e2f21d65f65b67faae3b90807 only modified
the generated file without updating the file it was generated from and
so were lost during the next regeneration.

Back-propagate them to the correct file to prevent this from happening.

See https://github.com/wxWidgets/wxWidgets/pull/782
---
 src/stc/stc.h.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 9b71452c8d..8413084a7c 100644
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -356,7 +356,7 @@ public:
 
     virtual void Remove(long from, long to) wxOVERRIDE
     {
-        Replace(from, to, "");
+        Replace(from, to, wxString());
     }
     virtual void Replace(long from, long to, const wxString& text) wxOVERRIDE
     {

From 578474526f068b445db40c2f21ac54e6ecf9f79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Wed, 18 Apr 2018 20:19:45 +0300
Subject: [PATCH 485/916] fix window position under MSW when limited by `short`
 range

---
 include/wx/msw/window.h | 21 ++++++++-
 src/msw/control.cpp     | 28 +++++-------
 src/msw/spinctrl.cpp    | 24 +++++------
 src/msw/statbmp.cpp     |  2 +-
 src/msw/window.cpp      | 95 ++++++++++++++++++++++++++++-------------
 5 files changed, 107 insertions(+), 63 deletions(-)

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 1a6af48f5b..8ea5f8725d 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -729,8 +729,27 @@ private:
     bool MSWSafeIsDialogMessage(WXMSG* msg);
 #endif // __WXUNIVERSAL__
 
-#if wxUSE_DEFERRED_SIZING
+    static inline bool MSWIsPositionDirectlySupported(int x, int y)
+    {
+        // The supported coordinate intervals for various functions are:
+        // - MoveWindow, DeferWindowPos: [-32768, 32767] a.k.a. [SHRT_MIN, SHRT_MAX];
+        // - CreateWindow, CreateWindowEx: [-32768, 32554].
+        // CreateXXX will _sometimes_ manage to create the window at higher coordinates
+        // like 32580, 32684, 32710, but that was not consistent and the lowest common
+        // limit was 32554 (so far at least).
+        return (x >= SHRT_MIN && x <= 32554 && y >= SHRT_MIN && y <= 32554);
+    }
+
 protected:
+    WXHWND MSWCreateWindowAtAnyPosition(WXDWORD exStyle, const wxChar* clName,
+                                        const wxChar* title, WXDWORD style,
+                                        int x, int y, int width, int height,
+                                        WXHWND parent, wxWindowID id);
+
+    void MSWMoveWindowToAnyPosition(WXHWND hwnd, int x, int y,
+                                    int width, int height, bool bRepaint);
+
+#if wxUSE_DEFERRED_SIZING
     // this function is called after the window was resized to its new size
     virtual void MSWEndDeferWindowPos()
     {
diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index e253935c23..f3be7cd0be 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -132,27 +132,19 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     // ... and adjust it to account for a possible parent frames toolbar
     AdjustForParentClientOrigin(x, y);
 
-    m_hWnd = (WXHWND)::CreateWindowEx
-                       (
-                        exstyle,            // extended style
-                        classname,          // the kind of control to create
-                        label.t_str(),      // the window name
-                        style,              // the window style
-                        x, y, w, h,         // the window position and size
-                        GetHwndOf(GetParent()),         // parent
-                        (HMENU)wxUIntToPtr(GetId()),    // child id
-                        wxGetInstance(),    // app instance
-                        NULL                // creation parameters
-                       );
+    m_hWnd = MSWCreateWindowAtAnyPosition
+             (
+              exstyle,            // extended style
+              classname,          // the kind of control to create
+              label.t_str(),      // the window name
+              style,              // the window style
+              x, y, w, h,         // the window position and size
+              GetHwndOf(GetParent()),         // parent
+              GetId()             // child id
+             );
 
     if ( !m_hWnd )
     {
-        wxLogLastError(wxString::Format
-                       (
-                        wxT("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
-                        classname, style, exstyle
-                       ));
-
         return false;
     }
 
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index a692a5044e..adc534b01a 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -298,19 +298,17 @@ bool wxSpinCtrl::Create(wxWindow *parent,
 
     // create the text window
 
-    m_hwndBuddy = (WXHWND)::CreateWindowEx
-                    (
-                     exStyle,                // sunken border
-                     wxT("EDIT"),             // window class
-                     NULL,                   // no window title
-                     msStyle,                // style (will be shown later)
-                     pos.x, pos.y,           // position
-                     0, 0,                   // size (will be set later)
-                     GetHwndOf(parent),      // parent
-                     (HMENU)-1,              // control id
-                     wxGetInstance(),        // app instance
-                     NULL                    // unused client data
-                    );
+    m_hwndBuddy = MSWCreateWindowAtAnyPosition
+                  (
+                   exStyle,                // sunken border
+                   wxT("EDIT"),            // window class
+                   NULL,                   // no window title
+                   msStyle,                // style (will be shown later)
+                   pos.x, pos.y,           // position
+                   0, 0,                   // size (will be set later)
+                   GetHwndOf(parent),      // parent
+                   -1                      // control id
+                  );
 
     if ( !m_hwndBuddy )
     {
diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 4add948108..66d2f37e02 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -333,7 +333,7 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
             w = width;
             h = height;
 
-            ::MoveWindow(GetHwnd(), x, y, width, height, FALSE);
+            MSWMoveWindowToAnyPosition(GetHwnd(), x, y, width, height, false);
         }
     }
 
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ab5f008a14..f55b8be586 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1955,10 +1955,9 @@ wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
     }
 
 #if wxUSE_DEFERRED_SIZING
-    else
+    else if ( MSWIsPositionDirectlySupported(x, y) )
     {
-        // if our parent had prepared a defer window handle for us, use it (unless
-        // we are a top level window)
+        // if our parent had prepared a defer window handle for us, use it
         wxWindowMSW * const parent = GetParent();
 
         HDWP hdwp = parent ? (HDWP)parent->m_hDWP : NULL;
@@ -1989,16 +1988,36 @@ wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
     }
 #endif // wxUSE_DEFERRED_SIZING
 
-    if ( !::MoveWindow((HWND)hwnd, x, y, width, height, IsShown()) )
-    {
-        wxLogLastError(wxT("MoveWindow"));
-    }
+    MSWMoveWindowToAnyPosition(hwnd, x, y, width, height, IsShown());
 
     // if wxUSE_DEFERRED_SIZING, indicates that we didn't use deferred move,
     // ignored otherwise
     return false;
 }
 
+void wxWindowMSW::MSWMoveWindowToAnyPosition(WXHWND hwnd, int x, int y, int width, int height, bool bRepaint)
+{
+    bool scroll = GetParent() && !MSWIsPositionDirectlySupported(x, y);
+
+    if ( scroll )
+    {
+        // scroll to the actual position (looks like there is no need to Freeze() the parent)
+        ::ScrollWindow(GetHwndOf(GetParent()), -x, -y, NULL, NULL);
+    }
+
+    // move to relative coordinates
+    if ( !::MoveWindow(hwnd, (scroll ? 0 : x), (scroll ? 0 : y), width, height, bRepaint) )
+    {
+        wxLogLastError(wxT("MoveWindow"));
+    }
+
+    if ( scroll )
+    {
+        // scroll back
+        ::ScrollWindow(GetHwndOf(GetParent()), x, y, NULL, NULL);
+    }
+}
+
 void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
 {
     // TODO: is this consistent with other platforms?
@@ -2171,15 +2190,9 @@ void wxWindowMSW::DoSetClientSize(int width, int height)
         // and not defer it here as otherwise the value returned by
         // GetClient/WindowRect() wouldn't change as the window wouldn't be
         // really resized
-        if ( !::MoveWindow(GetHwnd(),
-                           rectWin.left,
-                           rectWin.top,
-                           width + widthWin - rectClient.right,
-                           height + heightWin - rectClient.bottom,
-                           TRUE) )
-        {
-            wxLogLastError(wxT("MoveWindow"));
-        }
+        MSWMoveWindowToAnyPosition(GetHwnd(), rectWin.left, rectWin.top,
+                                   width + widthWin - rectClient.right,
+                                   height + heightWin - rectClient.bottom, true);
     }
 }
 
@@ -3900,23 +3913,19 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
     // do create the window
     wxWindowCreationHook hook(this);
 
-    m_hWnd = (WXHWND)::CreateWindowEx
-                       (
-                        extendedStyle,
-                        wclass,
-                        title ? title : m_windowName.t_str(),
-                        style,
-                        x, y, w, h,
-                        (HWND)MSWGetParent(),
-                        (HMENU)wxUIntToPtr(controlId),
-                        wxGetInstance(),
-                        NULL                        // no extra data
-                       );
+    m_hWnd = MSWCreateWindowAtAnyPosition
+             (
+              extendedStyle,
+              wclass,
+              title ? title : m_windowName.t_str(),
+              style,
+              x, y, w, h,
+              MSWGetParent(),
+              controlId
+             );
 
     if ( !m_hWnd )
     {
-        wxLogSysError(_("Can't create window of class %s"), wclass);
-
         return false;
     }
 
@@ -3925,6 +3934,32 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
     return true;
 }
 
+WXHWND wxWindowMSW::MSWCreateWindowAtAnyPosition(WXDWORD exStyle, const wxChar* clName,
+                                                 const wxChar* title, WXDWORD style,
+                                                 int x, int y, int width, int height,
+                                                 WXHWND parent, wxWindowID id)
+{
+    WXHWND hWnd = ::CreateWindowEx(exStyle, clName, title, style, x, y, width, height,
+                                   parent, (HMENU)wxUIntToPtr(id), wxGetInstance(),
+                                   NULL); // no extra data
+
+    if ( !hWnd )
+    {
+        wxLogLastError(wxString::Format
+        (
+            wxT("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
+            clName, style, exStyle
+        ));
+    }
+    else if ( !IsTopLevel() && !MSWIsPositionDirectlySupported(x, y) )
+    {
+        // fix position if limited by Short range
+        MSWMoveWindowToAnyPosition(hWnd, x, y, width, height, IsShown());
+    }
+
+    return hWnd;
+}
+
 // ===========================================================================
 // MSW message handlers
 // ===========================================================================

From 91919f4514dcfb9839a13ffedc8c43ba8011757a Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 25 Apr 2018 09:19:18 -0700
Subject: [PATCH 486/916] Fix saving/restoring TLW position on HiDPI X11
 display with GTK+3

X11 frame extents need to be converted to GTK+ "logical" units
---
 src/gtk/toplevel.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index ae825d4039..97afe66757 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -470,7 +470,7 @@ bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int*
     Atom type;
     int format;
     gulong nitems, bytes_after;
-    guchar* data;
+    guchar* data = NULL;
     Status status = XGetWindowProperty(
         GDK_DISPLAY_XDISPLAY(display),
         GDK_WINDOW_XID(window),
@@ -480,11 +480,17 @@ bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int*
     const bool success = status == Success && data && nitems == 4;
     if (success)
     {
+        // We need to convert the X11 physical extents to GTK+ "logical" units
+        int scale = 1;
+#if GTK_CHECK_VERSION(3,10,0)
+        if (wx_is_at_least_gtk3(10))
+            scale = gdk_window_get_scale_factor(window);
+#endif
         long* p = (long*)data;
-        if (left)   *left   = int(p[0]);
-        if (right)  *right  = int(p[1]);
-        if (top)    *top    = int(p[2]);
-        if (bottom) *bottom = int(p[3]);
+        if (left)   *left   = int(p[0]) / scale;
+        if (right)  *right  = int(p[1]) / scale;
+        if (top)    *top    = int(p[2]) / scale;
+        if (bottom) *bottom = int(p[3]) / scale;
     }
     if (data)
         XFree(data);

From 20a98406f06f0392f0b303c0deb6c630e17704fd Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Tue, 24 Apr 2018 20:27:24 -0400
Subject: [PATCH 487/916] Add missing documentation for wxNumberEntryDialog

Also explain when this dialog should be used instead of using the
usually more convenient wxGetNumberFromUser() function.

See https://github.com/wxWidgets/wxWidgets/pull/790
---
 docs/doxygen/overviews/commondialogs.h |  9 +++
 interface/wx/numdlg.h                  | 87 +++++++++++++++++++++++++-
 2 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/docs/doxygen/overviews/commondialogs.h b/docs/doxygen/overviews/commondialogs.h
index 4cdf52abd2..5a69090d3d 100644
--- a/docs/doxygen/overviews/commondialogs.h
+++ b/docs/doxygen/overviews/commondialogs.h
@@ -205,6 +205,15 @@ is obtained using wxTextEntryDialog::GetValue().
 
 
 
+@section overview_cmndlg_numeric wxNumberEntryDialog Overview
+
+Classes: wxNumberEntryDialog
+
+This is a dialog with a numeric entry field. The value that the user entered
+is obtained using wxNumberEntryDialog::GetValue().
+
+
+
 @section overview_cmndlg_msg wxMessageDialog Overview
 
 Classes: wxMessageDialog
diff --git a/interface/wx/numdlg.h b/interface/wx/numdlg.h
index 5fbae0805d..b1bf88b005 100644
--- a/interface/wx/numdlg.h
+++ b/interface/wx/numdlg.h
@@ -1,10 +1,87 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        numdlg.h
-// Purpose:     interface of global functions
+// Purpose:     interface of wxNumberEntryDialog
 // Author:      wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+/**
+    @class wxNumberEntryDialog
+
+    This class represents a dialog that requests a numeric input from the user.
+
+    Currently it is implemented as a generic wxWidgets dialog under all
+    platforms.
+
+    You can use a convenience wxGetNumberFromUser() function instead of using
+    this dialog.
+
+    @library{wxcore}
+    @category{cmndlg}
+
+    @see @ref overview_cmndlg_numeric
+*/
+class wxNumberEntryDialog : public wxDialog
+{
+public:
+    /**
+        Default constructor.
+
+        Call Create() to really create the dialog later.
+     */
+    wxNumberEntryDialog();
+
+    /**
+        Constructor.
+
+        Use ShowModal() to show the dialog.
+
+        See Create() method for parameter description.
+    */
+    wxNumberEntryDialog(wxWindow *parent,
+                        const wxString& message,
+                        const wxString& prompt,
+                        const wxString& caption,
+                        long value, long min, long max,
+                        const wxPoint& pos = wxDefaultPosition);
+
+    /**
+        @param parent
+            Parent window.
+        @param message
+            Message to show on the dialog.
+        @param prompt
+            The prompt of the dialog.
+        @param caption
+            The caption of the dialog.
+        @param value
+            The default value.
+        @param min
+            The minimal value.
+        @param max
+            The maximal value.
+        @param pos
+            Dialog position.
+    */
+    bool Create(wxWindow *parent,
+                const wxString& message,
+                const wxString& prompt,
+                const wxString& caption,
+                long value, long min, long max,
+                const wxPoint& pos = wxDefaultPosition);
+
+    /**
+        Returns the value that the user has entered if the user has pressed OK,
+        or the original value if the user has pressed Cancel.
+    */
+    wxString GetValue() const;
+};
+
+
+// ============================================================================
+// Global functions/macros
+// ============================================================================
+
 /** @addtogroup group_funcmacro_dialog */
 //@{
 
@@ -16,12 +93,17 @@
     The number entered must be in the range @c min to @c max (both of which
     should be positive) and @c value is the initial value of it. If the user
     enters an invalid value, it is forced to fall into the specified range. If
-    the user cancels the dialog, the function returns -1.
+    the user cancels the dialog, the function returns -1. If it is important to
+    distinguish between cancelling the dialog and actually entering -1 in it,
+    i.e. if -1 is a valid input value, this convenience function can't be used
+    and wxNumberEntryDialog should be used directly instead.
 
     Dialog is centered on its @c parent unless an explicit position is given
     in @c pos.
 
     @header{wx/numdlg.h}
+
+    @see wxNumberEntryDialog
 */
 long wxGetNumberFromUser(const wxString& message,
                          const wxString& prompt,
@@ -33,4 +115,3 @@ long wxGetNumberFromUser(const wxString& message,
                          const wxPoint& pos = wxDefaultPosition);
 
 //@}
-

From cec5d067e526939eb6faa3b7301f186d6f580954 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 28 Apr 2018 16:00:03 -0700
Subject: [PATCH 488/916] Avoid deferred show when TLW decoration size is
 already known

See https://github.com/wxWidgets/wxWidgets/pull/789
---
 src/gtk/toplevel.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 97afe66757..bdb8ffa790 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -973,6 +973,11 @@ bool wxTopLevelWindowGTK::Show( bool show )
     if (deferShow)
     {
         deferShow = m_deferShowAllowed &&
+            // Assume size (from cache or wxPersistentTLW) is correct.
+            // Avoids problems when WM initially provides an incorrect value
+            // for extents, then corrects it later.
+            m_decorSize.top == 0 &&
+
             gs_requestFrameExtentsStatus != RFE_STATUS_BROKEN &&
             !gtk_widget_get_realized(m_widget) &&
             GDK_IS_X11_DISPLAY(gtk_widget_get_display(m_widget)) &&

From f04a46364c3fe1e5f8efc616854fc1fe3cfb3216 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 29 Apr 2018 01:20:45 +0200
Subject: [PATCH 489/916] Remove useless forward declaration of
 wxTopLevelWindowBase

This class is fully declared just below, so there is no need to
forward-declare it.
---
 include/wx/toplevel.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 47c5798ebc..50b5e26121 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -24,8 +24,6 @@
 // the default names for various classes
 extern WXDLLIMPEXP_DATA_CORE(const char) wxFrameNameStr[];
 
-class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

From d97c0555141ac28e7cd8fbc9688c0a998c58e781 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 29 Apr 2018 19:37:42 +0200
Subject: [PATCH 490/916] Introduce platform-dependent wxTLWGeometry class

Previously, TLW geometry was implicitly defined as just its position,
size and the maximized/iconized state by wxPersistentTLW code. This
already wasn't enough for wxGTK which added the decoration sizes to the
geometry being saved/restored, but this had to be done using conditional
compilation, which was not ideal. And it didn't allow using an entirely
different geometry representation as will be done for wxMSW soon.

Change the code to use wxTLWGeometry class defining the geometry, as
used by the current port, explicitly and move wxPersistentTLW logic into
it, as wxPersistentXXX classes are supposed to be very simple, which
wasn't really the case.

Also provide public SaveGeometry() and RestoreToGeometry() methods in
wxTopLevelWindow, which can be useful even to people not using
wxPersistentTLW for whatever reason.

There should be no changes in behaviour so far.
---
 include/wx/gtk/private/tlwgeom.h |  77 ++++++++++++++
 include/wx/persist/toplevel.h    | 107 +++----------------
 include/wx/private/tlwgeom.h     | 177 +++++++++++++++++++++++++++++++
 include/wx/toplevel.h            |  29 +++++
 interface/wx/toplevel.h          |  88 +++++++++++++++
 src/common/toplvcmn.cpp          |  24 +++++
 6 files changed, 410 insertions(+), 92 deletions(-)
 create mode 100644 include/wx/gtk/private/tlwgeom.h
 create mode 100644 include/wx/private/tlwgeom.h

diff --git a/include/wx/gtk/private/tlwgeom.h b/include/wx/gtk/private/tlwgeom.h
new file mode 100644
index 0000000000..31cc355997
--- /dev/null
+++ b/include/wx/gtk/private/tlwgeom.h
@@ -0,0 +1,77 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/tlwgeom.h
+// Purpose:     wxGTK-specific wxTLWGeometry class.
+// Author:      Vadim Zeitlin
+// Created:     2018-04-29
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_TLWGEOM_H_
+#define _WX_GTK_PRIVATE_TLWGEOM_H_
+
+class wxTLWGeometry : public wxTLWGeometryGeneric
+{
+public:
+    virtual bool Save(const Serializer& ser) const wxOVERRIDE
+    {
+        if ( !wxTLWGeometryGeneric::Save(ser) )
+            return false;
+
+        // Don't save the decoration sizes if we don't really have any values
+        // for them.
+        if ( m_decorSize.left || m_decorSize.right ||
+                m_decorSize.top || m_decorSize.bottom )
+        {
+            ser.SaveField("decor_l", m_decorSize.left);
+            ser.SaveField("decor_r", m_decorSize.right);
+            ser.SaveField("decor_t", m_decorSize.top);
+            ser.SaveField("decor_b", m_decorSize.bottom);
+        }
+
+        return true;
+    }
+
+    virtual bool Restore(Serializer& ser) wxOVERRIDE
+    {
+        if ( !wxTLWGeometryGeneric::Restore(ser) )
+            return false;
+
+        ser.RestoreField("decor_l", &m_decorSize.left);
+        ser.RestoreField("decor_r", &m_decorSize.right);
+        ser.RestoreField("decor_t", &m_decorSize.top);
+        ser.RestoreField("decor_b", &m_decorSize.bottom);
+
+        return true;
+    }
+
+    virtual bool GetFrom(const wxTopLevelWindow* tlw) wxOVERRIDE
+    {
+        if ( !wxTLWGeometryGeneric::GetFrom(tlw) )
+            return false;
+
+        m_decorSize = tlw->m_decorSize;
+
+        return true;
+    }
+
+    virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE
+    {
+        if ( !wxTLWGeometryGeneric::ApplyTo(tlw) )
+            return false;
+
+        // Don't overwrite the current decoration size if we already have it.
+        if ( !tlw->m_decorSize.left && !tlw->m_decorSize.right &&
+                !tlw->m_decorSize.top && !tlw->m_decorSize.bottom )
+        {
+            tlw->m_decorSize = m_decorSize;
+        }
+
+        return true;
+    }
+
+private:
+    wxTopLevelWindow::DecorSize m_decorSize;
+};
+
+#endif // _WX_GTK_PRIVATE_TLWGEOM_H_
diff --git a/include/wx/persist/toplevel.h b/include/wx/persist/toplevel.h
index 07c1d61ae2..c1bec8667a 100644
--- a/include/wx/persist/toplevel.h
+++ b/include/wx/persist/toplevel.h
@@ -13,7 +13,6 @@
 #include "wx/persist/window.h"
 
 #include "wx/toplevel.h"
-#include "wx/display.h"
 
 // ----------------------------------------------------------------------------
 // string constants used by wxPersistentTLW
@@ -24,21 +23,13 @@
 // windows, just persistent controls which have their own specific kind strings
 #define wxPERSIST_TLW_KIND "Window"
 
-// names for various persistent options
-#define wxPERSIST_TLW_X "x"
-#define wxPERSIST_TLW_Y "y"
-#define wxPERSIST_TLW_W "w"
-#define wxPERSIST_TLW_H "h"
-
-#define wxPERSIST_TLW_MAXIMIZED "Maximized"
-#define wxPERSIST_TLW_ICONIZED "Iconized"
-
 // ----------------------------------------------------------------------------
 // wxPersistentTLW: supports saving/restoring window position and size as well
 //                  as maximized/iconized/restore state
 // ----------------------------------------------------------------------------
 
-class wxPersistentTLW : public wxPersistentWindow<wxTopLevelWindow>
+class wxPersistentTLW : public wxPersistentWindow<wxTopLevelWindow>,
+                        private wxTopLevelWindow::GeometrySerializer
 {
 public:
     wxPersistentTLW(wxTopLevelWindow *tlw)
@@ -50,96 +41,28 @@ public:
     {
         const wxTopLevelWindow * const tlw = Get();
 
-        const wxPoint pos = tlw->GetScreenPosition();
-        SaveValue(wxPERSIST_TLW_X, pos.x);
-        SaveValue(wxPERSIST_TLW_Y, pos.y);
-
-        // notice that we use GetSize() here and not GetClientSize() because
-        // the latter doesn't return correct results for the minimized windows
-        // (at least not under Windows)
-        //
-        // of course, it shouldn't matter anyhow usually, the client size
-        // should be preserved as well unless the size of the decorations
-        // changed between the runs
-        const wxSize size = tlw->GetSize();
-        SaveValue(wxPERSIST_TLW_W, size.x);
-        SaveValue(wxPERSIST_TLW_H, size.y);
-
-        SaveValue(wxPERSIST_TLW_MAXIMIZED, tlw->IsMaximized());
-        SaveValue(wxPERSIST_TLW_ICONIZED, tlw->IsIconized());
-#ifdef __WXGTK20__
-        SaveValue("decor_l", tlw->m_decorSize.left);
-        SaveValue("decor_r", tlw->m_decorSize.right);
-        SaveValue("decor_t", tlw->m_decorSize.top);
-        SaveValue("decor_b", tlw->m_decorSize.bottom);
-#endif
+        tlw->SaveGeometry(*this);
     }
 
     virtual bool Restore() wxOVERRIDE
     {
         wxTopLevelWindow * const tlw = Get();
 
-        wxPoint pos;
-        wxSize size;
-
-        const bool hasPos = RestoreValue(wxPERSIST_TLW_X, &pos.x) &&
-                            RestoreValue(wxPERSIST_TLW_Y, &pos.y);
-        const bool hasSize = RestoreValue(wxPERSIST_TLW_W, &size.x) &&
-                             RestoreValue(wxPERSIST_TLW_H, &size.y);
-#ifdef __WXGTK20__
-        wxTopLevelWindowGTK::DecorSize decorSize;
-        if (tlw->m_decorSize.top == 0 &&
-            RestoreValue("decor_l", &decorSize.left) &&
-            RestoreValue("decor_r", &decorSize.right) &&
-            RestoreValue("decor_t", &decorSize.top) &&
-            RestoreValue("decor_b", &decorSize.bottom))
-        {
-            tlw->m_decorSize = decorSize;
-        }
-#endif
-
-        if ( hasPos )
-        {
-            // to avoid making the window completely invisible if it had been
-            // shown on a monitor which was disconnected since the last run
-            // (this is pretty common for notebook with external displays)
-            //
-            // NB: we should allow window position to be (slightly) off screen,
-            //     it's not uncommon to position the window so that its upper
-            //     left corner has slightly negative coordinate
-            if ( wxDisplay::GetFromPoint(pos) != wxNOT_FOUND ||
-                 (hasSize && wxDisplay::GetFromPoint(pos + size) != wxNOT_FOUND) )
-            {
-                tlw->Move(pos, wxSIZE_ALLOW_MINUS_ONE);
-            }
-            //else: should we try to adjust position/size somehow?
-        }
-
-        if ( hasSize )
-        {
-            // a previous version of the program could have saved the window
-            // size which used to be big enough, but which is not big enough
-            // any more for the new version, so check that the size we restore
-            // doesn't cut off parts of the window
-            size.IncTo(tlw->GetBestSize());
-            tlw->SetSize(size);
-        }
-
-        // note that the window can be both maximized and iconized
-        bool maximized;
-        if ( RestoreValue(wxPERSIST_TLW_MAXIMIZED, &maximized) && maximized )
-            tlw->Maximize();
-
-        bool iconized;
-        if ( RestoreValue(wxPERSIST_TLW_ICONIZED, &iconized) && iconized )
-            tlw->Iconize();
-
-        // the most important property of the window that we restore is its
-        // size, so disregard the value of hasPos here
-        return hasSize;
+        return tlw->RestoreToGeometry(*this);
     }
 
     virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TLW_KIND; }
+
+private:
+    virtual bool SaveField(const wxString& name, int value) const wxOVERRIDE
+    {
+        return SaveValue(name, value);
+    }
+
+    virtual bool RestoreField(const wxString& name, int* value) wxOVERRIDE
+    {
+        return RestoreValue(name, value);
+    }
 };
 
 inline wxPersistentObject *wxCreatePersistentObject(wxTopLevelWindow *tlw)
diff --git a/include/wx/private/tlwgeom.h b/include/wx/private/tlwgeom.h
new file mode 100644
index 0000000000..aa601f14e3
--- /dev/null
+++ b/include/wx/private/tlwgeom.h
@@ -0,0 +1,177 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/tlwgeom.h
+// Purpose:     Declaration of platform-specific and private wxTLWGeometry.
+// Author:      Vadim Zeitlin
+// Created:     2018-04-29
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_TLWGEOM_H_
+#define _WX_PRIVATE_TLWGEOM_H_
+
+#include "wx/display.h"
+#include "wx/toplevel.h"
+
+// ----------------------------------------------------------------------------
+// wxTLWGeometryBase: abstract base class for platform-specific classes
+// ----------------------------------------------------------------------------
+
+// wxTLWGeometry contains full information about the window geometry, which may
+// include things other than the obvious ones like its current position and
+// size (e.g. under MSW it also stores the position of the maximized window,
+// under GTK the size of non-client decorations etc). It is private to wx and
+// is only used indirectly, via wxTopLevelWindow::SaveGeometry() and
+// RestoreToGeometry() methods, in the public API.
+
+class wxTLWGeometryBase
+{
+public:
+    typedef wxTopLevelWindow::GeometrySerializer Serializer;
+
+    wxTLWGeometryBase() {}
+    virtual ~wxTLWGeometryBase() {}
+
+    // Initialize from the given window.
+    virtual bool GetFrom(const wxTopLevelWindow* tlw) = 0;
+
+    // Resize the window to use this geometry.
+    virtual bool ApplyTo(wxTopLevelWindow* tlw) = 0;
+
+    // Serialize or deserialize the object by using the provided object for
+    // writing/reading the values of the different fields of this object.
+    virtual bool Save(const Serializer& ser) const = 0;
+    virtual bool Restore(Serializer& ser) = 0;
+};
+
+// ----------------------------------------------------------------------------
+// wxTLWGeometryGeneric: simplest possible generic implementation
+// ----------------------------------------------------------------------------
+
+// names for various persistent options
+#define wxPERSIST_TLW_X "x"
+#define wxPERSIST_TLW_Y "y"
+#define wxPERSIST_TLW_W "w"
+#define wxPERSIST_TLW_H "h"
+
+#define wxPERSIST_TLW_MAXIMIZED "Maximized"
+#define wxPERSIST_TLW_ICONIZED "Iconized"
+
+class wxTLWGeometryGeneric : public wxTLWGeometryBase
+{
+public:
+    wxTLWGeometryGeneric()
+    {
+        m_hasPos =
+        m_hasSize =
+        m_iconized =
+        m_maximized = false;
+    }
+
+    virtual bool Save(const Serializer& ser) const wxOVERRIDE
+    {
+        if ( !ser.SaveField(wxPERSIST_TLW_X, m_rectScreen.x) ||
+             !ser.SaveField(wxPERSIST_TLW_Y, m_rectScreen.y) )
+            return false;
+
+        if ( !ser.SaveField(wxPERSIST_TLW_W, m_rectScreen.width) ||
+             !ser.SaveField(wxPERSIST_TLW_H, m_rectScreen.height) )
+            return false;
+
+        if ( !ser.SaveField(wxPERSIST_TLW_MAXIMIZED, m_maximized) )
+            return false;
+
+        if ( !ser.SaveField(wxPERSIST_TLW_ICONIZED, m_iconized) )
+            return false;
+
+        return true;
+    }
+
+    virtual bool Restore(Serializer& ser) wxOVERRIDE
+    {
+        m_hasPos = ser.RestoreField(wxPERSIST_TLW_X, &m_rectScreen.x) &&
+                   ser.RestoreField(wxPERSIST_TLW_Y, &m_rectScreen.y);
+
+        m_hasSize = ser.RestoreField(wxPERSIST_TLW_W, &m_rectScreen.width) &&
+                    ser.RestoreField(wxPERSIST_TLW_H, &m_rectScreen.height);
+
+        int tmp;
+        if ( ser.RestoreField(wxPERSIST_TLW_MAXIMIZED, &tmp) )
+            m_maximized = tmp != 0;
+
+        if ( ser.RestoreField(wxPERSIST_TLW_ICONIZED, &tmp) )
+            m_iconized = tmp != 0;
+
+        // If we restored at least something, return true.
+        return m_hasPos || m_hasSize || m_maximized || m_iconized;
+    }
+
+    virtual bool GetFrom(const wxTopLevelWindow* tlw) wxOVERRIDE
+    {
+        m_rectScreen = tlw->GetScreenRect();
+        m_hasPos =
+        m_hasSize = true;
+        m_iconized = tlw->IsIconized();
+        m_maximized = tlw->IsMaximized();
+
+        return true;
+    }
+
+    virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE
+    {
+        if ( m_hasPos )
+        {
+            // to avoid making the window completely invisible if it had been
+            // shown on a monitor which was disconnected since the last run
+            // (this is pretty common for notebook with external displays)
+            //
+            // NB: we should allow window position to be (slightly) off screen,
+            //     it's not uncommon to position the window so that its upper
+            //     left corner has slightly negative coordinate
+            if ( wxDisplay::GetFromPoint(m_rectScreen.GetTopLeft()) != wxNOT_FOUND ||
+                 (m_hasSize &&
+                  wxDisplay::GetFromPoint(m_rectScreen.GetBottomRight()) != wxNOT_FOUND) )
+            {
+                tlw->Move(m_rectScreen.GetTopLeft(), wxSIZE_ALLOW_MINUS_ONE);
+            }
+            //else: should we try to adjust position/size somehow?
+        }
+
+        if ( m_hasSize )
+        {
+            // a previous version of the program could have saved the window
+            // size which used to be big enough, but which is not big enough
+            // any more for the new version, so check that the size we restore
+            // doesn't cut off parts of the window
+            wxSize size = m_rectScreen.GetSize();
+            size.IncTo(tlw->GetBestSize());
+            tlw->SetSize(size);
+        }
+
+        // note that the window can be both maximized and iconized
+        if ( m_maximized )
+            tlw->Maximize();
+
+        if ( m_iconized )
+            tlw->Iconize();
+
+        return true;
+    }
+
+private:
+    wxRect m_rectScreen;
+    bool m_hasPos;
+    bool m_hasSize;
+    bool m_iconized;
+    bool m_maximized;
+};
+
+#ifdef __WXGTK20__
+    #include "wx/gtk/private/tlwgeom.h"
+#else
+    class wxTLWGeometry : public wxTLWGeometryGeneric
+    {
+    };
+#endif
+
+#endif // _WX_PRIVATE_TLWGEOM_H_
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 50b5e26121..9927d67db1 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -238,6 +238,35 @@ public:
     wxWindow *SetTmpDefaultItem(wxWindow *win)
         { wxWindow *old = GetDefaultItem(); m_winTmpDefault = win; return old; }
 
+
+    // Class for saving/restoring fields describing the window geometry.
+    //
+    // This class is used by the functions below to allow saving the geometry
+    // of the window and restoring it later. The components describing geometry
+    // are platform-dependent, so there is no struct containing them and
+    // instead the methods of this class are used to save or [try to] restore
+    // whichever components are used under the current platform.
+    class GeometrySerializer
+    {
+    public:
+        virtual ~GeometrySerializer() {}
+
+        // If saving a field returns false, it's fatal error and SaveGeometry()
+        // will return false.
+        virtual bool SaveField(const wxString& name, int value) const = 0;
+
+        // If restoring a field returns false, it just means that the field is
+        // not present and RestoreToGeometry() still continues with restoring
+        // the other values.
+        virtual bool RestoreField(const wxString& name, int* value) = 0;
+    };
+
+    // Save the current window geometry using the provided serializer and
+    // restore the window to the previously saved geometry.
+    bool SaveGeometry(const GeometrySerializer& ser) const;
+    bool RestoreToGeometry(GeometrySerializer& ser);
+
+
     // implementation only from now on
     // -------------------------------
 
diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h
index 0dd1befbc8..44731c8790 100644
--- a/interface/wx/toplevel.h
+++ b/interface/wx/toplevel.h
@@ -350,6 +350,94 @@ public:
      */
     void Restore();
 
+    /**
+        Class used with SaveGeometry() and RestoreToGeometry().
+
+        This is an abstract base class, i.e. to use it you must define a
+        derived class implementing the pure virtual SaveField() and
+        RestoreField() methods.
+
+        For example, if you wished to store the window geometry in a database,
+        you could derive a class saving fields such as "width" or "height" in a
+        table in this database and restoring them from it later.
+
+        @since 3.1.2
+     */
+    class GeometrySerializer
+    {
+        /**
+            Save a single field with the given value.
+
+            Note that if this function returns @false, SaveGeometry() supposes
+            that saving the geometry failed and returns @false itself, without
+            even trying to save anything else.
+
+            @param name uniquely identifies the field but is otherwise
+                arbitrary.
+            @param value value of the field (can be positive or negative, i.e.
+                it can't be assumed that a value like -1 is invalid).
+
+            @return @true if the field was saved or @false if saving it failed,
+                resulting in wxTopLevelWindow::SaveGeometry() failure.
+         */
+        virtual bool SaveField(const wxString& name, int value) const = 0;
+
+        /**
+            Try to restore a single field.
+
+            Unlike for SaveField(), returning @false from this function may
+            indicate that the value simply wasn't present and doesn't prevent
+            RestoreToGeometry() from continuing with trying to restore the
+            other values.
+
+            @param name uniquely identifies the field
+            @param value non-@NULL pointer to the value to be filled by this
+                function
+
+            @return @true if the value was retrieved or @false if it wasn't
+                found or an error occurred.
+         */
+        virtual bool RestoreField(const wxString& name, int* value) = 0;
+    };
+
+    /**
+        Restores the window to the previously saved geometry.
+
+        This is a companion function to SaveGeometry() and can be called later
+        to restore the window to the geometry it had when it was saved.
+
+        @param ser An object implementing GeometrySerializer virtual methods.
+
+        @return @true if any (and, usually, but not necessarily, all) of the
+            window geometry attributes were restored or @false if there was no
+            saved geometry information at all or restoring it failed.
+
+        @since 3.1.2
+     */
+    bool RestoreToGeometry(GeometrySerializer& ser);
+
+    /**
+        Save the current window geometry to allow restoring it later.
+
+        After calling this function, window geometry is saved in the provided
+        serializer and calling RestoreToGeometry() with the same serializer
+        later (i.e. usually during a subsequent program execution) would
+        restore the window to the same position, size, maximized/minimized
+        state etc.
+
+        This function is used by wxPersistentTLW, so it is not necessary to use
+        it if the goal is to just save and restore window geometry in the
+        simplest possible way. However is more flexibility is required, it can
+        be also used directly with a custom serializer object.
+
+        @param ser An object implementing GeometrySerializer virtual methods.
+
+        @return @true if the geometry was saved, @false if doing it failed
+
+        @since 3.1.2
+     */
+    bool SaveGeometry(const GeometrySerializer& ser) const;
+
     /**
         Changes the default item for the panel, usually @a win is a button.
 
diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index c5eff7f463..a5660a3b23 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -31,6 +31,8 @@
 
 #include "wx/display.h"
 
+#include "wx/private/tlwgeom.h"
+
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
@@ -310,6 +312,28 @@ void wxTopLevelWindowBase::DoCentre(int dir)
     SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
 }
 
+// ----------------------------------------------------------------------------
+// Saving/restoring geometry
+// ----------------------------------------------------------------------------
+
+bool wxTopLevelWindowBase::SaveGeometry(const GeometrySerializer& ser) const
+{
+    wxTLWGeometry geom;
+    if ( !geom.GetFrom(static_cast<const wxTopLevelWindow*>(this)) )
+        return false;
+
+    return geom.Save(ser);
+}
+
+bool wxTopLevelWindowBase::RestoreToGeometry(GeometrySerializer& ser)
+{
+    wxTLWGeometry geom;
+    if ( !geom.Restore(ser) )
+        return false;
+
+    return geom.ApplyTo(static_cast<wxTopLevelWindow*>(this));
+}
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow size management: we exclude the areas taken by
 // menu/status/toolbars from the client area, so the client area is what's

From 6ae7aa444358cd2618a57e9ab29826f1714dbb4b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 29 Apr 2018 20:30:30 +0200
Subject: [PATCH 491/916] Fix saving/restoring window position for maximized
 windows

Save both the normal window geometry and its maximized position instead
of saving just its current position. This fixes restoring geometry of
the maximized windows as previously they were always restored on the
primary monitor, as their original position was lost.

Use the native {Get,Set}WindowPlacement() functions for a MSW-specific
wxTLWGeometry implementation to achieve this.

Closes #16335.
---
 docs/changes.txt                 |   1 +
 include/wx/msw/private/tlwgeom.h | 126 +++++++++++++++++++++++++++++++
 include/wx/private/tlwgeom.h     |   7 ++
 tests/persistence/tlw.cpp        |  53 +++++++++++++
 4 files changed, 187 insertions(+)
 create mode 100644 include/wx/msw/private/tlwgeom.h

diff --git a/docs/changes.txt b/docs/changes.txt
index b9c6f3a7f3..2d67ba9c11 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -88,6 +88,7 @@ wxMSW:
 
 - Fix hang after clearing wxTAB_TRAVERSAL style on a window with children.
 - Fix handling of AUX2 mouse button events (Trylz).
+- Fix saving/restoring window position for maximized windows.
 
 
 3.1.1: (released 2018-02-19)
diff --git a/include/wx/msw/private/tlwgeom.h b/include/wx/msw/private/tlwgeom.h
new file mode 100644
index 0000000000..1142f94c6a
--- /dev/null
+++ b/include/wx/msw/private/tlwgeom.h
@@ -0,0 +1,126 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/private/tlwgeom.h
+// Purpose:     wxMSW-specific wxTLWGeometry class.
+// Author:      Vadim Zeitlin
+// Created:     2018-04-29
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_PRIVATE_TLWGEOM_H_
+#define _WX_MSW_PRIVATE_TLWGEOM_H_
+
+#include "wx/log.h"
+
+#include "wx/msw/private.h"
+
+// names for MSW-specific options
+#define wxPERSIST_TLW_MAX_X "xmax"
+#define wxPERSIST_TLW_MAX_Y "ymax"
+
+class wxTLWGeometry : public wxTLWGeometryBase
+{
+public:
+    wxTLWGeometry()
+    {
+        wxZeroMemory(m_placement);
+        m_placement.length = sizeof(m_placement);
+    }
+
+    virtual bool Save(const Serializer& ser) const wxOVERRIDE
+    {
+        // For compatibility with the existing saved positions/sizes, use the
+        // same keys as the generic version (which was previously used under
+        // MSW too).
+
+        // Normal position and size.
+        const RECT& rc = m_placement.rcNormalPosition;
+        if ( !ser.SaveField(wxPERSIST_TLW_X, rc.left) ||
+             !ser.SaveField(wxPERSIST_TLW_Y, rc.top) )
+            return false;
+
+        if ( !ser.SaveField(wxPERSIST_TLW_W, rc.right - rc.left) ||
+             !ser.SaveField(wxPERSIST_TLW_H, rc.bottom - rc.top) )
+            return false;
+
+        // Maximized/minimized state.
+        UINT show = m_placement.showCmd;
+        if ( !ser.SaveField(wxPERSIST_TLW_MAXIMIZED, show == SW_SHOWMAXIMIZED) )
+            return false;
+
+        if ( !ser.SaveField(wxPERSIST_TLW_ICONIZED, show == SW_SHOWMINIMIZED) )
+            return false;
+
+        // Maximized window position.
+        const POINT pt = m_placement.ptMaxPosition;
+        if ( !ser.SaveField(wxPERSIST_TLW_MAX_X, pt.x) ||
+             !ser.SaveField(wxPERSIST_TLW_MAX_Y, pt.y) )
+            return false;
+
+        // We don't currently save the minimized window position, it doesn't
+        // seem useful for anything and is probably just a left over from
+        // Windows 3.1 days, when icons were positioned on the desktop instead
+        // of being located in the taskbar.
+
+        return true;
+    }
+
+    virtual bool Restore(Serializer& ser) wxOVERRIDE
+    {
+        // Normal position and size.
+        wxRect r;
+        if ( !ser.RestoreField(wxPERSIST_TLW_X, &r.x) ||
+             !ser.RestoreField(wxPERSIST_TLW_Y, &r.y) ||
+             !ser.RestoreField(wxPERSIST_TLW_W, &r.width) ||
+             !ser.RestoreField(wxPERSIST_TLW_H, &r.height) )
+            return false;
+        wxCopyRectToRECT(r, m_placement.rcNormalPosition);
+
+        // Maximized/minimized state.
+        int tmp;
+        UINT& show = m_placement.showCmd;
+        if ( ser.RestoreField(wxPERSIST_TLW_MAXIMIZED, &tmp) && tmp )
+            show = SW_SHOWMAXIMIZED;
+        else if ( ser.RestoreField(wxPERSIST_TLW_ICONIZED, &tmp) && tmp )
+            show = SW_SHOWMINIMIZED;
+        else
+            show = SW_SHOWNORMAL;
+
+        // Maximized window position.
+        if ( ser.RestoreField(wxPERSIST_TLW_MAX_X, &r.x) &&
+             ser.RestoreField(wxPERSIST_TLW_MAX_Y, &r.y) )
+        {
+            m_placement.ptMaxPosition.x = r.x;
+            m_placement.ptMaxPosition.y = r.y;
+        }
+
+        return true;
+    }
+
+    virtual bool GetFrom(const wxTopLevelWindow* tlw) wxOVERRIDE
+    {
+        if ( !::GetWindowPlacement(GetHwndOf(tlw), &m_placement) )
+        {
+            wxLogLastError(wxS("GetWindowPlacement"));
+            return false;
+        }
+
+        return true;
+    }
+
+    virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE
+    {
+        if ( !::SetWindowPlacement(GetHwndOf(tlw), &m_placement) )
+        {
+            wxLogLastError(wxS("SetWindowPlacement"));
+            return false;
+        }
+
+        return true;
+    }
+
+private:
+    WINDOWPLACEMENT m_placement;
+};
+
+#endif // _WX_MSW_PRIVATE_TLWGEOM_H_
diff --git a/include/wx/private/tlwgeom.h b/include/wx/private/tlwgeom.h
index aa601f14e3..0a273b8b8d 100644
--- a/include/wx/private/tlwgeom.h
+++ b/include/wx/private/tlwgeom.h
@@ -57,6 +57,9 @@ public:
 #define wxPERSIST_TLW_MAXIMIZED "Maximized"
 #define wxPERSIST_TLW_ICONIZED "Iconized"
 
+// MSW has its own native implementation and doesn't use this class.
+#ifndef __WXMSW__
+
 class wxTLWGeometryGeneric : public wxTLWGeometryBase
 {
 public:
@@ -166,8 +169,12 @@ private:
     bool m_maximized;
 };
 
+#endif // !__WXMSW__
+
 #ifdef __WXGTK20__
     #include "wx/gtk/private/tlwgeom.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/private/tlwgeom.h"
 #else
     class wxTLWGeometry : public wxTLWGeometryGeneric
     {
diff --git a/tests/persistence/tlw.cpp b/tests/persistence/tlw.cpp
index 021f1bed64..e78d7e36ac 100644
--- a/tests/persistence/tlw.cpp
+++ b/tests/persistence/tlw.cpp
@@ -101,6 +101,59 @@ TEST_CASE_METHOD(PersistenceTests, "wxPersistTLW", "[persist][tlw]")
         CHECK(!frame->IsMaximized());
         CHECK(!frame->IsIconized());
 
+        // Next try that restoring a minimized frame works correctly: for
+        // Iconize() to have effect, we must show the frame first.
+        frame->Iconize();
+        frame->Show();
+
         delete frame;
     }
+
+    // Check geometry after restoring the minimized frame.
+    {
+        wxFrame* const frame = CreatePersistenceTestFrame();
+
+        CHECK(wxPersistenceManager::Get().RegisterAndRestore(frame));
+
+        CHECK(!frame->IsMaximized());
+        CHECK(frame->IsIconized());
+
+        frame->Restore();
+
+        CHECK(pos.x == frame->GetPosition().x);
+        CHECK(pos.y == frame->GetPosition().y);
+        CHECK(size.x == frame->GetSize().GetWidth());
+        CHECK(size.y == frame->GetSize().GetHeight());
+
+        // Next try that restoring a maximized frame works correctly: again,
+        // for it to be really maximized, it must be shown.
+        frame->Maximize();
+        frame->Show();
+
+        delete frame;
+    }
+
+    // Check geometry after restoring the maximized frame.
+    //
+    // This test currently fails under non-MSW platforms as they only save the
+    // maximized frame size, and its normal size is lost and can't be restored.
+#ifdef __WXMSW__
+    {
+        wxFrame* const frame = CreatePersistenceTestFrame();
+
+        CHECK(wxPersistenceManager::Get().RegisterAndRestore(frame));
+
+        CHECK(frame->IsMaximized());
+        CHECK(!frame->IsIconized());
+
+        frame->Restore();
+
+        CHECK(pos.x == frame->GetPosition().x);
+        CHECK(pos.y == frame->GetPosition().y);
+        CHECK(size.x == frame->GetSize().GetWidth());
+        CHECK(size.y == frame->GetSize().GetHeight());
+
+        delete frame;
+    }
+#endif // __WXMSW__
 }

From bb29b87a45a6ed6a8058b3d59d4cb9b2f7d1524d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Mon, 30 Apr 2018 00:58:39 +0300
Subject: [PATCH 492/916] Add test case for window positioning beyond Short
 limit

---
 tests/controls/windowtest.cpp | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/tests/controls/windowtest.cpp b/tests/controls/windowtest.cpp
index d99f8aaf36..c7933832eb 100644
--- a/tests/controls/windowtest.cpp
+++ b/tests/controls/windowtest.cpp
@@ -16,6 +16,7 @@
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/button.h"
+    #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
 #include "asserthelper.h"
@@ -49,6 +50,7 @@ private:
         CPPUNIT_TEST( Children );
         CPPUNIT_TEST( Focus );
         CPPUNIT_TEST( Positioning );
+        CPPUNIT_TEST( PositioningBeyondShortLimit );
         CPPUNIT_TEST( Show );
         CPPUNIT_TEST( Enable );
         CPPUNIT_TEST( FindWindowBy );
@@ -68,6 +70,7 @@ private:
     void Children();
     void Focus();
     void Positioning();
+    void PositioningBeyondShortLimit();
     void Show();
     void Enable();
     void FindWindowBy();
@@ -327,6 +330,47 @@ void WindowTestCase::Positioning()
                          m_window->GetScreenRect().GetTopLeft());
 }
 
+void WindowTestCase::PositioningBeyondShortLimit()
+{
+#ifdef __WXMSW__
+    //Positioning under MSW is limited to short relative coordinates
+
+    //
+    //Test window creation beyond SHRT_MAX
+    int commonDim = 10;
+    wxWindow* w = new wxWindow(m_window, wxID_ANY,
+                               wxPoint(0, SHRT_MAX + commonDim),
+                               wxSize(commonDim, commonDim));
+    CPPUNIT_ASSERT_EQUAL(SHRT_MAX + commonDim, w->GetPosition().y);
+
+    w->Move(0, 0);
+
+    //
+    //Test window moving beyond SHRT_MAX
+    w->Move(0, SHRT_MAX + commonDim);
+    CPPUNIT_ASSERT_EQUAL(SHRT_MAX + commonDim, w->GetPosition().y);
+
+    //
+    //Test window moving below SHRT_MIN
+    w->Move(0, SHRT_MIN - commonDim);
+    CPPUNIT_ASSERT_EQUAL(SHRT_MIN - commonDim, w->GetPosition().y);
+
+    //
+    //Test deferred move beyond SHRT_MAX
+    m_window->SetVirtualSize(-1, SHRT_MAX + 2 * commonDim);
+    wxWindow* bigWin = new wxWindow(m_window, wxID_ANY, wxDefaultPosition,
+                                    //size is also limited by SHRT_MAX
+                                    wxSize(commonDim, SHRT_MAX));
+    wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(bigWin);
+    sizer->AddSpacer(commonDim); //add some space to go beyond SHRT_MAX
+    sizer->Add(w);
+    m_window->SetSizer(sizer);
+    m_window->Layout();
+    CPPUNIT_ASSERT_EQUAL(SHRT_MAX + commonDim, w->GetPosition().y);
+#endif
+}
+
 void WindowTestCase::Show()
 {
     CPPUNIT_ASSERT(m_window->IsShown());

From 83af2a428e101be54e566bff50d7072c11654a88 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Mon, 30 Apr 2018 22:27:31 -0400
Subject: [PATCH 493/916] Fix return type of wxNumberEntryDialog::GetValue() in
 documentation

Closes https://github.com/wxWidgets/wxWidgets/pull/796
---
 interface/wx/numdlg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/wx/numdlg.h b/interface/wx/numdlg.h
index b1bf88b005..e074b0b545 100644
--- a/interface/wx/numdlg.h
+++ b/interface/wx/numdlg.h
@@ -74,7 +74,7 @@ public:
         Returns the value that the user has entered if the user has pressed OK,
         or the original value if the user has pressed Cancel.
     */
-    wxString GetValue() const;
+    long GetValue() const;
 };
 
 

From 9b554c0974f6d625d5c88009a223e0df366d132b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 1 May 2018 15:10:55 +0200
Subject: [PATCH 494/916] Avoid narrowing conversion in wxMac struct
 initialization

Multiplying 2 float values is promoted to double, which is then narrowed
to float when initializing CGPoint with it, resulting in errors in C++11
build.

Fix this by initializing the CGFloat variable, which doesn't uniform
initialization, to the correct value instead, as this also seems more
clear ("height" is the height at which the strike is drawn).

Closes https://github.com/wxWidgets/wxWidgets/pull/793
---
 src/osx/carbon/graphics.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index e77c6172cf..699e483512 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -2245,8 +2245,8 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo
     if ( fref->GetStrikethrough() )
     {
         CGFloat width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
-        CGFloat height = CTFontGetXHeight( font );
-        CGPoint points[] = { {0.0, height * 0.6f},  {width, height * 0.6f} };
+        CGFloat height = CTFontGetXHeight( font ) * 0.6;
+        CGPoint points[] = { {0.0, height},  {width, height} };
         CGContextSetStrokeColorWithColor(m_cgContext, col);
         CGContextSetShouldAntialias(m_cgContext, false);
         CGContextSetLineWidth(m_cgContext, 1.0);

From 0cb7c55e939065ba33814af276d4b8218bb0f323 Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Wed, 2 May 2018 08:13:26 +0200
Subject: [PATCH 495/916] add wxUSE_LIBLZMA definition

---
 setup.h_vms | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.h_vms b/setup.h_vms
index 363134616a..f4056c716d 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 22 January 2018                                                    *
+ * Date : 23 April 2018                                                      *
  *                                                                           *
  *****************************************************************************/
 
@@ -329,6 +329,8 @@ typedef pid_t GPid;
 
 #define wxUSE_ZLIB          1
 
+#define wxUSE_LIBLZMA       1
+
 #define wxUSE_APPLE_IEEE          0
 
 #define wxUSE_JOYSTICK            0

From 59c37cb5eb8cbb68c09e473198998813e4ea4996 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 1 Sep 2016 15:20:52 +0200
Subject: [PATCH 496/916] Show correct save path when using compressed debug
 report

The compressed report location could be set to a different location from
the one shown in the dialog.

Closes #17176.

Closes https://github.com/wxWidgets/wxWidgets/pull/797
---
 include/wx/debugrpt.h   |  9 +++++++++
 src/common/debugrpt.cpp | 33 +++++++++++++++++++++------------
 src/generic/dbgrptg.cpp | 11 +++++------
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h
index 17e0b899a4..a1d808bf70 100644
--- a/include/wx/debugrpt.h
+++ b/include/wx/debugrpt.h
@@ -16,6 +16,7 @@
 
 #include "wx/string.h"
 #include "wx/arrstr.h"
+#include "wx/filename.h"
 
 class WXDLLIMPEXP_FWD_XML wxXmlNode;
 
@@ -25,6 +26,8 @@ class WXDLLIMPEXP_FWD_XML wxXmlNode;
 
 class WXDLLIMPEXP_QA wxDebugReport
 {
+    friend class wxDebugReportDialog;
+
 public:
     // this is used for the functions which may report either the current state
     // or the state during the last (fatal) exception
@@ -113,6 +116,9 @@ protected:
     // used by Process()
     virtual bool DoProcess();
 
+    // return the location where the report will be saved
+    virtual wxFileName GetSaveLocation() const;
+
 private:
     // name of the report directory
     wxString m_dir;
@@ -148,6 +154,9 @@ public:
 protected:
     virtual bool DoProcess() wxOVERRIDE;
 
+    // return the location where the report will be saved
+    wxFileName GetSaveLocation() const wxOVERRIDE;
+
 private:
     // user-specified file directory/base name, use defaults if empty
     wxString m_zipDir,
diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index 6068f0479c..8e15935a8f 100644
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -594,6 +594,13 @@ bool wxDebugReport::DoProcess()
     return true;
 }
 
+wxFileName wxDebugReport::GetSaveLocation() const
+{
+    wxFileName fn;
+    fn.SetPath(GetDirectory());
+    return fn;
+}
+
 // ============================================================================
 // wxDebugReport-derived classes
 // ============================================================================
@@ -618,6 +625,19 @@ void wxDebugReportCompress::SetCompressedFileBaseName(const wxString& name)
     m_zipName = name;
 }
 
+wxFileName wxDebugReportCompress::GetSaveLocation() const
+{
+    // Use de default directoy as a basis for the save location, e.g.
+    // %temp%/someName becomes %temp%/someName.zip.
+    wxFileName fn(GetDirectory());
+    if (!m_zipDir.empty())
+        fn.SetPath(m_zipDir);
+    if (!m_zipName.empty())
+        fn.SetName(m_zipName);
+    fn.SetExt("zip");
+    return fn;
+}
+
 bool wxDebugReportCompress::DoProcess()
 {
 #define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
@@ -626,19 +646,8 @@ bool wxDebugReportCompress::DoProcess()
     if ( !count )
         return false;
 
-    // create the compressed report file outside of the directory with the
-    // report files as it will be deleted by wxDebugReport dtor but we want to
-    // keep this one: for this we simply treat the directory name as the name
-    // of the file so that its last component becomes our base name
-    wxFileName fn(GetDirectory());
-    if ( !m_zipDir.empty() )
-        fn.SetPath(m_zipDir);
-    if ( !m_zipName.empty() )
-        fn.SetName(m_zipName);
-    fn.SetExt("zip");
-
     // create the streams
-    const wxString ofullPath = fn.GetFullPath();
+    const wxString ofullPath = GetSaveLocation().GetFullPath();
 #if wxUSE_FFILE
     wxFFileOutputStream os(ofullPath, wxT("wb"));
 #elif wxUSE_FILE
diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index a39280a1e8..75d406dc7e 100644
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -306,16 +306,15 @@ wxDebugReportDialog::wxDebugReportDialog(wxDebugReport& dbgrpt)
 {
     // upper part of the dialog: explanatory message
     wxString msg;
-    wxString debugDir = dbgrpt.GetDirectory();
 
     // The temporary directory can be the short form on Windows;
     // normalize it for the benefit of users.
-#ifdef __WXMSW__
-    wxFileName debugDirFilename(debugDir, wxEmptyString);
+    wxFileName debugDirFilename(dbgrpt.GetSaveLocation());
     debugDirFilename.Normalize(wxPATH_NORM_LONG);
-    debugDir = debugDirFilename.GetPath();
-#endif
-    msg << _("A debug report has been generated in the directory\n")
+    wxString debugDir = debugDirFilename.GetFullPath();
+    msg << (debugDirFilename.IsDir()
+            ? _("A debug report has been generated in the directory\n")
+            : _("The following debug report will be generated\n"))
         << wxT('\n')
         << wxT("             \"") << debugDir << wxT("\"\n")
         << wxT('\n')

From 58a7339cb9ac1d70b37e4988e91fe51c43d15345 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 1 May 2018 21:03:38 +0200
Subject: [PATCH 497/916] Show the mouse wheel axis in the text sample

This helps debugging these events generation.

Closes https://github.com/wxWidgets/wxWidgets/pull/798
---
 samples/text/text.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 7fde709462..f07a420db2 100644
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -770,7 +770,9 @@ static wxString GetMouseEventDesc(const wxMouseEvent& ev)
     }
     else if ( ev.GetWheelRotation() )
     {
-        return wxString::Format("Wheel rotation %+d", ev.GetWheelRotation());
+        return wxString::Format("%s wheel rotation %+d",
+            ev.GetWheelAxis() == wxMOUSE_WHEEL_VERTICAL ? "Vertical" : "Horizontal",
+            ev.GetWheelRotation());
     }
     else
     {

From 2a5aafb27419efb36999e24dbcc091eacea56286 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 1 May 2018 21:20:21 +0200
Subject: [PATCH 498/916] Fix missing tool in the overflow menu of wxAuiToolBar

When determining if a tool is hidden, it takes the width (or height) of
the overflow sizer into account -- but when tools are overlapping, this
is 0. By setting and getting the minimum size of the overflow sizer, the
actual size of the overflow button can be used.

Closes #17960.

Closes https://github.com/wxWidgets/wxWidgets/pull/799
---
 docs/changes.txt   | 1 +
 src/aui/auibar.cpp | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 2d67ba9c11..973a1fb904 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -79,6 +79,7 @@ All:
 All (GUI):
 
 - Improve stock items consistency and aesthetics (dhowland).
+- Fix bug with missing items in overflowing AUI toolbar (Maarten Bent).
 
 wxGTK:
 
diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 2c5155a94b..3d6c1326a6 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -1773,7 +1773,7 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const
     {
         // take the dropdown size into account
         if (m_overflowVisible && m_overflowSizerItem)
-            cli_h -= m_overflowSizerItem->GetSize().y;
+            cli_h -= m_overflowSizerItem->GetMinSize().y;
 
         if (rect.y+rect.height < cli_h)
             return true;
@@ -1782,7 +1782,7 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const
     {
         // take the dropdown size into account
         if (m_overflowVisible && m_overflowSizerItem)
-            cli_w -= m_overflowSizerItem->GetSize().x;
+            cli_w -= m_overflowSizerItem->GetMinSize().x;
 
         if (rect.x+rect.width < cli_w)
             return true;
@@ -2024,6 +2024,7 @@ bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal)
                 m_overflowSizerItem = sizer->Add(overflow_size, 1, 0, wxEXPAND);
             else
                 m_overflowSizerItem = sizer->Add(1, overflow_size, 0, wxEXPAND);
+            m_overflowSizerItem->SetMinSize(m_overflowSizerItem->GetSize());
         }
         else
         {

From 183ba1cb4cf62e6c4b94f575831e301ef63d480a Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Fri, 23 Feb 2018 15:33:22 +0100
Subject: [PATCH 499/916] Set NSPrincipalClass to wxNSApplcation for CMake
 builds too

This setting is important for some functionality provided by
wxNSApplcation and most importantly without the setting all samples
where only shown scaled on high DPI displays.

Notice that it was already present in src/osx/carbon/Info.plist.in which
is used for the samples in autoconf build.

Closes https://github.com/wxWidgets/wxWidgets/pull/743
---
 build/cmake/functions.cmake |  1 +
 samples/Info.plist.in       | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 samples/Info.plist.in

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index d3df40bb2b..f0edeac4c3 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -636,6 +636,7 @@ function(wx_add_sample name)
     elseif(APPLE)
         if(NOT IPHONE)
             set_target_properties(${target_name} PROPERTIES
+                MACOSX_BUNDLE_INFO_PLIST "${wxSOURCE_DIR}/samples/Info.plist.in"
                 RESOURCE "${wxSOURCE_DIR}/src/osx/carbon/wxmac.icns")
         endif()
         set_target_properties(${target_name} PROPERTIES
diff --git a/samples/Info.plist.in b/samples/Info.plist.in
new file mode 100644
index 0000000000..69e9c73bd1
--- /dev/null
+++ b/samples/Info.plist.in
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
+	<key>CFBundleIconFile</key>
+	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+	<key>CFBundleName</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+	<key>NSPrincipalClass</key>
+	<string>wxNSApplication</string>
+</dict>
+</plist>

From ff06e12ceb3d70ae7ad7e3d648f240463904f191 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 2 May 2018 15:56:26 +0200
Subject: [PATCH 500/916] Remove unused and outdates samples/Info.plist file

This file was added in 4d524cdd0e084d1191b9fc83a98147002d8015d6 a long
time ago but doesn't seem to have been ever actually used for anything
and is outdated, e.g. contains LSRequiresCarbon=true, which shouldn't be
used any longer.

Remove the file itself and all references to it.
---
 build/bakefiles/make_dist.mk               |  2 --
 docs/contributing/about-version-numbers.md |  1 -
 misc/scripts/inc_release                   |  4 ---
 samples/Info.plist                         | 36 ----------------------
 4 files changed, 43 deletions(-)
 delete mode 100644 samples/Info.plist

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 706589a17f..39a3a6ffc3 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -317,7 +317,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 
@@ -544,7 +543,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 
diff --git a/docs/contributing/about-version-numbers.md b/docs/contributing/about-version-numbers.md
index f87d6c90ab..48c79a20db 100644
--- a/docs/contributing/about-version-numbers.md
+++ b/docs/contributing/about-version-numbers.md
@@ -26,7 +26,6 @@ Here is the list of files that need to be updated:
 	docs/msw/install.txt {major release only}
 	include/wx/version.h
 	include/wx/osx/config_xcode.h
-	samples/Info.plist
 	samples/docview/Info.plist
 	samples/minimal/Info_carbon.plist
 	samples/minimal/Info_cocoa.plist
diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release
index 021a77e2fb..4a81ad9d91 100755
--- a/misc/scripts/inc_release
+++ b/misc/scripts/inc_release
@@ -97,10 +97,6 @@ run_sed include/wx/version.h \
 run_sed include/wx/osx/config_xcode.h \
     "/^#define PACKAGE/s/$ver_for_sed/$ver_string_new/"
 
-run_sed samples/Info.plist \
-    "/version/s/$ver_for_sed/$ver_string_new/" \
-    "/<string>/s/$ver_for_sed/$ver_string_new/"
-
 run_sed samples/minimal/Info_cocoa.plist \
     "/<string>/s/$ver_for_sed/$ver_string_new/"
 
diff --git a/samples/Info.plist b/samples/Info.plist
deleted file mode 100644
index bcdc6ce2d6..0000000000
--- a/samples/Info.plist
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundleGetInfoString</key>
-	<string>$(PRODUCT_NAME) version 3.1.2, (c) 2005-2018 wxWidgets</string>
-	<key>CFBundleIconFile</key>
-	<string>wxmac.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwidgets.samples.$(PRODUCT_NAME)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string>3.1.2, (c) 2005-2018 wxWidgets</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>3.1.2</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>3.1.2</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2005-2018 wxWidgets</string>
-</dict>
-</plist>

From 7fdd446cc8ad65698fa1f67ee0981dc4d00ba463 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 2 May 2018 16:01:36 +0200
Subject: [PATCH 501/916] Remove a reference to Info_carbon.plist

This file was removed in 5ba67c67e47d069f65d648ab16dfc505c5400bfc so
don't tell people to update it when changing version.
---
 docs/contributing/about-version-numbers.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/contributing/about-version-numbers.md b/docs/contributing/about-version-numbers.md
index 48c79a20db..c2dc21b184 100644
--- a/docs/contributing/about-version-numbers.md
+++ b/docs/contributing/about-version-numbers.md
@@ -27,7 +27,6 @@ Here is the list of files that need to be updated:
 	include/wx/version.h
 	include/wx/osx/config_xcode.h
 	samples/docview/Info.plist
-	samples/minimal/Info_carbon.plist
 	samples/minimal/Info_cocoa.plist
 	samples/minimal/borland_ide.cpp {major release only}
 

From 8aae3c03566938a09efbadefdf9f7a88b4369fcf Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Wed, 2 May 2018 17:47:42 +0200
Subject: [PATCH 502/916] Fix typos in code comment

---
 src/common/debugrpt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index 8e15935a8f..7102776f28 100644
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -627,7 +627,7 @@ void wxDebugReportCompress::SetCompressedFileBaseName(const wxString& name)
 
 wxFileName wxDebugReportCompress::GetSaveLocation() const
 {
-    // Use de default directoy as a basis for the save location, e.g.
+    // Use the default directory as a basis for the save location, e.g.
     // %temp%/someName becomes %temp%/someName.zip.
     wxFileName fn(GetDirectory());
     if (!m_zipDir.empty())

From 0e6b4899e01fe6054b81845ae458b3465e51b5af Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Wed, 2 May 2018 17:50:02 +0200
Subject: [PATCH 503/916] Add space around expressions in if () statements

---
 src/common/debugrpt.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index 7102776f28..7de8af56dc 100644
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -630,9 +630,9 @@ wxFileName wxDebugReportCompress::GetSaveLocation() const
     // Use the default directory as a basis for the save location, e.g.
     // %temp%/someName becomes %temp%/someName.zip.
     wxFileName fn(GetDirectory());
-    if (!m_zipDir.empty())
+    if ( !m_zipDir.empty() )
         fn.SetPath(m_zipDir);
-    if (!m_zipName.empty())
+    if ( !m_zipName.empty() )
         fn.SetName(m_zipName);
     fn.SetExt("zip");
     return fn;

From 6e093f5a84f27c5b211f2473e5e3fb1e50fe12e8 Mon Sep 17 00:00:00 2001
From: dos <doscott@doscott.ca>
Date: Wed, 2 May 2018 12:15:22 -0300
Subject: [PATCH 504/916] Add wxrc.exe to the MSVS release archives

Include wxrc.exe in the release.

Also change the way checksums are calculated due to fciv tool
limitations.

Closes #18124.

Closes https://github.com/wxWidgets/wxWidgets/pull/800
---
 build/tools/msvs/officialbuild.bat | 22 ++++++++++++++
 build/tools/msvs/package.bat       | 46 +++++++++++++-----------------
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/build/tools/msvs/officialbuild.bat b/build/tools/msvs/officialbuild.bat
index aca9161920..9cde4ac34e 100755
--- a/build/tools/msvs/officialbuild.bat
+++ b/build/tools/msvs/officialbuild.bat
@@ -109,6 +109,18 @@ nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUI
 
 if ERRORLEVEL 1 goto ERR_BUILD
 
+set build_dir=%cd%
+
+cd ..\..\utils\wxrc
+
+rmdir %compvers%_mswudll_x64 /s /q
+del %compvers%x64_Release.txt
+nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 TARGET_CPU=AMD64 >> %compvers%x64_Release.txt
+
+if ERRORLEVEL 1 goto ERR_BUILD
+
+cd %build_dir%
+
 @echo 64 bit debug build
 
 if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X64 /Debug
@@ -131,6 +143,16 @@ nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUI
 
 if ERRORLEVEL 1 goto ERR_BUILD
 
+cd ..\..\utils\wxrc
+
+rmdir %compvers%_mswuddll /s /q
+del %compvers%x86_Release.txt
+nmake -f makefile.vc BUILD=release SHARED=1 COMPILER_VERSION=%comp% OFFICIAL_BUILD=1 CPPFLAGS=/arch:SSE CFLAGS=/arch:SSE >> %compvers%x86_Release.txt
+
+cd %build_dir%
+
+if ERRORLEVEL 1 goto ERR_BUILD
+
 @echo 32 bit debug build
 
 if "%compvers%" == "vc100" call "%WINDOWS71SDK%SetEnv.Cmd" /X86 /Debug
diff --git a/build/tools/msvs/package.bat b/build/tools/msvs/package.bat
index 793e5d2765..ad827b8db9 100755
--- a/build/tools/msvs/package.bat
+++ b/build/tools/msvs/package.bat
@@ -36,6 +36,7 @@ set curr_dir1=%cd%
 cd ..\..\..
 
 mkdir %packagePath%
+mkdir %packagePath%\%VCver%
 
 set wxLibVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%
 
@@ -46,43 +47,36 @@ if "%wxMINOR_VERSION%" == "5" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%w
 if "%wxMINOR_VERSION%" == "7" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%wxRELEASE_NUMBER%
 if "%wxMINOR_VERSION%" == "9" set wxDLLVers=%wxMAJOR_VERSION%%wxMINOR_VERSION%%wxRELEASE_NUMBER%
 
-if "%1" == "sha" goto SHA
-
 rem Get rid of any files from the last run.
 
-del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z
-del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z
-del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z
-del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z
-del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z
-del %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z
+del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z
+del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z
+del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z
+del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z
+del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z
+del %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z
 
 rem Package the 32 bit files
 
-7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z lib\%VCver%_dll\mswud  lib\%VCver%_dll\mswu lib\%VCver%_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_dll\wxbase%wxDllVers%u*.dll  lib\%VCver%_dll\*.lib
-7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z lib\%VCver%_dll\wxMSW%wxDllVers%u_*.dll lib\%VCver%_dll\wxbase%wxDllVers%u_*.dll
-7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z lib\%VCver%_dll\wxMSW%wxDllVers%u_*.pdb lib\%VCver%_dll\wxbase%wxDllVers%u_*.pdb
+REM Copy wxrc.exe to the dll folder.
+copy utils\wxrc\%VCver%_mswudll\wxrc.exe lib\%VCver%_dll
+
+7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z lib\%VCver%_dll\mswud  lib\%VCver%_dll\mswu lib\%VCver%_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_dll\wxbase%wxDllVers%u*.dll  lib\%VCver%_dll\*.lib lib\%VCver%_dll\wxrc.exe
+7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z lib\%VCver%_dll\wxMSW%wxDllVers%u_*.dll lib\%VCver%_dll\wxbase%wxDllVers%u_*.dll
+7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z lib\%VCver%_dll\wxMSW%wxDllVers%u_*.pdb lib\%VCver%_dll\wxbase%wxDllVers%u_*.pdb
 
 rem Package the 64 bit files
 
-7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z lib\%VCver%_x64_dll\mswud lib\%VCver%_x64_dll\mswu lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\*.lib
-7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z lib\%VCver%_x64_dll\wxMSW%wxDllVers%u_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%u_*.dll
-7z a -t7z %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z lib\%VCver%_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%u_*.pdb
+REM Copy wxrc.exe to the dll folder.
+copy utils\wxrc\%VCver%_mswudll_x64\wxrc.exe lib\%VCver%_x64_dll
 
-del %packagePath%\%VCver%_sha1.txt
+7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z lib\%VCver%_x64_dll\mswud lib\%VCver%_x64_dll\mswu lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.pdb lib\%VCver%_x64_dll\wxMSW%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%ud_*.dll lib\%VCver%_x64_dll\*.lib  lib\%VCver%_x64_dll\wxrc.exe
+7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z lib\%VCver%_x64_dll\wxMSW%wxDllVers%u_*.dll lib\%VCver%_x64_dll\wxbase%wxDllVers%u_*.dll
+7z a -t7z %packagePath%\%VCver%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z lib\%VCver%_x64_dll\wxMSW%wxDllVers%u_*.pdb lib\%VCver%_x64_dll\wxbase%wxDllVers%u_*.pdb
 
-fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_Dev.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt
-fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleaseDLL.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt
-fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_ReleasePDB.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt
-fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_Dev.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt
-fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleaseDLL.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt
-fciv %packagePath%\wxMSW-%wxMAJOR_VERSION%.%wxMINOR_VERSION%.%wxRELEASE_NUMBER%_%VCver%_x64_ReleasePDB.7z -sha1 -wp >> %packagePath%\%VCver%_sha1.txt
+del %packagePath%\%VCver%\sha1.txt
+fciv %packagePath%\%VCver% -type *.7z -sha1 -wp >> %packagePath%\%VCver%\sha1.txt
 
-goto End
-
-:SHA
-
-fciv %packagePath% -type *.7z -sha1 -wp >> %packagePath%\sha1.txt
 
 goto End
 

From f10487f060981efe67c1d34d8edcbac5825c0fa9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 2 May 2018 22:30:58 +0200
Subject: [PATCH 505/916] Fix buffer overflow in wxMSW stack walking code

VarSizedStruct buffer had a too small size in Unicode build as it forgot
to multiply the name length by sizeof(TCHAR), resulting in overwriting
memory on the stack after it when calling SymFromAddrW().

Closes #18127.
---
 docs/changes.txt     | 1 +
 src/msw/debughlp.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 973a1fb904..85e04f4c9b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -90,6 +90,7 @@ wxMSW:
 - Fix hang after clearing wxTAB_TRAVERSAL style on a window with children.
 - Fix handling of AUX2 mouse button events (Trylz).
 - Fix saving/restoring window position for maximized windows.
+- Fix stack corruption when using wxStackWalker (srfisk).
 
 
 3.1.1: (released 2018-02-19)
diff --git a/src/msw/debughlp.cpp b/src/msw/debughlp.cpp
index a04fa47835..7aecd7f032 100644
--- a/src/msw/debughlp.cpp
+++ b/src/msw/debughlp.cpp
@@ -66,7 +66,7 @@ class VarSizedStruct
 public:
     VarSizedStruct()
     {
-        ::ZeroMemory(m_buffer, sizeof(T) + MAX_NAME_LEN);
+        ::ZeroMemory(m_buffer, sizeof(T) + MAX_NAME_LEN*sizeof(TCHAR));
 
         (*this)->SizeOfStruct = sizeof(T);
         (*this)->MaxNameLen = MAX_NAME_LEN;
@@ -87,7 +87,7 @@ private:
     // if we wanted.
     enum { MAX_NAME_LEN = 1024 };
 
-    BYTE m_buffer[sizeof(T) + MAX_NAME_LEN];
+    BYTE m_buffer[sizeof(T) + MAX_NAME_LEN*sizeof(TCHAR)];
 };
 
 } // anonymous namespace

From c2fcc14bac7910d04fd9f064136fb5cd5f6fca28 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 2 May 2018 19:12:41 -0700
Subject: [PATCH 506/916] Ensure the selection is in range.

There are some cases when in the process of closing wxAuiMDIChildFrames that this method will be called while the current selection is out of range.
---
 src/aui/tabmdi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 4d619c2a3f..c484d9b701 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -820,7 +820,7 @@ int wxAuiMDIClientWindow::SetSelection(size_t nPage)
 wxAuiMDIChildFrame* wxAuiMDIClientWindow::GetActiveChild()
 {
     const int sel = GetSelection();
-    if ( sel == wxNOT_FOUND )
+    if ( sel == wxNOT_FOUND || sel >= GetPageCount() )
         return NULL;
 
     return wxStaticCast(GetPage(sel), wxAuiMDIChildFrame);

From 41a920cf729ab02956dbe93215495460656d5784 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 5 May 2018 11:45:54 -0700
Subject: [PATCH 507/916] Improve accuracy of destination coordinates in
 generic StretchBlit() implementation

It's not possible to map the scaled integer coordinates to the exact
destination location. The inaccuracy can be (mostly) avoided by shifting
the DC origin instead. Also fixes handling of non-zero logical origin.

See #18129
---
 src/common/dcbase.cpp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 48d719cbda..6747d70f6b 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -581,15 +581,34 @@ wxDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
     double xscale = (double)srcWidth/dstWidth,
            yscale = (double)srcHeight/dstHeight;
 
+    // Shift origin to avoid imprecision of integer destination coordinates
+    const int deviceOriginX = m_deviceOriginX;
+    const int deviceOriginY = m_deviceOriginY;
+    const int deviceLocalOriginX = m_deviceLocalOriginX;
+    const int deviceLocalOriginY = m_deviceLocalOriginY;
+    const int logicalOriginX = m_logicalOriginX;
+    const int logicalOriginY = m_logicalOriginY;
+    m_deviceOriginX = LogicalToDeviceX(xdest);
+    m_deviceOriginY = LogicalToDeviceY(ydest);
+    m_deviceLocalOriginX = 0;
+    m_deviceLocalOriginY = 0;
+    m_logicalOriginX = 0;
+    m_logicalOriginY = 0;
+
     double xscaleOld, yscaleOld;
     GetUserScale(&xscaleOld, &yscaleOld);
     SetUserScale(xscaleOld/xscale, yscaleOld/yscale);
 
-    bool rc = DoBlit(wxCoord(xdest*xscale), wxCoord(ydest*yscale),
-                     wxCoord(dstWidth*xscale), wxCoord(dstHeight*yscale),
+    bool rc = DoBlit(0, 0, srcWidth, srcHeight,
                      source,
                      xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask);
 
+    m_deviceOriginX = deviceOriginX;
+    m_deviceOriginY = deviceOriginY;
+    m_deviceLocalOriginX = deviceLocalOriginX;
+    m_deviceLocalOriginY = deviceLocalOriginY;
+    m_logicalOriginX = logicalOriginX;
+    m_logicalOriginY = logicalOriginY;
     SetUserScale(xscaleOld, yscaleOld);
 
     return rc;

From 1680c2828447938c1fae48d36f8a052f215d2721 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 7 May 2018 13:44:15 +0200
Subject: [PATCH 508/916] Fix alignment for multiline buttons using custom
 colours in wxMSW

Owner-drawn buttons with multiline labels were always centered.

Fix this by handling their alignment explicitly when drawing them, as
::DrawText() doesn't do it for multiline strings.

Closes #18131.
---
 docs/changes.txt      |  1 +
 src/msw/anybutton.cpp | 44 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 29956046fc..e6551fa719 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -92,6 +92,7 @@ wxMSW:
 - Fix saving/restoring window position for maximized windows.
 - Fix stack corruption when using wxStackWalker (srfisk).
 - Fix positioning windows at positions >= SHORT_MAX (Cătălin Răceanu).
+- Honour alignment flags for multiline buttons using custom colours too.
 
 
 3.1.1: (released 2018-02-19)
diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp
index 2202432834..85a7a79062 100644
--- a/src/msw/anybutton.cpp
+++ b/src/msw/anybutton.cpp
@@ -930,21 +930,51 @@ void DrawButtonText(HDC hdc,
         {
             // draw multiline label
 
-            // center text horizontally in any case
-            flags |= DT_CENTER;
-
             // first we need to compute its bounding rect
             RECT rc;
             ::CopyRect(&rc, pRect);
             ::DrawText(hdc, text.t_str(), text.length(), &rc,
-                       DT_CENTER | DT_CALCRECT);
+                       flags | DT_CALCRECT);
 
-            // now center this rect inside the entire button area
+            // now position this rect inside the entire button area: notice
+            // that DrawText() doesn't respect alignment flags for multiline
+            // text, which is why we have to do it on our own (but still use
+            // the horizontal alignment flags for the individual lines to be
+            // aligned correctly)
             const LONG w = rc.right - rc.left;
             const LONG h = rc.bottom - rc.top;
-            rc.left = pRect->left + (pRect->right - pRect->left)/2 - w/2;
+
+            if ( btn->HasFlag(wxBU_RIGHT) )
+            {
+                rc.left = pRect->right - w;
+
+                flags |= DT_RIGHT;
+            }
+            else if ( !btn->HasFlag(wxBU_LEFT) )
+            {
+                rc.left = pRect->left + (pRect->right - pRect->left)/2 - w/2;
+
+                flags |= DT_CENTER;
+            }
+            else // wxBU_LEFT
+            {
+                rc.left = pRect->left;
+            }
+
+            if ( btn->HasFlag(wxBU_BOTTOM) )
+            {
+                rc.top = pRect->bottom - h;
+            }
+            else if ( !btn->HasFlag(wxBU_TOP) )
+            {
+                rc.top = pRect->top + (pRect->bottom - pRect->top)/2 - h/2;
+            }
+            else // wxBU_TOP
+            {
+                rc.top = pRect->top;
+            }
+
             rc.right = rc.left+w;
-            rc.top = pRect->top + (pRect->bottom - pRect->top)/2 - h/2;
             rc.bottom = rc.top+h;
 
             ::DrawText(hdc, text.t_str(), text.length(), &rc, flags);

From 9caa3d5d8e279a6420f040c756239bcd31a0dde7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 8 May 2018 01:11:55 +0200
Subject: [PATCH 509/916] Fix dispatching pending events in console
 applications under Mac

Apply parts of the changes of 34c5aaa7693b073617264bd2a5393cad18cfc300
done in the common code to Mac-specific wxCFEventLoop too.

This is not ideal as we really should reuse the same common code here,
but for now it's better than nothing as previously pending events were
just not dispatched at all in console Mac applications, meaning that
CallAfter() from worker threads never executed.
---
 docs/changes.txt            |  4 ++++
 src/osx/core/evtloop_cf.cpp | 27 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index e6551fa719..cb5d94e75b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -94,6 +94,10 @@ wxMSW:
 - Fix positioning windows at positions >= SHORT_MAX (Cătălin Răceanu).
 - Honour alignment flags for multiline buttons using custom colours too.
 
+wxOSX:
+
+- Fix dispatching pending events (and CallAfter()) in console applications.
+
 
 3.1.1: (released 2018-02-19)
 ----------------------------
diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 4bdce90f1e..30fe4e39be 100644
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -283,6 +283,33 @@ void wxCFEventLoop::OSXDoRun()
 
             break;
         }
+
+        // Process the remaining queued messages, both at the level of the
+        // underlying toolkit level (Pending/Dispatch()) and wx level
+        // (Has/ProcessPendingEvents()).
+        //
+        // We do run the risk of never exiting this loop if pending event
+        // handlers endlessly generate new events but they shouldn't do
+        // this in a well-behaved program and we shouldn't just discard the
+        // events we already have, they might be important.
+        for ( ;; )
+        {
+            bool hasMoreEvents = false;
+            if ( wxTheApp && wxTheApp->HasPendingEvents() )
+            {
+                wxTheApp->ProcessPendingEvents();
+                hasMoreEvents = true;
+            }
+
+            if ( Pending() )
+            {
+                Dispatch();
+                hasMoreEvents = true;
+            }
+
+            if ( !hasMoreEvents )
+                break;
+        }
     }
 }
 

From e3e4a884230d3989e152a7e58e20b250527c1dac Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 8 May 2018 23:57:53 +0200
Subject: [PATCH 510/916] Correct the return value of
 wxDataViewTreeCtrl::GetNthChild()

Wrong pointer was used to initialize wxDataViewItem (apparently since
always, i.e. this function could never have been used successfully...).

Closes #18132.
---
 src/common/datavcmn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index d2d253ca2d..4418351686 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -2619,7 +2619,7 @@ wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, u
 
     wxDataViewTreeStoreNode* const node = parent_node->GetChildren()[pos];
     if (node)
-        return wxDataViewItem(node->GetData());
+        return node->GetItem();
 
     return wxDataViewItem(0);
 }

From e2609f3c214398b53bc3bd3a218928588e074501 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 9 May 2018 00:45:30 +0200
Subject: [PATCH 511/916] Fix recently broken infinite event loop under Mac

Changes of 9caa3d5d8e279a6420f040c756239bcd31a0dde7 resulted in never
exiting modal event loops as wxCFEventLoop::Pending() always returns
true. While this is certainly wrong on its own, for now just avoid using
it and check the return value of Dispatch() instead to allow the modal
event loops to terminate again.
---
 src/osx/core/evtloop_cf.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 30fe4e39be..da8befe126 100644
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -301,9 +301,8 @@ void wxCFEventLoop::OSXDoRun()
                 hasMoreEvents = true;
             }
 
-            if ( Pending() )
+            if ( Dispatch() )
             {
-                Dispatch();
                 hasMoreEvents = true;
             }
 

From 69e33a6657f40d8b36cf81c1e77458d09e4d541e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 9 May 2018 02:38:30 +0200
Subject: [PATCH 512/916] Yet another fix for not existing event loop under Mac

The previous commit fixed never exiting the event loop in GUI Mac modal
loops but at the price of breaking it for Mac console applications as
Dispatch() never returns for them if there are no more events.

Finally, just don't call Dispatch() at all here, just as it wasn't done
until 9caa3d5d8e279a6420f040c756239bcd31a0dde7 and keep only the changes
sufficient for dispatching the pending events and making CallAfter()
work in console applications.
---
 src/osx/core/evtloop_cf.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index da8befe126..c724b44a5c 100644
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -301,11 +301,6 @@ void wxCFEventLoop::OSXDoRun()
                 hasMoreEvents = true;
             }
 
-            if ( Dispatch() )
-            {
-                hasMoreEvents = true;
-            }
-
             if ( !hasMoreEvents )
                 break;
         }

From 220200ce071a38f5e1b50394bd7a10a87d7a1552 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 11 May 2018 10:13:35 -0700
Subject: [PATCH 513/916] Add missing break statement

---
 src/common/lzmastream.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/lzmastream.cpp b/src/common/lzmastream.cpp
index 7c4c62a335..450d8e3f4a 100644
--- a/src/common/lzmastream.cpp
+++ b/src/common/lzmastream.cpp
@@ -343,6 +343,7 @@ bool wxLZMAOutputStream::DoFlush(bool finish)
 
             case LZMA_MEM_ERROR:
                 err = wxTRANSLATE("out of memory");
+                break;
 
             default:
                 err = wxTRANSLATE("unknown compression error");

From 9bfa890480caa9bdfd7161b9f08914a7b0f81af4 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 11 May 2018 10:16:49 -0700
Subject: [PATCH 514/916] Build fixes for __WXUNIVERSAL__==1

---
 include/wx/gtk/private/addremovectrl.h |  2 +-
 src/gtk/window.cpp                     | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/wx/gtk/private/addremovectrl.h b/include/wx/gtk/private/addremovectrl.h
index 5644801b6e..bce4061df5 100644
--- a/include/wx/gtk/private/addremovectrl.h
+++ b/include/wx/gtk/private/addremovectrl.h
@@ -32,7 +32,7 @@ public:
         m_tbar->AddTool(wxID_ADD, wxString(), GetNamedBitmap("list-add"));
         m_tbar->AddTool(wxID_REMOVE, wxString(), GetNamedBitmap("list-remove"));
 
-#ifdef __WXGTK3__
+#if defined(__WXGTK3__) && !defined(__WXUNIVERSAL__)
         // Tweak the toolbar appearance to correspond to how the toolbars used
         // in other GNOME applications for similar purposes look.
         GtkToolbar* const toolbar = m_tbar->GTKGetToolbar();
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index e9397a2e42..b2700cb280 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -249,7 +249,7 @@ public:
     // This class has rather unusual "resurrectable" semantics: it is
     // initialized by the ctor as usual, but may then be uninitialized by
     // calling Free() and re-initialized again by calling Reinit().
-    wxWindowGesturesData(wxWindow* win, GtkWidget *widget, int eventsMask)
+    wxWindowGesturesData(wxWindowGTK* win, GtkWidget *widget, int eventsMask)
     {
         Reinit(win, widget, eventsMask);
     }
@@ -259,7 +259,7 @@ public:
         Free();
     }
 
-    void Reinit(wxWindow* win, GtkWidget *widget, int eventsMask);
+    void Reinit(wxWindowGTK* win, GtkWidget *widget, int eventsMask);
     void Free();
 
     unsigned int         m_touchCount;
@@ -2727,7 +2727,7 @@ wxWindowGTK::~wxWindowGTK()
 #endif
 
 #ifdef wxGTK_HAS_GESTURES_SUPPORT
-    wxWindowGestures::EraseForObject(this);
+    wxWindowGestures::EraseForObject(static_cast<wxWindow*>(this));
 #endif // wxGTK_HAS_GESTURES_SUPPORT
 
     if (m_widget)
@@ -2959,7 +2959,7 @@ pan_gesture_begin_callback(GtkGesture* WXUNUSED(gesture), GdkEventSequence* WXUN
 }
 
 static void
-horizontal_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* sequence, wxWindowGTK* win)
+horizontal_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* sequence, wxWindow* win)
 {
     wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
     if ( !data )
@@ -2990,7 +2990,7 @@ horizontal_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* seque
 }
 
 static void
-vertical_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* sequence, wxWindowGTK* win)
+vertical_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* sequence, wxWindow* win)
 {
     wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
     if ( !data )
@@ -3021,7 +3021,7 @@ vertical_pan_gesture_end_callback(GtkGesture* gesture, GdkEventSequence* sequenc
 }
 
 static void
-pan_gesture_callback(GtkGesture* gesture, GtkPanDirection direction, gdouble offset, wxWindowGTK* win)
+pan_gesture_callback(GtkGesture* gesture, GtkPanDirection direction, gdouble offset, wxWindow* win)
 {
     // The function that retrieves the GdkEventSequence (which will further be used to get the gesture point)
     // should be called only when the gestrure is active
@@ -3093,7 +3093,7 @@ pan_gesture_callback(GtkGesture* gesture, GtkPanDirection direction, gdouble off
 }
 
 static void
-zoom_gesture_callback(GtkGesture* gesture, gdouble scale, wxWindowGTK* win)
+zoom_gesture_callback(GtkGesture* gesture, gdouble scale, wxWindow* win)
 {
     gdouble x, y;
 
@@ -3242,7 +3242,7 @@ long_press_gesture_callback(GtkGesture* WXUNUSED(gesture), gdouble x, gdouble y,
 }
 
 static void
-wxEmitTwoFingerTapEvent(GdkEventTouch* gdk_event, wxWindowGTK* win)
+wxEmitTwoFingerTapEvent(GdkEventTouch* gdk_event, wxWindow* win)
 {
     wxTwoFingerTapEvent event(win->GetId());
 
@@ -3273,7 +3273,7 @@ wxEmitTwoFingerTapEvent(GdkEventTouch* gdk_event, wxWindowGTK* win)
 }
 
 static void
-wxEmitPressAndTapEvent(GdkEventTouch* gdk_event, wxWindowGTK* win)
+wxEmitPressAndTapEvent(GdkEventTouch* gdk_event, wxWindow* win)
 {
     wxPressAndTapEvent event(win->GetId());
 
@@ -3309,7 +3309,7 @@ wxEmitPressAndTapEvent(GdkEventTouch* gdk_event, wxWindowGTK* win)
 }
 
 static void
-touch_callback(GtkWidget* WXUNUSED(widget), GdkEventTouch* gdk_event, wxWindowGTK* win)
+touch_callback(GtkWidget* WXUNUSED(widget), GdkEventTouch* gdk_event, wxWindow* win)
 {
     wxWindowGesturesData* const data = wxWindowGestures::FromObject(win);
     if ( !data )
@@ -3574,7 +3574,7 @@ bool wxWindowGTK::EnableTouchEvents(int eventsMask)
     // Check if gestures support is also available during run-time.
     if ( gtk_check_version(3, 14, 0) == NULL )
     {
-        wxWindowGesturesData* const dataOld = wxWindowGestures::FromObject(this);
+        wxWindowGesturesData* const dataOld = wxWindowGestures::FromObject(static_cast<wxWindow*>(this));
 
         if ( eventsMask == wxTOUCH_NONE )
         {
@@ -3596,7 +3596,7 @@ bool wxWindowGTK::EnableTouchEvents(int eventsMask)
             {
                 wxWindowGesturesData* const
                     dataNew = new wxWindowGesturesData(this, widget, eventsMask);
-                wxWindowGestures::StoreForObject(this, dataNew);
+                wxWindowGestures::StoreForObject(static_cast<wxWindow*>(this), dataNew);
             }
         }
 
@@ -4377,7 +4377,7 @@ bool wxWindowGTK::GTKHandleFocusIn()
 
     wxFocusEvent eventFocus(wxEVT_SET_FOCUS, GetId());
     eventFocus.SetEventObject(this);
-    eventFocus.SetWindow(gs_lastFocus);
+    eventFocus.SetWindow(static_cast<wxWindow*>(gs_lastFocus));
     gs_lastFocus = this;
 
     GTKProcessEvent(eventFocus);

From b3d7a631c0d3ce4dc0d686129ed65730628c43df Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 11 May 2018 10:19:47 -0700
Subject: [PATCH 515/916] More use of wxFALLTHROUGH

---
 src/univ/checkbox.cpp | 1 +
 src/univ/scrolbar.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp
index 3ebe735450..5a77df5c99 100644
--- a/src/univ/checkbox.cpp
+++ b/src/univ/checkbox.cpp
@@ -216,6 +216,7 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
         case wxCHK_UNCHECKED:    status = Status_Unchecked;   break;
         case wxCHK_CHECKED:      status = Status_Checked; break;
         default:                 wxFAIL_MSG(wxT("Unknown checkbox state"));
+        wxFALLTHROUGH;
         case wxCHK_UNDETERMINED: status = Status_3rdState;  break;
     }
     if ( status != m_status )
diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 0590b21f91..61da0cf772 100644
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -1033,7 +1033,7 @@ bool wxStdScrollBarInputHandler::HandleMouse(wxInputConsumer *consumer,
                         consumer->PerformAction(wxACTION_SCROLL_THUMB_DRAG);
                         m_ofsMouse = GetMouseCoord(scrollbar, event) -
                                      scrollbar->ScrollbarToPixel();
-
+                        wxFALLTHROUGH;
                         // fall through: there is no immediate action
 
                     default:

From ff215a4349083dc5e5f81e67e72d4681782830cd Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 11 May 2018 10:22:12 -0700
Subject: [PATCH 516/916] Use wxString::empty() instead of comparing to
 wxEmptyString

---
 src/generic/grideditors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generic/grideditors.cpp b/src/generic/grideditors.cpp
index 4cc103ca73..0fd043ad10 100644
--- a/src/generic/grideditors.cpp
+++ b/src/generic/grideditors.cpp
@@ -183,7 +183,7 @@ void wxGridCellEditorEvtHandler::OnChar(wxKeyEvent& event)
 
             int textWidth = 0;
             wxString value = m_grid->GetCellValue(row, col);
-            if ( wxEmptyString != value )
+            if (!value.empty())
             {
                 // get width of cell CONTENTS (text)
                 int y;

From 7d039a2e0b07daec906d67012030ac4f427fd303 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 11 May 2018 10:47:21 -0700
Subject: [PATCH 517/916] Fix potential memory leak

See #15991
---
 src/richtext/richtextbuffer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index e18b39c433..70d37ef6d5 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -8317,6 +8317,8 @@ bool wxRichTextBuffer::SubmitAction(wxRichTextAction* action)
         {
             GetCommandProcessor()->Store(cmd); // Just store it, without Do()ing anything
         }
+        else
+            delete cmd;
     }
 
     return true;

From 98cd5a6b20dba44c35d1d4c7031091f31998bdbb Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 11 May 2018 10:52:56 -0700
Subject: [PATCH 518/916] Use wxString::clear() instead of assignment to
 wxEmptyString

---
 src/generic/datavgen.cpp           |  2 +-
 src/generic/dirctrlg.cpp           |  2 +-
 src/generic/filectrlg.cpp          |  4 ++--
 src/generic/filedlgg.cpp           |  2 +-
 src/generic/grid.cpp               |  2 +-
 src/generic/helpext.cpp            |  2 +-
 src/generic/odcombo.cpp            |  8 ++++----
 src/html/m_tables.cpp              |  3 ++-
 src/osx/carbon/fontdlg.cpp         |  2 +-
 src/osx/cocoa/dataview.mm          |  2 +-
 src/osx/cocoa/dirdlg.mm            |  2 +-
 src/osx/cocoa/filedlg.mm           |  2 +-
 src/osx/core/mimetype.cpp          |  4 ++--
 src/richtext/richtextbuffer.cpp    |  8 ++++----
 src/richtext/richtextprint.cpp     |  2 +-
 src/richtext/richtextsymboldlg.cpp | 10 +++-------
 src/richtext/richtextxml.cpp       |  2 +-
 src/stc/ScintillaWX.cpp            |  4 ++--
 18 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 54d745f6cf..bc4ed646ef 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -6412,7 +6412,7 @@ wxAccStatus wxDataViewCtrlAccessible::GetHelpText(int childId, wxString* helpTex
         }
         else
         {
-            *helpText = wxEmptyString;
+            helpText->clear();
         }
     }
     return wxACC_OK;
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 2080009ac1..84ceb8b97d 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -465,7 +465,7 @@ void wxGenericDirCtrl::Init()
 {
     m_showHidden = false;
     m_currentFilter = 0;
-    m_currentFilterStr = wxEmptyString; // Default: any file
+    m_currentFilterStr.clear(); // Default: any file
     m_treeCtrl = NULL;
     m_filterListCtrl = NULL;
 }
diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index 49578fa811..711397fe2d 100644
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -674,7 +674,7 @@ void wxFileListCtrl::GoToParentDir()
         if (!m_dirName.empty())
         {
             if (m_dirName.Last() == wxT('.'))
-                m_dirName = wxEmptyString;
+                m_dirName.clear();
         }
 #elif defined(__UNIX__)
         if (m_dirName.empty())
@@ -927,7 +927,7 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
     if ( ( len > 1 ) && ( wxEndsWithPathSeparator( m_dir ) ) )
         m_dir.Remove( len - 1, 1 );
 
-    m_filterExtension = wxEmptyString;
+    m_filterExtension.clear();
 
     // layout
 
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index db1557bace..48c746a3a9 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -187,7 +187,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
     if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))
         m_dir.Remove( len-1, 1 );
 
-    m_filterExtension = wxEmptyString;
+    m_filterExtension.clear();
 
     // layout
 
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 083d1e0d34..5a8831f792 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1311,7 +1311,7 @@ void wxGridStringTable::Clear()
         {
             for ( col = 0; col < numCols; col++ )
             {
-                m_data[row][col] = wxEmptyString;
+                m_data[row][col].clear();
             }
         }
     }
diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index f4e769eb27..a8070ef340 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -422,7 +422,7 @@ bool wxExtHelpController::KeywordSearch(const wxString& k,
                 // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR));
                 //if (choices[idx].empty()) // didn't contain the ';'
                 //   choices[idx] = (**i).doc;
-                choices[idx] = wxEmptyString;
+                choices[idx].clear();
                 for (int j=0; ; j++)
                 {
                     wxChar targetChar = entry->doc.c_str()[j];
diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index d77833bb16..4f144bb751 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -68,7 +68,7 @@ void wxVListBoxComboPopup::Init()
     m_value = -1;
     m_itemHover = -1;
     m_clientDataItemsType = wxClientData_None;
-    m_partialCompletionString = wxEmptyString;
+    m_partialCompletionString.clear();
 }
 
 bool wxVListBoxComboPopup::Create(wxWindow* parent)
@@ -224,7 +224,7 @@ void wxVListBoxComboPopup::DismissWithEvent()
     if ( selection != wxNOT_FOUND )
         m_stringValue = m_strings[selection];
     else
-        m_stringValue = wxEmptyString;
+        m_stringValue.clear();
 
     if ( m_stringValue != m_combo->GetValue() )
         m_combo->SetValueByUser(m_stringValue);
@@ -388,7 +388,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar
 // stop partial completion
 void wxVListBoxComboPopup::StopPartialCompletion()
 {
-    m_partialCompletionString = wxEmptyString;
+    m_partialCompletionString.clear();
 #if wxUSE_TIMER
     m_partialCompletionTimer.Stop();
 #endif // wxUSE_TIMER
@@ -685,7 +685,7 @@ void wxVListBoxComboPopup::SetSelection( int item )
     if ( item >= 0 )
         m_stringValue = m_strings[item];
     else
-        m_stringValue = wxEmptyString;
+        m_stringValue.clear();
 
     if ( IsCreated() )
         wxVListBox::SetSelection(item);
diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 779e811200..d464b4e4ac 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -714,7 +714,8 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
     {
         m_Table = NULL;
         m_enclosingContainer = NULL;
-        m_tAlign = m_rAlign = wxEmptyString;
+        m_tAlign.clear();
+        m_rAlign.clear();
     }
 
 
diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp
index 0ed0a2651d..a6dadb57ef 100644
--- a/src/osx/carbon/fontdlg.cpp
+++ b/src/osx/carbon/fontdlg.cpp
@@ -587,7 +587,7 @@ void wxFontDialog::ChangeFont()
 
     wxFontFamily family = FontFamilyStringToInt(facename);
     if (family != wxFONTFAMILY_DEFAULT)
-        facename = wxEmptyString;
+        facename.clear();
 
     m_dialogFont = wxFontInfo(size)
                     .Family(family).FaceName(facename)
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index abaf02276d..9428747a3c 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -3453,7 +3453,7 @@ void wxDataViewColumn::SetBitmap(const wxBitmap& bitmap)
 {
     // bitmaps and titles cannot exist at the same time - if the bitmap is set
     // the title is removed:
-    m_title = wxEmptyString;
+    m_title.clear();
     wxDataViewColumnBase::SetBitmap(bitmap);
     [[m_NativeDataPtr->GetNativeColumnPtr() headerCell] setImage:bitmap.GetNSImage()];
 }
diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index c6a4dc9139..f9ae000edb 100644
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -113,7 +113,7 @@ int wxDirDialog::ShowModal()
 
     wxCFStringRef dir( m_path );
 
-    m_path = wxEmptyString;
+    m_path.clear();
 
     int returnCode = -1;
 
diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index 634df40c0c..d6635e6137 100644
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -494,7 +494,7 @@ int wxFileDialog::ShowModal()
     wxCFStringRef dir( m_dir );
     wxCFStringRef file( m_fileName );
 
-    m_path = wxEmptyString;
+    m_path.clear();
     m_fileNames.Clear();
     m_paths.Clear();
 
diff --git a/src/osx/core/mimetype.cpp b/src/osx/core/mimetype.cpp
index dce5997464..afc4562694 100644
--- a/src/osx/core/mimetype.cpp
+++ b/src/osx/core/mimetype.cpp
@@ -540,7 +540,7 @@ bool wxMimeTypesManagerImpl::GetMimeType(const wxString& uti, wxString *mimeType
 
     if( itr == m_utiMap.end() || itr->second.mimeTypes.GetCount() < 1 )
     {
-        *mimeType = wxEmptyString;
+        mimeType->clear();
         return false;
     }
 
@@ -582,7 +582,7 @@ bool wxMimeTypesManagerImpl::GetDescription(const wxString& uti, wxString *desc)
 
     if( itr == m_utiMap.end() || itr->second.description.empty() )
     {
-        *desc = wxEmptyString;
+        desc->clear();
         return false;
     }
 
diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 70d37ef6d5..0b6c1e2843 100644
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -2815,7 +2815,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
                 AppendChild(para);
 
                 lastPara = para;
-                line = wxEmptyString;
+                line.clear();
             }
         }
         else
@@ -4757,7 +4757,7 @@ bool wxRichTextParagraphLayoutBox::FindNextParagraphNumber(wxRichTextParagraph*
                         text = text.Mid(0, text.Length() - pos - 1);
                     }
                     else
-                        text = wxEmptyString;
+                        text.clear();
                     if (!text.IsEmpty())
                         text += wxT(".");
                     text += wxString::Format(wxT("%d"), nextNumber);
@@ -6297,7 +6297,7 @@ wxRichTextObject* wxRichTextParagraph::FindObjectAtPosition(long position)
 /// The resulting string may be shorter than the range given.
 bool wxRichTextParagraph::GetContiguousPlainText(wxString& text, const wxRichTextRange& range, bool fromStart)
 {
-    text = wxEmptyString;
+    text.clear();
 
     if (fromStart)
     {
@@ -13623,7 +13623,7 @@ void wxTextBoxAttr::Reset()
     m_whitespaceMode = wxTEXT_BOX_ATTR_WHITESPACE_NONE;
     m_collapseMode = wxTEXT_BOX_ATTR_COLLAPSE_NONE;
     m_verticalAlignment = wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_NONE;
-    m_boxStyleName = wxEmptyString;
+    m_boxStyleName.clear();
 
     m_margins.Reset();
     m_padding.Reset();
diff --git a/src/richtext/richtextprint.cpp b/src/richtext/richtextprint.cpp
index f89791b301..601f9d6862 100644
--- a/src/richtext/richtextprint.cpp
+++ b/src/richtext/richtextprint.cpp
@@ -744,7 +744,7 @@ void wxRichTextHeaderFooterData::Clear()
 {
     int i;
     for (i = 0; i < 12; i++)
-        m_text[i] = wxEmptyString;
+        m_text[i].clear();
 }
 
 #endif // wxUSE_RICHTEXT & wxUSE_PRINTING_ARCHITECTURE
diff --git a/src/richtext/richtextsymboldlg.cpp b/src/richtext/richtextsymboldlg.cpp
index 4fd387243f..57512df37a 100644
--- a/src/richtext/richtextsymboldlg.cpp
+++ b/src/richtext/richtextsymboldlg.cpp
@@ -605,7 +605,7 @@ void wxSymbolPickerDialog::ShowAtSubset()
 void wxSymbolPickerDialog::OnFontCtrlSelected( wxCommandEvent& WXUNUSED(event) )
 {
     if (m_fontCtrl->GetSelection() == 0)
-        m_fontName = wxEmptyString;
+        m_fontName.clear();
     else
         m_fontName = m_fontCtrl->GetStringSelection();
 
@@ -619,13 +619,9 @@ void wxSymbolPickerDialog::OnSymbolSelected( wxCommandEvent& event )
         return;
 
     int sel = event.GetSelection();
-    if (sel == wxNOT_FOUND)
-        m_symbol = wxEmptyString;
-    else
-    {
-        m_symbol = wxEmptyString;
+    m_symbol.clear();
+    if (sel != wxNOT_FOUND)
         m_symbol << (wxChar) sel;
-    }
 
 #if defined(__UNICODE__)
     if (sel != -1 && m_fromUnicode)
diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index d470d693e6..1e49dfa71a 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -1083,7 +1083,7 @@ void wxRichTextXMLHelper::Clear()
     m_convMem = NULL;
     m_deleteConvFile = false;
 #endif
-    m_fileEncoding = wxEmptyString;
+    m_fileEncoding.clear();
 }
 
 void wxRichTextXMLHelper::SetupForSaving(const wxString& enc)
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index b7e33cda26..3a9f543220 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -548,8 +548,8 @@ void ScintillaWX::Paste() {
 
 #if wxUSE_UNICODE
         // free up the old character buffer in case the text is real big
-        data.SetText(wxEmptyString);
-        text = wxEmptyString;
+        text.clear();
+        data.SetText(text);
 #endif
         const size_t len = buf.length();
         SelectionPosition selStart = sel.IsRectangular() ?

From 232d123f8de6698ae93421237070625b2eb4f1c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bron?= <frederic.bron@m4x.org>
Date: Thu, 3 May 2018 16:21:48 +0200
Subject: [PATCH 519/916] Remove the separator static line in
 wxGenericCollapsiblePane

The horizontal static line was added to separate the button from the
child window when visible, but this didn't seem very useful and looked
bad and was inconsistent with the native GTK+ implementation as well as
similar controls commonly used under MSW (wxOSX already disabled the
static line use).

Just remove it to make things simpler and better looking.

Closes https://github.com/wxWidgets/wxWidgets/pull/804
---
 include/wx/generic/collpaneg.h |  2 --
 src/generic/collpaneg.cpp      | 19 -------------------
 2 files changed, 21 deletions(-)

diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 7b14cc1b0e..27f1e87a75 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -13,7 +13,6 @@
 
 // forward declared
 class WXDLLIMPEXP_FWD_CORE wxCollapsibleHeaderCtrl;
-class WXDLLIMPEXP_FWD_CORE wxStaticLine;
 
 #include "wx/containr.h"
 
@@ -80,7 +79,6 @@ protected:
 
     // child controls
     wxCollapsibleHeaderCtrl *m_pButton;
-    wxStaticLine *m_pStaticLine;
     wxWindow *m_pPane;
     wxSizer *m_sz;
 
diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 886b4ab9cf..6a7a17af4d 100644
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -32,7 +32,6 @@
     #include "wx/panel.h"
 #endif // !WX_PRECOMP
 
-#include "wx/statline.h"
 #include "wx/collheaderctrl.h"
 
 // ----------------------------------------------------------------------------
@@ -62,7 +61,6 @@ void wxGenericCollapsiblePane::Init()
 {
     m_pButton = NULL;
     m_pPane = NULL;
-    m_pStaticLine = NULL;
     m_sz = NULL;
 }
 
@@ -89,12 +87,6 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
     // on other platforms we put the static line and the button horizontally
     m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder());
 
-#if !defined( __WXMAC__ ) || defined(__WXUNIVERSAL__)
-    m_pStaticLine = new wxStaticLine(this, wxID_ANY);
-    m_sz->Add(m_pStaticLine, 0, wxEXPAND, GetBorder());
-    m_pStaticLine->Hide();
-#endif
-
     // FIXME: at least under wxGTK1 the background is black if we don't do
     //        this, no idea why...
 #if defined(__WXGTK__)
@@ -116,9 +108,6 @@ wxGenericCollapsiblePane::~wxGenericCollapsiblePane()
     if (m_pButton)
         m_pButton->SetContainingSizer(NULL);
 
-    if (m_pStaticLine)
-        m_pStaticLine->SetContainingSizer(NULL);
-
     // our sizer is not deleted automatically since we didn't use SetSizer()!
     wxDELETE(m_sz);
 }
@@ -182,9 +171,6 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
     // update button
     // NB: this must be done after updating our "state"
     m_pButton->SetCollapsed(collapse);
-    if ( m_pStaticLine )
-        m_pStaticLine->Show(!collapse);
-
 
     OnStateChange(GetBestSize());
 }
@@ -204,13 +190,8 @@ wxString wxGenericCollapsiblePane::GetLabel() const
 
 bool wxGenericCollapsiblePane::Layout()
 {
-#ifdef __WXMAC__
     if (!m_pButton || !m_pPane || !m_sz)
         return false;     // we need to complete the creation first!
-#else
-    if (!m_pButton || !m_pStaticLine || !m_pPane || !m_sz)
-        return false;     // we need to complete the creation first!
-#endif
 
     wxSize oursz(GetSize());
 

From f53923dd313ce55baf976e9d8a572323004f9a54 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 5 May 2018 14:56:37 +0200
Subject: [PATCH 520/916] Left-align wxSpinCtrl contents by default

The default alignment of the text in wxSpinCtrl was changed to "right"
in 7e4952db837344e369ff9ccc7ece1f7b8c207cf1, which added alignment
support (see #10621), but this made it inconsistent with the native
up-down control under MSW and, perhaps more importantly, with spin
controls created from XRC as the default style was never modified there
and did not include wxALIGN_RIGHT.

Resolve this inconsistency by reverting to left-aligning the text by
default.
---
 docs/changes.txt              |  1 +
 include/wx/generic/spinctlg.h | 12 ++++++------
 include/wx/gtk/spinctrl.h     |  8 ++++----
 include/wx/msw/spinctrl.h     |  4 ++--
 include/wx/qt/spinctrl.h      |  8 ++++----
 interface/wx/spinctrl.h       | 10 +++++-----
 src/xrc/xh_spin.cpp           |  6 +++---
 7 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index cb5d94e75b..daa8c0c192 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -80,6 +80,7 @@ All (GUI):
 
 - Improve stock items consistency and aesthetics (dhowland).
 - Fix bug with missing items in overflowing AUI toolbar (Maarten Bent).
+- Revert to left-aligning wxSpinCtrl contents by default.
 
 wxGTK:
 
diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 5651c81ee9..7f5b5de50a 100644
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -52,7 +52,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
                 const wxString& name = wxT("wxSpinCtrl"));
@@ -192,7 +192,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
                 const wxString& name = wxT("wxSpinCtrl"))
@@ -288,7 +288,7 @@ public:
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxT("wxSpinCtrl"))
     {
@@ -302,7 +302,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxString& name = wxT("wxSpinCtrl"))
     {
@@ -359,7 +359,7 @@ public:
                      const wxString& value = wxEmptyString,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
-                     long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                     long style = wxSP_ARROW_KEYS,
                      double min = 0, double max = 100, double initial = 0,
                      double inc = 1,
                      const wxString& name = wxT("wxSpinCtrlDouble"))
@@ -375,7 +375,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
                 const wxString& name = wxT("wxSpinCtrlDouble"))
diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index 4972737cf2..be7e1013eb 100644
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -97,7 +97,7 @@ public:
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxS("wxSpinCtrl"))
     {
@@ -111,7 +111,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxString& name = wxS("wxSpinCtrl"))
     {
@@ -159,7 +159,7 @@ public:
                      const wxString& value = wxEmptyString,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
-                     long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                     long style = wxSP_ARROW_KEYS,
                      double min = 0, double max = 100, double initial = 0,
                      double inc = 1,
                      const wxString& name = wxS("wxSpinCtrlDouble"))
@@ -173,7 +173,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
                 const wxString& name = wxS("wxSpinCtrlDouble"))
diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index a85b215ce0..85363bf57d 100644
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -36,7 +36,7 @@ public:
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxT("wxSpinCtrl"))
     {
@@ -50,7 +50,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxString& name = wxT("wxSpinCtrl"));
 
diff --git a/include/wx/qt/spinctrl.h b/include/wx/qt/spinctrl.h
index f6cf3df2d1..714dc5982b 100644
--- a/include/wx/qt/spinctrl.h
+++ b/include/wx/qt/spinctrl.h
@@ -61,7 +61,7 @@ public:
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxT("wxSpinCtrl"));
 
@@ -70,7 +70,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxString& name = wxT("wxSpinCtrl"));
     virtual int GetBase() const wxOVERRIDE { return m_base; }
@@ -97,7 +97,7 @@ public:
                      const wxString& value = wxEmptyString,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
-                     long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                     long style = wxSP_ARROW_KEYS,
                      double min = 0, double max = 100, double initial = 0,
                      double inc = 1,
                      const wxString& name = wxT("wxSpinCtrlDouble"));
@@ -107,7 +107,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
                 const wxString& name = wxT("wxSpinCtrlDouble"));
diff --git a/interface/wx/spinctrl.h b/interface/wx/spinctrl.h
index ca43744bbd..f06b9b1dd7 100644
--- a/interface/wx/spinctrl.h
+++ b/interface/wx/spinctrl.h
@@ -21,12 +21,12 @@
         for dialog navigation (e.g. activating the default button in the
         dialog) under MSW.
     @style{wxALIGN_LEFT}
-        Same as wxTE_LEFT for wxTextCtrl: the text is left aligned.
+        Same as wxTE_LEFT for wxTextCtrl: the text is left aligned (this is the
+        default).
     @style{wxALIGN_CENTRE_HORIZONTAL}
         Same as wxTE_CENTRE for wxTextCtrl: the text is centered.
     @style{wxALIGN_RIGHT}
-        Same as wxTE_RIGHT for wxTextCtrl: the text is right aligned (this is
-        the default).
+        Same as wxTE_RIGHT for wxTextCtrl: the text is right aligned.
     @endStyleTable
 
 
@@ -98,7 +98,7 @@ public:
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100,
                int initial = 0, const wxString& name = "wxSpinCtrl");
 
@@ -110,7 +110,7 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100,
                 int initial = 0, const wxString& name = "wxSpinCtrl");
 
diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 314697d768..db8063c389 100644
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -45,7 +45,7 @@ wxObject *wxSpinButtonXmlHandler::DoCreateResource()
     control->Create(m_parentAsWindow,
                     GetID(),
                     GetPosition(), GetSize(),
-                    GetStyle(wxT("style"), wxSP_VERTICAL | wxSP_ARROW_KEYS),
+                    GetStyle(wxT("style"), wxSP_ARROW_KEYS),
                     GetName());
 
     control->SetValue(GetLong( wxT("value"), DEFAULT_VALUE));
@@ -96,7 +96,7 @@ wxObject *wxSpinCtrlXmlHandler::DoCreateResource()
                     GetID(),
                     GetText(wxT("value")),
                     GetPosition(), GetSize(),
-                    GetStyle(wxT("style"), wxSP_ARROW_KEYS | wxALIGN_RIGHT),
+                    GetStyle(wxT("style"), wxSP_ARROW_KEYS),
                     GetLong(wxT("min"), DEFAULT_MIN),
                     GetLong(wxT("max"), DEFAULT_MAX),
                     GetLong(wxT("value"), DEFAULT_VALUE),
@@ -133,7 +133,7 @@ wxObject *wxSpinCtrlDoubleXmlHandler::DoCreateResource()
                     GetID(),
                     GetText(wxS("value")),
                     GetPosition(), GetSize(),
-                    GetStyle(wxS("style"), wxSP_ARROW_KEYS | wxALIGN_RIGHT),
+                    GetStyle(wxS("style"), wxSP_ARROW_KEYS),
                     GetFloat(wxS("min"), (float)DEFAULT_MIN),
                     GetFloat(wxS("max"), (float)DEFAULT_MAX),
                     GetFloat(wxS("value"), (float)DEFAULT_VALUE),

From ff023ef6b373d331ed7cb8a0141ef7303d282419 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 12 May 2018 19:34:54 +0200
Subject: [PATCH 521/916] Don't show docview sample --mdi option in help if
 it's not supported

No real changes, just avoid describing the "--mdi" option in the help
message if it's not really supported in this library build.
---
 samples/docview/docview.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index 6b352d5f38..5103b14d74 100644
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -92,7 +92,9 @@ MyApp::MyApp()
 namespace CmdLineOption
 {
 
+#if wxUSE_MDI_ARCHITECTURE
 const char * const MDI = "mdi";
+#endif // wxUSE_MDI_ARCHITECTURE
 const char * const SDI = "sdi";
 const char * const SINGLE = "single";
 
@@ -102,8 +104,10 @@ void MyApp::OnInitCmdLine(wxCmdLineParser& parser)
 {
     wxApp::OnInitCmdLine(parser);
 
+#if wxUSE_MDI_ARCHITECTURE
     parser.AddSwitch("", CmdLineOption::MDI,
                      "run in MDI mode: multiple documents, single window");
+#endif // wxUSE_MDI_ARCHITECTURE
     parser.AddSwitch("", CmdLineOption::SDI,
                      "run in SDI mode: multiple documents, multiple windows");
     parser.AddSwitch("", CmdLineOption::SINGLE,

From 826ab19ac914716726acd5f522fad9e827f7b444 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 12 May 2018 19:51:03 +0200
Subject: [PATCH 522/916] Add missing wxUSE_MDI check to wxAUI MDI header

The implementation file already checked for both wxUSE_AUI && wxUSE_MDI,
but wx/aui/tabmdi.h didn't check the value of the latter -- do it now.
---
 include/wx/aui/tabmdi.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 2922d3a84b..1e8976f9da 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -11,7 +11,7 @@
 #ifndef _WX_AUITABMDI_H_
 #define _WX_AUITABMDI_H_
 
-#if wxUSE_AUI
+#if wxUSE_AUI && wxUSE_MDI
 
 // ----------------------------------------------------------------------------
 // headers
@@ -265,6 +265,6 @@ private:
     wxDECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow);
     wxDECLARE_EVENT_TABLE();
 };
-#endif // wxUSE_AUI
+#endif // wxUSE_AUI && wxUSE_MDI
 
 #endif // _WX_AUITABMDI_H_

From c1bcf16eb92db20db9dd2842e0facc116cbdb0c7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 12 May 2018 23:40:57 +0200
Subject: [PATCH 523/916] Derive wxAuiMDIChildFrame from wxFrame for
 consistency

Make it easier to use AUI-based MDI child frame class instead of
normal wxMDIChildFrame itself by inheriting it from the same base class.

This also allows to get rid of duplicate stubs in wxAuiMDIChildFrame.
---
 include/wx/aui/tabmdi.h | 45 ++---------------------------------------
 src/aui/tabmdi.cpp      | 27 +++++--------------------
 2 files changed, 7 insertions(+), 65 deletions(-)

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 1e8976f9da..bcbb2f5cad 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -21,6 +21,7 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 #include "wx/icon.h"
+#include "wx/mdi.h"
 #include "wx/aui/auibook.h"
 
 //-----------------------------------------------------------------------------
@@ -115,7 +116,7 @@ private:
 // wxAuiMDIChildFrame
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_AUI wxAuiMDIChildFrame : public wxPanel
+class WXDLLIMPEXP_AUI wxAuiMDIChildFrame : public wxTDIChildFrame
 {
 public:
     wxAuiMDIChildFrame();
@@ -142,7 +143,6 @@ public:
 #endif // wxUSE_MENUS
 
     virtual void SetTitle(const wxString& title);
-    virtual wxString GetTitle() const;
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual const wxIconBundle& GetIcons() const;
@@ -155,43 +155,7 @@ public:
 
     virtual bool Show(bool show = true) wxOVERRIDE;
 
-#if wxUSE_STATUSBAR
-    // no status bars
-    virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
-                                         long WXUNUSED(style) = 1,
-                                         wxWindowID WXUNUSED(winid) = 1,
-                                         const wxString& WXUNUSED(name) = wxEmptyString)
-      { return NULL; }
-
-    virtual wxStatusBar *GetStatusBar() const { return NULL; }
-    virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
-    virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
-#endif
-
-#if wxUSE_TOOLBAR
-    // no toolbar bars
-    virtual wxToolBar* CreateToolBar(long WXUNUSED(style),
-                                     wxWindowID WXUNUSED(winid),
-                                     const wxString& WXUNUSED(name))
-        { return NULL; }
-    virtual wxToolBar *GetToolBar() const { return NULL; }
-#endif
-
-
-    // no maximize etc
-    virtual void Maximize(bool WXUNUSED(maximize) = true) { /* Has no effect */ }
-    virtual void Restore() { /* Has no effect */ }
-    virtual void Iconize(bool WXUNUSED(iconize)  = true) { /* Has no effect */ }
-    virtual bool IsMaximized() const { return true; }
-    virtual bool IsIconized() const { return false; }
-    virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; }
-    virtual bool IsFullScreen() const { return false; }
-
-    virtual bool IsTopLevel() const wxOVERRIDE { return false; }
-
     void OnMenuHighlight(wxMenuEvent& evt);
-    void OnActivate(wxActivateEvent& evt);
-    void OnCloseWindow(wxCloseEvent& evt);
 
     void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
     wxAuiMDIParentFrame* GetMDIParentFrame() const;
@@ -201,10 +165,6 @@ protected:
     virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
     virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
 
-    // no size hints
-    virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
-                                int WXUNUSED(maxW), int WXUNUSED(maxH),
-                                int WXUNUSED(incW), int WXUNUSED(incH)) wxOVERRIDE {}
 public:
     // This function needs to be called when a size change is confirmed,
     // we needed this function to prevent anybody from the outside
@@ -216,7 +176,6 @@ protected:
     wxAuiMDIParentFrame* m_pMDIParentFrame;
     wxRect m_mdiNewRect;
     wxRect m_mdiCurRect;
-    wxString m_title;
     wxIcon m_icon;
     wxIconBundle m_iconBundle;
     bool m_activateOnCreate;
diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index c484d9b701..7d416987b9 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -423,12 +423,10 @@ void wxAuiMDIParentFrame::Tile(wxOrientation orient)
 // wxAuiMDIChildFrame
 //-----------------------------------------------------------------------------
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIChildFrame, wxPanel);
+wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIChildFrame, wxFrame);
 
-wxBEGIN_EVENT_TABLE(wxAuiMDIChildFrame, wxPanel)
+wxBEGIN_EVENT_TABLE(wxAuiMDIChildFrame, wxFrame)
     EVT_MENU_HIGHLIGHT_ALL(wxAuiMDIChildFrame::OnMenuHighlight)
-    EVT_ACTIVATE(wxAuiMDIChildFrame::OnActivate)
-    EVT_CLOSE(wxAuiMDIChildFrame::OnCloseWindow)
 wxEND_EVENT_TABLE()
 
 wxAuiMDIChildFrame::wxAuiMDIChildFrame()
@@ -501,7 +499,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
     wxSize cli_size = pClientWindow->GetClientSize();
 
     // create the window off-screen to prevent flicker
-    wxPanel::Create(pClientWindow,
+    wxWindow::Create(pClientWindow,
                     id,
                     wxPoint(cli_size.x+1, cli_size.y+1),
                     size,
@@ -609,11 +607,6 @@ void wxAuiMDIChildFrame::SetTitle(const wxString& title)
     }
 }
 
-wxString wxAuiMDIChildFrame::GetTitle() const
-{
-    return m_title;
-}
-
 void wxAuiMDIChildFrame::SetIcons(const wxIconBundle& icons)
 {
     // get icon with the system icon size
@@ -689,16 +682,6 @@ void wxAuiMDIChildFrame::OnMenuHighlight(wxMenuEvent& event)
 #endif // wxUSE_STATUSBAR
 }
 
-void wxAuiMDIChildFrame::OnActivate(wxActivateEvent& WXUNUSED(event))
-{
-    // do nothing
-}
-
-void wxAuiMDIChildFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    Destroy();
-}
-
 void wxAuiMDIChildFrame::SetMDIParentFrame(wxAuiMDIParentFrame* parentFrame)
 {
     m_pMDIParentFrame = parentFrame;
@@ -743,7 +726,7 @@ void wxAuiMDIChildFrame::DoSetSize(int x, int y, int width, int height, int size
 {
     m_mdiNewRect = wxRect(x, y, width, height);
 #ifdef __WXGTK__
-    wxPanel::DoSetSize(x,y,width, height, sizeFlags);
+    wxWindow::DoSetSize(x,y,width, height, sizeFlags);
 #else
     wxUnusedVar(sizeFlags);
 #endif
@@ -758,7 +741,7 @@ void wxAuiMDIChildFrame::ApplyMDIChildFrameRect()
 {
     if (m_mdiCurRect != m_mdiNewRect)
     {
-        wxPanel::DoMoveWindow(m_mdiNewRect.x, m_mdiNewRect.y,
+        wxWindow::DoMoveWindow(m_mdiNewRect.x, m_mdiNewRect.y,
                               m_mdiNewRect.width, m_mdiNewRect.height);
         m_mdiCurRect = m_mdiNewRect;
     }

From ceee16c01a884bb073f0e42fa62b242f6a3ba127 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 12 May 2018 23:57:42 +0200
Subject: [PATCH 524/916] Remove sizing hacks from wxAuiMDIChildFrame

There doesn't seem to be any reason for overriding DoSetSize() and
DoMoveWindow(), so just stop doing it.

Notice that this was already changed for wxGTK many years ago in
a94476deb9c1a778001aeb84e6e95df719c9bc17 and there is no reason to use
different code wxGTK and other ports.
---
 include/wx/aui/tabmdi.h |  5 -----
 src/aui/auibook.cpp     |  8 --------
 src/aui/tabmdi.cpp      | 35 -----------------------------------
 3 files changed, 48 deletions(-)

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index bcbb2f5cad..842e9dd805 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -162,8 +162,6 @@ public:
 
 protected:
     void Init();
-    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
-    virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
 
 public:
     // This function needs to be called when a size change is confirmed,
@@ -174,8 +172,6 @@ public:
 
 protected:
     wxAuiMDIParentFrame* m_pMDIParentFrame;
-    wxRect m_mdiNewRect;
-    wxRect m_mdiCurRect;
     wxIcon m_icon;
     wxIconBundle m_iconBundle;
     bool m_activateOnCreate;
@@ -218,7 +214,6 @@ protected:
     void PageChanged(int oldSelection, int newSelection);
     void OnPageClose(wxAuiNotebookEvent& evt);
     void OnPageChanged(wxAuiNotebookEvent& evt);
-    void OnSize(wxSizeEvent& evt);
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow);
diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index d7f5d5e57b..f01a58c46b 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -1595,14 +1595,6 @@ public:
             }
             // TODO: else if (GetFlags() & wxAUI_NB_LEFT){}
             // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){}
-
-#if wxUSE_MDI
-            if (wxDynamicCast(page.window, wxAuiMDIChildFrame))
-            {
-                wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window;
-                wnd->ApplyMDIChildFrameRect();
-            }
-#endif
         }
     }
 
diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 7d416987b9..30a781cbc8 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -722,32 +722,6 @@ void wxAuiMDIChildFrame::DoShow(bool show)
     wxWindow::Show(show);
 }
 
-void wxAuiMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    m_mdiNewRect = wxRect(x, y, width, height);
-#ifdef __WXGTK__
-    wxWindow::DoSetSize(x,y,width, height, sizeFlags);
-#else
-    wxUnusedVar(sizeFlags);
-#endif
-}
-
-void wxAuiMDIChildFrame::DoMoveWindow(int x, int y, int width, int height)
-{
-    m_mdiNewRect = wxRect(x, y, width, height);
-}
-
-void wxAuiMDIChildFrame::ApplyMDIChildFrameRect()
-{
-    if (m_mdiCurRect != m_mdiNewRect)
-    {
-        wxWindow::DoMoveWindow(m_mdiNewRect.x, m_mdiNewRect.y,
-                              m_mdiNewRect.width, m_mdiNewRect.height);
-        m_mdiCurRect = m_mdiNewRect;
-    }
-}
-
-
 //-----------------------------------------------------------------------------
 // wxAuiMDIClientWindow
 //-----------------------------------------------------------------------------
@@ -757,7 +731,6 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIClientWindow, wxAuiNotebook);
 wxBEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook)
     EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged)
     EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, wxAuiMDIClientWindow::OnPageClose)
-    EVT_SIZE(wxAuiMDIClientWindow::OnSize)
 wxEND_EVENT_TABLE()
 
 wxAuiMDIClientWindow::wxAuiMDIClientWindow()
@@ -874,13 +847,5 @@ void wxAuiMDIClientWindow::OnPageChanged(wxAuiNotebookEvent& evt)
     PageChanged(evt.GetOldSelection(), evt.GetSelection());
 }
 
-void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt)
-{
-    wxAuiNotebook::OnSize(evt);
-
-    for (size_t pos = 0; pos < GetPageCount(); pos++)
-        ((wxAuiMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect();
-}
-
 #endif //wxUSE_AUI
 #endif // wxUSE_MDI

From 24e06054fc485e2d0cf6aade6dfd459a8db996e1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 12 May 2018 23:49:45 +0200
Subject: [PATCH 525/916] Remove wxAuiMDIChildFrame::DoShow()

This method is confusing as it's not used for implementing Show(), which
is the usual naming convention when both Foo() and DoFoo() members
exist, and gives no clear indication about what does it really do.

Just call wxWindow::Show() directly instead.

Also create the wxAuiMDIChildFrame window hidden from the beginning,
instead of creating it in a visible state and then hiding it.
---
 include/wx/aui/tabmdi.h |  1 -
 src/aui/auibook.cpp     |  2 +-
 src/aui/tabmdi.cpp      | 14 +++-----------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 842e9dd805..3fa2b16993 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -168,7 +168,6 @@ public:
     // we needed this function to prevent anybody from the outside
     // changing the panel... it messes the UI layout when we would allow it.
     void ApplyMDIChildFrameRect();
-    void DoShow(bool show);
 
 protected:
     wxAuiMDIParentFrame* m_pMDIParentFrame;
diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index f01a58c46b..0a37a469ba 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -930,7 +930,7 @@ static void ShowWnd(wxWindow* wnd, bool show)
     if (wxDynamicCast(wnd, wxAuiMDIChildFrame))
     {
         wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd;
-        cf->DoShow(show);
+        cf->wxWindow::Show(show);
     }
     else
 #endif
diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 30a781cbc8..c088931844 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -496,17 +496,14 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
     if (style & wxMINIMIZE)
         m_activateOnCreate = false;
 
-    wxSize cli_size = pClientWindow->GetClientSize();
-
-    // create the window off-screen to prevent flicker
+    // create the window hidden to prevent flicker
+    wxWindow::Show(false);
     wxWindow::Create(pClientWindow,
                     id,
-                    wxPoint(cli_size.x+1, cli_size.y+1),
+                    wxDefaultPosition,
                     size,
                     wxNO_BORDER, name);
 
-    DoShow(false);
-
     SetMDIParentFrame(parent);
 
     m_title = title;
@@ -717,11 +714,6 @@ bool wxAuiMDIChildFrame::Show(bool show)
     return true;
 }
 
-void wxAuiMDIChildFrame::DoShow(bool show)
-{
-    wxWindow::Show(show);
-}
-
 //-----------------------------------------------------------------------------
 // wxAuiMDIClientWindow
 //-----------------------------------------------------------------------------

From 2e5554019a4711172ca9dd11c7c56c7da3ccaa8b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 May 2018 00:10:41 +0200
Subject: [PATCH 526/916] Allow calling wxAuiMDIChildFrame::Show()

Even if it doesn't do anything, allow calling this method even after
creating the child frame for consistency with the normal MDI
implementation.
---
 src/aui/tabmdi.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index c088931844..86e7887ecf 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -700,14 +700,6 @@ void wxAuiMDIChildFrame::Init()
 
 bool wxAuiMDIChildFrame::Show(bool show)
 {
-    // wxAuiMDIChildFrame uses m_activateOnCreate only to decide whether to
-    // activate the frame when it is created.  After Create() is called,
-    // m_activateOnCreate will never be read again.  Therefore, calling this
-    // function after Create() is pointless and you probably want to call
-    // Activate() instead.
-    wxCHECK_MSG( !GetHandle(), false,
-                 wxS("Show() has no effect after Create(). Do you mean Activate()?") );
-
     m_activateOnCreate = show;
 
     // do nothing

From 6cdd564237b9ac419d20634e52da849d605deb2f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 May 2018 02:33:05 +0200
Subject: [PATCH 527/916] Redo layout from wxAuiMDIChildFrame::Show()

This makes using this class more similar to using wxMDIChildFrame and
fixes the initial appearance of docview sample child windows in AUI
mode.
---
 src/aui/tabmdi.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 86e7887ecf..0d2450c65f 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -702,7 +702,18 @@ bool wxAuiMDIChildFrame::Show(bool show)
 {
     m_activateOnCreate = show;
 
-    // do nothing
+    if ( show )
+    {
+        // This is not a real TLW, so it won't get a size event when it's
+        // really "mapped", i.e. appears on the screen for the first time.
+        // Instead, its size had been already set when it was created and we
+        // didn't have any opportunity to lay it out since then, i.e. since
+        // before its children were created. Do it now to allow the same code
+        // that would work with a "real" wxMDIChildFrame to also work with this
+        // class.
+        DoLayout();
+    }
+
     return true;
 }
 

From c756d18bc4e9800e913643a70092a12a679b239a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 May 2018 00:11:41 +0200
Subject: [PATCH 528/916] Allow using AUI-based MDI classes in the docview
 sample

For testing, allow using wxAuiMDI{Parent,Child}Frame in the sample.

This change also shows that the AUI classes are now sufficiently
compatible with the standard ones for switching to them to be almost
trivial.
---
 samples/docview/Makefile.in        |   5 +-
 samples/docview/docview.bkl        |   1 +
 samples/docview/docview.cpp        | 140 ++++++++++++++++++++---------
 samples/docview/docview.h          |   3 +
 samples/docview/docview_vc7.vcproj |   8 +-
 samples/docview/docview_vc8.vcproj |  16 ++--
 samples/docview/docview_vc9.vcproj |  16 ++--
 samples/docview/makefile.bcc       |   6 +-
 samples/docview/makefile.gcc       |   6 +-
 samples/docview/makefile.unx       |   2 +-
 samples/docview/makefile.vc        |   6 +-
 11 files changed, 143 insertions(+), 66 deletions(-)

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 8415a78332..9c174054d5 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -98,6 +98,9 @@ COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__docview_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____docview_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@	$(__docview_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_AUI_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -148,7 +151,7 @@ distclean: clean
 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
-	$(CXX) -o $@ $(DOCVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(CXX) -o $@ $(DOCVIEW_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 	$(__docview___os2_emxbindcmd)
 
 @COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/doc.icns $(srcdir)/chart.icns $(srcdir)/notepad.icns
diff --git a/samples/docview/docview.bkl b/samples/docview/docview.bkl
index da903d0623..785f7058f5 100644
--- a/samples/docview/docview.bkl
+++ b/samples/docview/docview.bkl
@@ -10,6 +10,7 @@
     <exe id="docview" template="wx_sample" template_append="wx_append">
         <sources>docview.cpp doc.cpp view.cpp</sources>
         <headers>docview.h doc.h view.h</headers>
+        <wx-lib>aui</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>docview.rc</win32-res>
diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index 5103b14d74..3785a06235 100644
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -49,6 +49,10 @@
 #include "wx/docview.h"
 #include "wx/docmdi.h"
 
+#if wxUSE_AUI
+    #include "wx/aui/tabmdi.h"
+#endif // wxUSE_AUI
+
 #include "docview.h"
 #include "doc.h"
 #include "view.h"
@@ -95,6 +99,9 @@ namespace CmdLineOption
 #if wxUSE_MDI_ARCHITECTURE
 const char * const MDI = "mdi";
 #endif // wxUSE_MDI_ARCHITECTURE
+#if wxUSE_AUI
+const char * const AUI = "aui";
+#endif // wxUSE_AUI
 const char * const SDI = "sdi";
 const char * const SINGLE = "single";
 
@@ -108,6 +115,10 @@ void MyApp::OnInitCmdLine(wxCmdLineParser& parser)
     parser.AddSwitch("", CmdLineOption::MDI,
                      "run in MDI mode: multiple documents, single window");
 #endif // wxUSE_MDI_ARCHITECTURE
+#if wxUSE_AUI
+    parser.AddSwitch("", CmdLineOption::AUI,
+                     "run in MDI mode using AUI: multiple documents, single window");
+#endif // wxUSE_AUI
     parser.AddSwitch("", CmdLineOption::SDI,
                      "run in SDI mode: multiple documents, multiple windows");
     parser.AddSwitch("", CmdLineOption::SINGLE,
@@ -130,6 +141,14 @@ bool MyApp::OnCmdLineParsed(wxCmdLineParser& parser)
     }
 #endif // wxUSE_MDI_ARCHITECTURE
 
+#if wxUSE_AUI
+    if ( parser.Found(CmdLineOption::AUI) )
+    {
+        m_mode = Mode_AUI;
+        numModeOptions++;
+    }
+#endif // wxUSE_AUI
+
     if ( parser.Found(CmdLineOption::SDI) )
     {
         m_mode = Mode_SDI;
@@ -202,22 +221,37 @@ bool MyApp::OnInit()
     }
 
     // create the main frame window
-    wxFrame *frame;
+    wxFrame *frame = NULL;
+    switch ( m_mode )
+    {
 #if wxUSE_MDI_ARCHITECTURE
-    if ( m_mode == Mode_MDI )
-    {
-        frame = new wxDocMDIParentFrame(docManager, NULL, wxID_ANY,
-                                        GetAppDisplayName(),
-                                        wxDefaultPosition,
-                                        wxSize(500, 400));
-    }
-    else
+        case Mode_MDI:
+            frame = new wxDocMDIParentFrame(docManager, NULL, wxID_ANY,
+                                            GetAppDisplayName(),
+                                            wxDefaultPosition,
+                                            wxSize(500, 400));
+            break;
 #endif // wxUSE_MDI_ARCHITECTURE
-    {
-        frame = new wxDocParentFrame(docManager, NULL, wxID_ANY,
-                                     GetAppDisplayName(),
-                                     wxDefaultPosition,
-                                     wxSize(500, 400));
+
+#if wxUSE_AUI
+        case Mode_AUI:
+            frame = new wxDocParentFrameAny<wxAuiMDIParentFrame>
+                        (
+                            docManager, NULL, wxID_ANY,
+                            GetAppDisplayName(),
+                            wxDefaultPosition,
+                            wxSize(500, 400)
+                        );
+            break;
+#endif // wxUSE_AUI
+
+        case Mode_SDI:
+        case Mode_Single:
+            frame = new wxDocParentFrame(docManager, NULL, wxID_ANY,
+                                         GetAppDisplayName(),
+                                         wxDefaultPosition,
+                                         wxSize(500, 400));
+            break;
     }
 
     // and its menu bar
@@ -321,37 +355,55 @@ void MyApp::CreateMenuBarForFrame(wxFrame *frame, wxMenu *file, wxMenu *edit)
 wxFrame *MyApp::CreateChildFrame(wxView *view, bool isCanvas)
 {
     // create a child frame of appropriate class for the current mode
-    wxFrame *subframe;
+    wxFrame *subframe = NULL;
     wxDocument *doc = view->GetDocument();
+    switch ( GetMode() )
 #if wxUSE_MDI_ARCHITECTURE
-    if ( GetMode() == Mode_MDI )
     {
-        subframe = new wxDocMDIChildFrame
-                       (
-                            doc,
-                            view,
-                            wxStaticCast(GetTopWindow(), wxDocMDIParentFrame),
-                            wxID_ANY,
-                            "Child Frame",
-                            wxDefaultPosition,
-                            wxSize(300, 300)
-                       );
-    }
-    else
+        case Mode_MDI:
+            subframe = new wxDocMDIChildFrame
+                           (
+                                doc,
+                                view,
+                                wxStaticCast(GetTopWindow(), wxDocMDIParentFrame),
+                                wxID_ANY,
+                                "Child Frame",
+                                wxDefaultPosition,
+                                wxSize(300, 300)
+                           );
+            break;
 #endif // wxUSE_MDI_ARCHITECTURE
-    {
-        subframe = new wxDocChildFrame
-                       (
-                            doc,
-                            view,
-                            wxStaticCast(GetTopWindow(), wxDocParentFrame),
-                            wxID_ANY,
-                            "Child Frame",
-                            wxDefaultPosition,
-                            wxSize(300, 300)
-                       );
 
-        subframe->Centre();
+#if wxUSE_AUI
+        case Mode_AUI:
+            subframe = new wxDocChildFrameAny<wxAuiMDIChildFrame, wxAuiMDIParentFrame>
+                           (
+                                doc,
+                                view,
+                                wxStaticCast(GetTopWindow(), wxAuiMDIParentFrame),
+                                wxID_ANY,
+                                "Child Frame",
+                                wxDefaultPosition,
+                                wxSize(300, 300)
+                           );
+            break;
+#endif // wxUSE_AUI
+
+        case Mode_SDI:
+        case Mode_Single:
+            subframe = new wxDocChildFrame
+                           (
+                                doc,
+                                view,
+                                wxStaticCast(GetTopWindow(), wxDocParentFrame),
+                                wxID_ANY,
+                                "Child Frame",
+                                wxDefaultPosition,
+                                wxSize(300, 300)
+                           );
+
+            subframe->Centre();
+            break;
     }
 
     wxMenu *menuFile = new wxMenu;
@@ -396,6 +448,12 @@ void MyApp::OnAbout(wxCommandEvent& WXUNUSED(event))
             break;
 #endif // wxUSE_MDI_ARCHITECTURE
 
+#if wxUSE_AUI
+        case Mode_AUI:
+            modeName = "AUI";
+            break;
+#endif // wxUSE_AUI
+
         case Mode_SDI:
             modeName = "SDI";
             break;
@@ -419,7 +477,7 @@ void MyApp::OnAbout(wxCommandEvent& WXUNUSED(event))
         "\n"
         "Authors: Julian Smart, Vadim Zeitlin\n"
         "\n"
-        "Usage: docview [--{mdi,sdi,single}]",
+        "Usage: docview [--{mdi,aui,sdi,single}]",
         modeName,
         docsCount
     );
diff --git a/samples/docview/docview.h b/samples/docview/docview.h
index 12e9dbc86b..27d5175f1f 100644
--- a/samples/docview/docview.h
+++ b/samples/docview/docview.h
@@ -27,6 +27,9 @@ public:
 #if wxUSE_MDI_ARCHITECTURE
         Mode_MDI,   // MDI mode: multiple documents, single top level window
 #endif // wxUSE_MDI_ARCHITECTURE
+#if wxUSE_AUI
+        Mode_AUI,   // MDI AUI mode
+#endif // wxUSE_AUI
         Mode_SDI,   // SDI mode: multiple documents, multiple top level windows
         Mode_Single // single document mode (and hence single top level window)
     };
diff --git a/samples/docview/docview_vc7.vcproj b/samples/docview/docview_vc7.vcproj
index c7b31a484a..cd439da1ab 100644
--- a/samples/docview/docview_vc7.vcproj
+++ b/samples/docview/docview_vc7.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -108,7 +108,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -175,7 +175,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -237,7 +237,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/samples/docview/docview_vc8.vcproj b/samples/docview/docview_vc8.vcproj
index e39218756c..1176bfead3 100644
--- a/samples/docview/docview_vc8.vcproj
+++ b/samples/docview/docview_vc8.vcproj
@@ -83,7 +83,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -177,7 +177,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -276,7 +276,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -370,7 +370,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -469,7 +469,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud_x64\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -563,7 +563,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu_x64\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -662,7 +662,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll_x64\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -756,7 +756,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll_x64\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
diff --git a/samples/docview/docview_vc9.vcproj b/samples/docview/docview_vc9.vcproj
index dcca50e7e3..f8c5aa0103 100644
--- a/samples/docview/docview_vc9.vcproj
+++ b/samples/docview/docview_vc9.vcproj
@@ -82,7 +82,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -173,7 +173,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -268,7 +268,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -359,7 +359,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -454,7 +454,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswud_x64\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswu_x64\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -640,7 +640,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31ud_aui.lib  wxmsw31ud_core.lib  wxbase31ud.lib    wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswuddll_x64\docview.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -731,7 +731,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=""
-				AdditionalDependencies="wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
+				AdditionalDependencies="wxmsw31u_aui.lib  wxmsw31u_core.lib  wxbase31u.lib    wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
 				OutputFile="vc_mswudll_x64\docview.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
diff --git a/samples/docview/makefile.bcc b/samples/docview/makefile.bcc
index b7a3be7a76..819bccc600 100644
--- a/samples/docview/makefile.bcc
+++ b/samples/docview/makefile.bcc
@@ -166,6 +166,10 @@ __DLLFLAG_p = -DWXUSINGDLL
 __DLLFLAG_p_1 = -dWXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
 __WXLIB_CORE_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
@@ -230,7 +234,7 @@ clean:
 
 $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS)  $(OBJS)\docview_docview.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res
+	c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res
 |
 
 $(OBJS)\docview_docview.obj: .\docview.cpp
diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc
index d07248d8a2..a233db7e5d 100644
--- a/samples/docview/makefile.gcc
+++ b/samples/docview/makefile.gcc
@@ -151,6 +151,10 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
+__WXLIB_AUI_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
+endif
+ifeq ($(MONOLITHIC),0)
 __WXLIB_CORE_p = \
 	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
 endif
@@ -220,7 +224,7 @@ clean:
 	-if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
 
 $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview_rc.o
-	$(CXX) -o $@ $(DOCVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ $(DOCVIEW_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_AUI_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
 
 $(OBJS)\docview_docview.o: ./docview.cpp
 	$(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/docview/makefile.unx b/samples/docview/makefile.unx
index e4751ad590..1e06ee06ef 100644
--- a/samples/docview/makefile.unx
+++ b/samples/docview/makefile.unx
@@ -90,7 +90,7 @@ test_for_selected_wxbuild:
 	@$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 docview: $(DOCVIEW_OBJECTS)
-	$(CXX) -o $@ $(DOCVIEW_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`
+	$(CXX) -o $@ $(DOCVIEW_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,core,base`
 
 docview_docview.o: ./docview.cpp
 	$(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<
diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc
index 9343f39ecc..815f7253b8 100644
--- a/samples/docview/makefile.vc
+++ b/samples/docview/makefile.vc
@@ -304,6 +304,10 @@ __DLLFLAG_p = /DWXUSINGDLL
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
 !if "$(MONOLITHIC)" == "0"
+__WXLIB_AUI_p = \
+	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
 __WXLIB_CORE_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
 !endif
@@ -353,7 +357,7 @@ clean:
 
 $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
-	$(DOCVIEW_OBJECTS) $(DOCVIEW_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
+	$(DOCVIEW_OBJECTS) $(DOCVIEW_RESOURCES)  $(__WXLIB_AUI_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
 <<
 
 $(OBJS)\docview_docview.obj: .\docview.cpp

From f7b0ec38dd20807d89b0c694323f410d8a43d3eb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 May 2018 00:20:34 +0200
Subject: [PATCH 529/916] Remove useless wxAuiMDIClientWindow::SetSelection()

It just called the base class version, so it's better to not have it at
all.
---
 include/wx/aui/tabmdi.h | 1 -
 src/aui/tabmdi.cpp      | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 3fa2b16993..e9707853fe 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -201,7 +201,6 @@ public:
     virtual bool CreateClient(wxAuiMDIParentFrame *parent,
                               long style = wxVSCROLL | wxHSCROLL);
 
-    virtual int SetSelection(size_t page) wxOVERRIDE;
     virtual wxAuiMDIChildFrame* GetActiveChild();
     virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
     {
diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 0d2450c65f..0ac1316565 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -763,11 +763,6 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
     return true;
 }
 
-int wxAuiMDIClientWindow::SetSelection(size_t nPage)
-{
-    return wxAuiNotebook::SetSelection(nPage);
-}
-
 wxAuiMDIChildFrame* wxAuiMDIClientWindow::GetActiveChild()
 {
     const int sel = GetSelection();

From be696ed8a4572d2ac8ecf6605ec4bd0b9f837c99 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 May 2018 02:15:30 +0200
Subject: [PATCH 530/916] Reuse base class icon-related functions in
 wxAuiMDIChildFrame

Don't define GetIcon(), GetIcons() and SetIcon() at all as the base
class already implements them and just keep SetIcons(), which can now be
marked as overridden as it's inherited from wxTopLevelWindow via
wxTDIChildFrame.
---
 include/wx/aui/tabmdi.h |  8 +-------
 src/aui/tabmdi.cpp      | 22 ++--------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index e9707853fe..e260109ef0 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -144,11 +144,7 @@ public:
 
     virtual void SetTitle(const wxString& title);
 
-    virtual void SetIcons(const wxIconBundle& icons);
-    virtual const wxIconBundle& GetIcons() const;
-
-    virtual void SetIcon(const wxIcon& icon);
-    virtual const wxIcon& GetIcon() const;
+    virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE;
 
     virtual void Activate();
     virtual bool Destroy() wxOVERRIDE;
@@ -171,8 +167,6 @@ public:
 
 protected:
     wxAuiMDIParentFrame* m_pMDIParentFrame;
-    wxIcon m_icon;
-    wxIconBundle m_iconBundle;
     bool m_activateOnCreate;
 
 #if wxUSE_MENUS
diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index 0ac1316565..fc55a27e81 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -606,25 +606,13 @@ void wxAuiMDIChildFrame::SetTitle(const wxString& title)
 
 void wxAuiMDIChildFrame::SetIcons(const wxIconBundle& icons)
 {
-    // get icon with the system icon size
-    SetIcon(icons.GetIcon(-1));
-    m_iconBundle = icons;
-}
+    wxTDIChildFrame::SetIcons(icons);
 
-const wxIconBundle& wxAuiMDIChildFrame::GetIcons() const
-{
-    return m_iconBundle;
-}
-
-void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
-{
     wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
     wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
 
-    m_icon = icon;
-
     wxBitmap bmp;
-    bmp.CopyFromIcon(m_icon);
+    bmp.CopyFromIcon(icons.GetIcon(-1));
 
     wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
     if (pClientWindow != NULL)
@@ -638,12 +626,6 @@ void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
     }
 }
 
-const wxIcon& wxAuiMDIChildFrame::GetIcon() const
-{
-    return m_icon;
-}
-
-
 void wxAuiMDIChildFrame::Activate()
 {
     wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();

From a57c192023b1259f212240883421cbe7aacd5d7d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 May 2018 00:39:23 +0200
Subject: [PATCH 531/916] Adjust wxAuiMDIClientWindow tabs height to icons
 automatically

Don't explicitly set the default icon size, this isn't really necessary
and just prevents things from working correctly if the child frames use
icons of a different (especially bigger) size.

Still try to use the icons of the standard size by default, but let
wxAuiNotebook adjust to bigger icons if this is what we have.
---
 src/aui/tabmdi.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index fc55a27e81..97c39cf21c 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -611,8 +611,10 @@ void wxAuiMDIChildFrame::SetIcons(const wxIconBundle& icons)
     wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
     wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
 
+    const wxSize sizeIcon(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X),
+                          wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
     wxBitmap bmp;
-    bmp.CopyFromIcon(icons.GetIcon(-1));
+    bmp.CopyFromIcon(icons.GetIcon(sizeIcon));
 
     wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
     if (pClientWindow != NULL)
@@ -723,11 +725,6 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
 {
     SetWindowStyleFlag(style);
 
-    wxSize caption_icon_size =
-            wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X),
-                   wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
-    SetUniformBitmapSize(caption_icon_size);
-
     if (!wxAuiNotebook::Create(parent,
                                wxID_ANY,
                                wxPoint(0,0),

From dca84c823c78d8f686d23a8a8efa189d17cc7d0c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 May 2018 02:10:34 +0200
Subject: [PATCH 532/916] Optimize away an unnecessary extra
 wxAuiNotebook::DoSizing() call

There is no need to call DoSizing() again if it has just been called
from UpdateTabCtrlHeight().
---
 src/aui/auibook.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 0a37a469ba..2bc8d0587a 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -1973,8 +1973,11 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
     else
         active_tabctrl->InsertPage(page, info, page_idx);
 
-    UpdateTabCtrlHeight();
-    DoSizing();
+    // Note that we don't need to call DoSizing() if the height has changed, as
+    // it's already called from UpdateTabCtrlHeight() itself in this case.
+    if ( !UpdateTabCtrlHeight() )
+        DoSizing();
+
     active_tabctrl->DoShowHide();
 
     // adjust selected index

From 4710302aecfedc7749e0dc03bc00d0f68c06c94c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 13 May 2018 02:17:47 +0200
Subject: [PATCH 533/916] Add wxOVERRIDE to all relevant wxAuiMDIChildFrame
 methods

Now that this class derives from wxMDIChildFrameBase, SetTitle() and
Activate() are inherited from it.
---
 include/wx/aui/tabmdi.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index e260109ef0..bd98406353 100644
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -138,15 +138,15 @@ public:
                 const wxString& name = wxFrameNameStr);
 
 #if wxUSE_MENUS
-    virtual void SetMenuBar(wxMenuBar *menuBar);
-    virtual wxMenuBar *GetMenuBar() const;
+    virtual void SetMenuBar(wxMenuBar *menuBar) wxOVERRIDE;
+    virtual wxMenuBar *GetMenuBar() const wxOVERRIDE;
 #endif // wxUSE_MENUS
 
-    virtual void SetTitle(const wxString& title);
+    virtual void SetTitle(const wxString& title) wxOVERRIDE;
 
     virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE;
 
-    virtual void Activate();
+    virtual void Activate() wxOVERRIDE;
     virtual bool Destroy() wxOVERRIDE;
 
     virtual bool Show(bool show = true) wxOVERRIDE;

From 67cb0ad26043270c1fb9b9681a4d365a9e2f4d57 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 15 May 2018 18:45:37 +0200
Subject: [PATCH 534/916] Fix signed/unsigned comparison warning in
 wxAuiMDIClientWindow

This was introduced in c2fcc14bac7910d04fd9f064136fb5cd5f6fca28, see
https://github.com/wxWidgets/wxWidgets/pull/802
---
 src/aui/tabmdi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index c484d9b701..c27b6ba90b 100644
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -820,7 +820,7 @@ int wxAuiMDIClientWindow::SetSelection(size_t nPage)
 wxAuiMDIChildFrame* wxAuiMDIClientWindow::GetActiveChild()
 {
     const int sel = GetSelection();
-    if ( sel == wxNOT_FOUND || sel >= GetPageCount() )
+    if ( sel == wxNOT_FOUND || sel >= (int)GetPageCount() )
         return NULL;
 
     return wxStaticCast(GetPage(sel), wxAuiMDIChildFrame);

From 0446382e82ef1d81613bcb09d473f71d2cb3401c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 16 May 2018 15:23:00 +0200
Subject: [PATCH 535/916] Fix position of popup menus in wxGenericListCtrl

The position was off by the header height due to a missing translation
between wxGenericListCtrl and wxListMainWindow, in which the menu is
actually shown, coordinates.

Closes #18133.
---
 src/generic/listctrl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 1ea2442ffa..73773de48c 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -5467,6 +5467,12 @@ wxColour wxGenericListCtrl::GetForegroundColour() const
 bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
 {
 #if wxUSE_MENUS
+    // Coordinates here are given in this control coordinates system, but
+    // PopupMenu() wants them in the coordinates system of the window it's
+    // called on, so transform them.
+    ClientToScreen(&x, &y);
+    m_mainWin->ScreenToClient(&x, &y);
+
     return m_mainWin->PopupMenu( menu, x, y );
 #else
     return false;

From 822809ef783c2c29c1a8ee9bb52dc186c912cbb5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 17 May 2018 03:39:24 +0200
Subject: [PATCH 536/916] Stop forwarding DoPopupMenu() to wxGenericListCtrl
 main window

There doesn't seem to be anything wrong with just showing the popup menu
in this window itself and this avoids the need to do any coordinate
adjustments, which didn't work correctly for the menus shown over the
header window after the previous commit (and hadn't worked correctly for
the menus shown over the non-header area before it).

See #18133.
---
 include/wx/generic/listctrl.h |  2 --
 src/generic/listctrl.cpp      | 15 ---------------
 2 files changed, 17 deletions(-)

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 0bbe5d2cbb..6b71353fed 100644
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -211,8 +211,6 @@ protected:
     long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE;
 
 
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE;
-
     virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
 
     // return the text for the given column of the given item
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 73773de48c..1a09a29232 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -5464,21 +5464,6 @@ wxColour wxGenericListCtrl::GetForegroundColour() const
     return m_mainWin ? m_mainWin->GetForegroundColour() : wxColour();
 }
 
-bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
-{
-#if wxUSE_MENUS
-    // Coordinates here are given in this control coordinates system, but
-    // PopupMenu() wants them in the coordinates system of the window it's
-    // called on, so transform them.
-    ClientToScreen(&x, &y);
-    m_mainWin->ScreenToClient(&x, &y);
-
-    return m_mainWin->PopupMenu( menu, x, y );
-#else
-    return false;
-#endif
-}
-
 wxSize wxGenericListCtrl::DoGetBestClientSize() const
 {
     // The base class version can compute the best size in report view only.

From 610db240a8c8c36672f44e34fb0b368b983f1473 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 17 May 2018 03:59:19 +0200
Subject: [PATCH 537/916] Consider g++ ABI 1011 to be compatible with 1002 too

The changes between 1010 (which was already considered equivalent to
1002) and 1011 don't seem to affect wxWidgets and the library compiled
with g++6 can be used from the application built with g++7 without any
problems.
---
 include/wx/build.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/build.h b/include/wx/build.h
index ec4be87bda..82c38a29b5 100644
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -52,11 +52,11 @@
 // GCC and Intel C++ share same C++ ABI (and possibly others in the future),
 // check if compiler versions are compatible:
 #if defined(__GXX_ABI_VERSION)
-    // The changes between ABI versions 1002 through 1010 (documented at
+    // The changes between ABI versions 1002 through 1011 (documented at
     // https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html
     // under -fabi-version) don't affect wxWidgets, so we allow a library
     // and an application to differ within that range.
-    #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1010))
+    #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1011))
         #define wxGXX_EFFECTIVE_ABI_VERSION 1002
     #else
         #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION

From db49de9668e9ba0bc5cfec01a951de168ec58bca Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 17 May 2018 19:30:59 +0200
Subject: [PATCH 538/916] CMake: correctly detect 64bit for MinGW compilers

CMAKE_CL_64 is only defined when using the 64 bit cl compiler from Microsoft.
---
 build/cmake/init.cmake | 2 +-
 build/cmake/main.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 06256b1b1d..b22da71efb 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -59,7 +59,7 @@ if(WIN32)
         message(FATAL_ERROR "Unknown WIN32 compiler type")
     endif()
 
-    if(CMAKE_CL_64)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(wxARCH_SUFFIX "_x64")
     endif()
 else()
diff --git a/build/cmake/main.cmake b/build/cmake/main.cmake
index 79b633185f..ca761d8464 100644
--- a/build/cmake/main.cmake
+++ b/build/cmake/main.cmake
@@ -53,7 +53,7 @@ if(MSVC OR MINGW OR CYGWIN)
     else()
         set(wxREQUIRED_OS_DESC "Windows Vista / Windows Server 2008")
     endif()
-    if(CMAKE_CL_64)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         wx_string_append(wxREQUIRED_OS_DESC " (x64 Edition)")
     endif()
 elseif(APPLE AND NOT IPHONE)

From df6b47bc6d08b4e5cbe5c2def4eeca544d8f1432 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 17 May 2018 19:33:19 +0200
Subject: [PATCH 539/916] CMake: Correct header for debug builds in MinGW
 compiler

---
 build/cmake/init.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index b22da71efb..fac86758b6 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -109,7 +109,7 @@ else()
 endif()
 set(wxSETUP_HEADER_FILE ${wxSETUP_HEADER_PATH}/wx/setup.h)
 
-if(NOT wxBUILD_CUSTOM_SETUP_HEADER_PATH AND MSVC)
+if(DEFINED wxSETUP_HEADER_FILE_DEBUG)
     # Append configuration specific suffix to setup header path
     wx_string_append(wxSETUP_HEADER_PATH "$<$<CONFIG:Debug>:d>")
 endif()

From de4e20ee93c0ca36e94fbe9749fcbad25b247498 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 17 May 2018 19:34:34 +0200
Subject: [PATCH 540/916] CMake: copy missing files for widgets sample

---
 build/cmake/samples/CMakeLists.txt | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index 5916b03935..39f4df2ca3 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -189,7 +189,20 @@ if(APPLE)
     # elsewhere we just compile native.cpp directly.
     list(APPEND SAMPLE_WIDGETS_SRC native_wrapper.mm)
 endif()
-wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC} LIBRARIES adv)
+wx_list_add_prefix(WIDGETS_RC_FILES icons/
+    activityindicator.xpm bmpbtn.xpm bmpcombobox.xpm button.xpm
+    checkbox.xpm choice.xpm choicebk.xpm clrpicker.xpm
+    combobox.xpm datepick.xpm dirctrl.xpm dirpicker.xpm
+    filepicker.xpm fontpicker.xpm gauge.xpm header.xpm
+    hyperlnk.xpm listbook.xpm listbox.xpm native.xpm
+    notebook.xpm odcombobox.xpm radiobox.xpm scrolbar.xpm
+    slider.xpm spinbtn.xpm statbmp.xpm statbox.xpm
+    stattext.xpm text.xpm timepick.xpm toggle.xpm
+    )
+wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC} 
+    DATA ${WIDGETS_RC_FILES} textctrl.cpp
+    LIBRARIES adv
+    )
 wx_add_sample(wizard LIBRARIES adv DEPENDS wxUSE_WIZARDDLG)
 wx_add_sample(wrapsizer)
 

From e581b729559003bc4c050e8370699d0f42341d05 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 17 May 2018 19:42:43 +0200
Subject: [PATCH 541/916] Look in multiple paths when searching for resource
 files of samples

When using an out of source build, the files are not in the default wxWidgets directories.
Also search in the current directory, parent directory and sample sub-directories.

Closes https://trac.wxwidgets.org/ticket/18118
---
 samples/drawing/drawing.cpp  |  3 ++-
 samples/html/help/help.cpp   | 10 ++++++++--
 samples/webview/webview.cpp  | 12 +++++++++---
 samples/widgets/statbmp.cpp  |  8 +++++++-
 samples/widgets/textctrl.cpp |  1 +
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index a4c6a40a00..563a8b13a1 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -413,7 +413,8 @@ bool MyApp::LoadImages()
     pathList.Add(wxFileName(argv[0]).GetPath());
     pathList.Add(wxT("."));
     pathList.Add(wxT(".."));
-    pathList.Add(wxT("../.."));
+    pathList.Add(wxT("../drawing"));
+    pathList.Add(wxT("../../../samples/drawing"));
 
     wxString path = pathList.FindValidPath(wxT("pat4.bmp"));
     if ( !path )
diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index a3746f333a..3833ed2255 100644
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -163,10 +163,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     help.UseConfig(wxConfig::Get());
     bool ret;
     help.SetTempDir(wxT("."));
-    ret = help.AddBook(wxFileName(wxT("helpfiles/testing.hhp"), wxPATH_UNIX));
+
+    wxPathList pathlist;
+    pathlist.Add(wxT("./helpfiles"));
+    pathlist.Add(wxT("../helpfiles"));
+    pathlist.Add(wxT("../../html/help/helpfiles"));
+
+    ret = help.AddBook(wxFileName(pathlist.FindValidPath(wxT("testing.hhp")), wxPATH_UNIX));
     if (! ret)
         wxMessageBox(wxT("Failed adding book helpfiles/testing.hhp"));
-    ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX));
+    ret = help.AddBook(wxFileName(pathlist.FindValidPath(wxT("another.hhp")), wxPATH_UNIX));
     if (! ret)
         wxMessageBox(_("Failed adding book helpfiles/another.hhp"));
 }
diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
index 362f2bc60b..856169e195 100644
--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@@ -263,7 +263,7 @@ bool WebApp::OnInit()
 
     // Create the memory files
     wxImage::AddHandler(new wxPNGHandler);
-    wxMemoryFSHandler::AddFile("logo.png", 
+    wxMemoryFSHandler::AddFile("logo.png",
         wxBitmap(wxlogo_xpm), wxBITMAP_TYPE_PNG);
     wxMemoryFSHandler::AddFile("page1.htm",
         "<html><head><title>File System Example</title>"
@@ -741,7 +741,13 @@ void WebFrame::OnMode(wxCommandEvent& WXUNUSED(evt))
 
 void WebFrame::OnLoadScheme(wxCommandEvent& WXUNUSED(evt))
 {
-    wxFileName helpfile("../help/doc.zip");
+    wxPathList pathlist;
+    pathlist.Add(wxT("."));
+    pathlist.Add(wxT(".."));
+    pathlist.Add(wxT("../help"));
+    pathlist.Add(wxT("../../../samples/help"));
+
+    wxFileName helpfile(pathlist.FindValidPath(wxT("doc.zip")));
     helpfile.MakeAbsolute();
     wxString path = helpfile.GetFullPath();
     //Under MSW we need to flip the slashes
@@ -1207,7 +1213,7 @@ void WebFrame::OnSelectAll(wxCommandEvent& WXUNUSED(evt))
   * Callback invoked when a loading error occurs
   */
 void WebFrame::OnError(wxWebViewEvent& evt)
-{   
+{
 #define WX_ERROR_CASE(type) \
     case type: \
         category = #type; \
diff --git a/samples/widgets/statbmp.cpp b/samples/widgets/statbmp.cpp
index ad100b0df8..08a69c6952 100644
--- a/samples/widgets/statbmp.cpp
+++ b/samples/widgets/statbmp.cpp
@@ -90,7 +90,13 @@ void StatBmpWidgetsPage::CreateContent()
 
     wxString testImage;
 #if wxUSE_LIBPNG
-    wxFileName fn("../image/toucan.png");
+    wxPathList pathlist;
+    pathlist.Add(wxT("."));
+    pathlist.Add(wxT(".."));
+    pathlist.Add(wxT("../image"));
+    pathlist.Add(wxT("../../../samples/image"));
+
+    wxFileName fn(pathlist.FindValidPath(wxT("toucan.png")));
     if ( fn.FileExists() )
         testImage = fn.GetFullPath();
 #endif // wxUSE_LIBPNG
diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index d6e2d54f28..c89ba6ca93 100644
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -913,6 +913,7 @@ void TextWidgetsPage::OnButtonLoad(wxCommandEvent& WXUNUSED(event))
     wxPathList pathlist;
     pathlist.Add(wxT("."));
     pathlist.Add(wxT(".."));
+    pathlist.Add(wxT("../widgets"));
     pathlist.Add(wxT("../../../samples/widgets"));
 
     wxString filename = pathlist.FindValidPath(wxT("textctrl.cpp"));

From 5758832a6ee1f1b4ef6998f270bda7e19155f48c Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 17 May 2018 19:44:38 +0200
Subject: [PATCH 542/916] Fix invalid image size in wxBitmapComboBox widgets
 sample

When the wxBitmapComboBox is empty, GetBitmapSize() returns size -1,-1.
Images can not be scaled to this invalid size. Use the size of the imagelist
instead.
---
 samples/widgets/bmpcombobox.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp
index 8c00519826..f73feb8978 100644
--- a/samples/widgets/bmpcombobox.cpp
+++ b/samples/widgets/bmpcombobox.cpp
@@ -694,6 +694,8 @@ void BitmapComboBoxWidgetsPage::LoadWidgetImages( wxArrayString* strings, wxImag
 
     // Get size of existing images in list
     wxSize foundSize = m_combobox->GetBitmapSize();
+    if ( !foundSize.IsFullySpecified() )
+        foundSize = images->GetSize();
 
     for ( i=0; i<strings->size(); i++ )
     {

From c97963fce0152bab0c145ec85d5cf77b4f3cafc3 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 17 May 2018 19:49:30 +0200
Subject: [PATCH 543/916] Fix size glitch of WidgetsBookCtrl in widgets sample

The entire control is hidden until the dialog is resized.
This seems to be caused by (recent changes in) the wxPersistentManager.
This is fixed by populating the frame before restoring persistence.
(as is described in docs/doxygen/overviews/persistence.h.)
---
 samples/widgets/widgets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 2b5dfe9082..cb42f7d16e 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -381,8 +381,6 @@ bool WidgetsApp::OnInit()
 WidgetsFrame::WidgetsFrame(const wxString& title)
             : wxFrame(NULL, wxID_ANY, title)
 {
-    const bool sizeSet = wxPersistentRegisterAndRestore(this, "Main");
-
     // set the frame icon
     SetIcon(wxICON(sample));
 
@@ -514,6 +512,8 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 
     m_panel->SetSizer(sizerTop);
 
+    const bool sizeSet = wxPersistentRegisterAndRestore(this, "Main");
+
     const wxSize sizeMin = m_panel->GetBestSize();
     if ( !sizeSet )
         SetClientSize(sizeMin);

From bfe44c719b938b4d98a8ed6d9c03c92dfed9054c Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 9 Oct 2016 20:03:41 +0200
Subject: [PATCH 544/916] Do not let wxHeaderCtrl determine the minimum width

The minimum width will always be equal to the current size of the parent window (from wxGetClientRect).
As a result, controls using wxHeaderCtrl can never be shrunk (e.g. using SetSizeHints).
Problem is visible when a wxDataViewCtrl gets a lower DPI. The new minimum size is equal to the current size.
---
 src/msw/headerctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msw/headerctrl.cpp b/src/msw/headerctrl.cpp
index 1694a8e288..966f6b04e5 100644
--- a/src/msw/headerctrl.cpp
+++ b/src/msw/headerctrl.cpp
@@ -195,7 +195,7 @@ wxSize wxHeaderCtrl::DoGetBestSize() const
         return wxControl::DoGetBestSize();
     }
 
-    return wxSize(wpos.cx, wpos.cy);
+    return wxSize(wxDefaultCoord, wpos.cy);
 }
 
 // ----------------------------------------------------------------------------

From e99af740d9633d803befe4fb17912385fb101549 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 28 Apr 2017 23:04:46 +0200
Subject: [PATCH 545/916] Make wxArtProvider icon size hints DPI aware

---
 src/msw/artmsw.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/msw/artmsw.cpp b/src/msw/artmsw.cpp
index 7c9e9894eb..eb7a6c4ec8 100644
--- a/src/msw/artmsw.cpp
+++ b/src/msw/artmsw.cpp
@@ -280,11 +280,11 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
 {
     if ( client == wxART_TOOLBAR )
     {
-        return wxSize(24, 24);
+        return wxWindow::FromDIP(wxSize(24, 24), NULL);
     }
     else if ( client == wxART_MENU )
     {
-        return wxSize(16, 16);
+        return wxWindow::FromDIP(wxSize(16, 16), NULL);
     }
     else if ( client == wxART_FRAME_ICON )
     {
@@ -299,11 +299,11 @@ wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
     }
     else if (client == wxART_BUTTON)
     {
-        return wxSize(16, 16);
+        return wxWindow::FromDIP(wxSize(16, 16), NULL);
     }
     else if (client == wxART_LIST)
     {
-        return wxSize(16, 16);
+        return wxWindow::FromDIP(wxSize(16, 16), NULL);
     }
 
     return wxDefaultSize;

From 0445b3eddda6c710480b9aac388c44c511e39864 Mon Sep 17 00:00:00 2001
From: Jeff Bland <jeff.bland@fove-inc.com>
Date: Fri, 18 May 2018 06:50:58 -0600
Subject: [PATCH 546/916] Fix extraneous parens warning

---
 src/common/imagbmp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 200c4ea6c0..41e9e86dee 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -129,7 +129,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
               (format == wxBMP_8BPP_RED) || (format == wxBMP_8BPP_PALETTE) )
     {
         // need to set a wxPalette to use this, HOW TO CHECK IF VALID, SIZE?
-        if ((format == wxBMP_8BPP_PALETTE)
+        if (format == wxBMP_8BPP_PALETTE
 #if wxUSE_PALETTE
                 && !image->HasPalette()
 #endif // wxUSE_PALETTE

From a3363cbbfbf7be2121356437d322c4698647314d Mon Sep 17 00:00:00 2001
From: Jeff Bland <jeff.bland@fove-inc.com>
Date: Fri, 18 May 2018 06:51:40 -0600
Subject: [PATCH 547/916] Fix use of wxDateTime without check for
 wxUSE_DATETIME

---
 src/osx/cocoa/utils_base.mm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/osx/cocoa/utils_base.mm b/src/osx/cocoa/utils_base.mm
index 2e77ca9430..588392590b 100644
--- a/src/osx/cocoa/utils_base.mm
+++ b/src/osx/cocoa/utils_base.mm
@@ -159,6 +159,7 @@ wxString wxGetOsDescription()
 }
 
 /* static */
+#if wxUSE_DATETIME
 bool wxDateTime::GetFirstWeekDay(wxDateTime::WeekDay *firstDay)
 {
     wxCHECK_MSG( firstDay, false, wxS("output parameter must be non-null") );
@@ -169,3 +170,4 @@ bool wxDateTime::GetFirstWeekDay(wxDateTime::WeekDay *firstDay)
     *firstDay = wxDateTime::WeekDay(([calendar firstWeekday] - 1) % 7);
     return true;
 }
+#endif // wxUSE_DATETIME

From 26715a1fe03da2c487664a6d6c1090560764419b Mon Sep 17 00:00:00 2001
From: Jeff Bland <jeff.bland@fove-inc.com>
Date: Fri, 18 May 2018 06:52:13 -0600
Subject: [PATCH 548/916] Fix warning with missing override

---
 include/wx/apptrait.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 51168eb5d6..f93b90a621 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -194,7 +194,7 @@ class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits
 {
 public:
 #if !wxUSE_CONSOLE_EVENTLOOP
-    virtual wxEventLoopBase *CreateEventLoop() { return NULL; }
+    virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE { return NULL; }
 #endif // !wxUSE_CONSOLE_EVENTLOOP
 
 #if wxUSE_LOG

From 8b18bbb9c72c4f75f6ec6f88c3e09b33e65e9c71 Mon Sep 17 00:00:00 2001
From: Jeff Bland <jeff.bland@fove-inc.com>
Date: Fri, 18 May 2018 06:52:52 -0600
Subject: [PATCH 549/916] Fix uses of wxPalette without check for wxUSE_PALETTE

---
 include/wx/dcgraph.h      | 3 +++
 include/wx/gtk/dcclient.h | 3 +++
 src/common/dcgraph.cpp    | 2 ++
 src/gtk/dcclient.cpp      | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index ce26481310..f9ac7461dd 100644
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -83,7 +83,10 @@ public:
     virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
     virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
     virtual void SetBackgroundMode(int mode) wxOVERRIDE;
+
+#if wxUSE_PALETTE
     virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
+#endif
 
     virtual void DestroyClippingRegion() wxOVERRIDE;
 
diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index d4f09a984d..7911b74274 100644
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -86,7 +86,10 @@ public:
     virtual void SetTextForeground( const wxColour &col ) wxOVERRIDE;
     virtual void SetTextBackground( const wxColour &col ) wxOVERRIDE;
     virtual void SetBackgroundMode( int mode ) wxOVERRIDE;
+
+#if wxUSE_PALETTE
     virtual void SetPalette( const wxPalette& palette ) wxOVERRIDE;
+#endif
 
     virtual void DestroyClippingRegion() wxOVERRIDE;
 
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 1278a15249..6eafed2622 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -457,10 +457,12 @@ void* wxGCDCImpl::GetHandle() const
     return cgctx;
 }
 
+#if wxUSE_PALETTE
 void wxGCDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
 {
 
 }
+#endif
 
 void wxGCDCImpl::SetBackgroundMode( int mode )
 {
diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 58b8d2f469..0f29c219f5 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1863,10 +1863,12 @@ void wxWindowDCImpl::SetBackgroundMode( int mode )
     m_backgroundMode = mode;
 }
 
+#if wxUSE_PALETTE
 void wxWindowDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
 {
     wxFAIL_MSG( wxT("wxWindowDCImpl::SetPalette not implemented") );
 }
+#endif
 
 void wxWindowDCImpl::UpdateClipBox()
 {

From ffb44a2f3898c0abbbb885c4c33455083e5c2f27 Mon Sep 17 00:00:00 2001
From: Jeff Bland <jeff.bland@fove-inc.com>
Date: Fri, 18 May 2018 06:53:30 -0600
Subject: [PATCH 550/916] Fix use of RECT in wxClientDisplayRect without
 including windows headers

---
 src/msw/display.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 961350a4cf..3256c65cbc 100644
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
+#include "wx/msw/wrapwin.h"
+
 #if wxUSE_DISPLAY
 
 #include "wx/display.h"
@@ -38,7 +40,6 @@
 #include "wx/sysopt.h"
 
 #include "wx/display_impl.h"
-#include "wx/msw/wrapwin.h"
 #include "wx/msw/missing.h"
 #include "wx/msw/private.h"
 #include "wx/msw/private/hiddenwin.h"

From fbf319641e56765d998e23a1eb09053a88071fed Mon Sep 17 00:00:00 2001
From: Jeff Bland <jeff.bland@fove-inc.com>
Date: Fri, 18 May 2018 14:01:02 -0600
Subject: [PATCH 551/916] Fix monolithic build in cmake (wxBUILD_MONOLITHIC)

- Functions that set wxMONO_* vars need to set them in parent scope, from macros instead of functions (functions would need grandparent scope)
- Fix a conflict with xml library linking Mono which made core include the wrong png headers
- Fix setting of NOPCH on windows to go through the wx_lib_compile_definitions instead of target_compile_definitions so it carries to monolithic build
- Allow use of precompiled header in MSVC via calling wx_finalize_lib(mono)
- Introduce wxMONO_NONCOMPILED_CPP_FILES to deal with set_source_files_properties only applying within the current CMakeLists file
- Fix demos building against monolithic library by using wx_exe_link_libraries instead of target_link_libraries (similar to what the tests already do)

Closes #18074
---
 build/cmake/demos/CMakeLists.txt |   2 +-
 build/cmake/functions.cmake      | 103 +++++++++++++++++--------------
 build/cmake/lib/CMakeLists.txt   |  12 +++-
 3 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/build/cmake/demos/CMakeLists.txt b/build/cmake/demos/CMakeLists.txt
index e8f7f7d412..fe4637bb2f 100644
--- a/build/cmake/demos/CMakeLists.txt
+++ b/build/cmake/demos/CMakeLists.txt
@@ -35,7 +35,7 @@ function(wx_add_demo name)
     if(wxBUILD_SHARED)
         target_compile_definitions(${DEMO_NAME} PRIVATE WXUSINGDLL)
     endif()
-    target_link_libraries(${DEMO_NAME} core ${DEMO_LIBRARIES})
+    wx_exe_link_libraries(${DEMO_NAME} core ${DEMO_LIBRARIES})
     wx_set_common_target_properties(${DEMO_NAME})
     set_target_properties(${DEMO_NAME} PROPERTIES FOLDER "Demos")
     set_target_properties(${DEMO_NAME} PROPERTIES
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index f0edeac4c3..e70cf91763 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -20,19 +20,24 @@ include(CMakePrintHelpers)
 
 # This function adds a list of headers to a variable while prepending
 # include/ to the path
-function(wx_add_headers src_var)
+macro(wx_add_headers src_var)
     set(headers)
-    list(REMOVE_AT ARGV 0)
-    foreach(header ${ARGV})
+    foreach(header ${ARGN})
         list(APPEND headers ${wxSOURCE_DIR}/include/${header})
         if(header MATCHES "\\.cpp$")
             # .cpp files in include directory should not be compiled
-            set_source_files_properties(${wxSOURCE_DIR}/include/${header}
-                PROPERTIES HEADER_FILE_ONLY TRUE)
+            if (wxBUILD_MONOLITHIC)
+                # set_source_files_properties only works within the same CMakeLists.txt
+                list(APPEND wxMONO_NONCOMPILED_CPP_FILES ${wxSOURCE_DIR}/include/${header})
+                set(wxMONO_NONCOMPILED_CPP_FILES ${wxMONO_NONCOMPILED_CPP_FILES} PARENT_SCOPE)
+            else()
+                set_source_files_properties(${wxSOURCE_DIR}/include/${header}
+                    PROPERTIES HEADER_FILE_ONLY TRUE)
+            endif()
         endif()
     endforeach()
-    set(${src_var} ${${src_var}} ${headers} PARENT_SCOPE)
-endfunction()
+    list(APPEND ${src_var} ${headers})
+endmacro()
 
 # Add sources from a ..._SRC variable and headers from a ..._HDR
 macro(wx_append_sources src_var source_base_name)
@@ -269,45 +274,45 @@ endfunction()
 # first parameter is the name of the library
 # if the second parameter is set to IS_BASE a non UI lib is created
 # all additional parameters are source files for the library
-function(wx_add_library name)
+macro(wx_add_library name)
     cmake_parse_arguments(wxADD_LIBRARY "IS_BASE" "" "" ${ARGN})
     set(src_files ${wxADD_LIBRARY_UNPARSED_ARGUMENTS})
 
-    if(wxBUILD_MONOLITHIC AND NOT name STREQUAL "mono")
+    if(wxBUILD_MONOLITHIC AND NOT ${name} STREQUAL "mono")
         # collect all source files for mono library
         set(wxMONO_SRC_FILES ${wxMONO_SRC_FILES} ${src_files} PARENT_SCOPE)
-        return()
-    endif()
-
-    if(wxBUILD_PRECOMP AND MSVC)
-        # Add dummy source file to be used by cotire for PCH creation
-        list(INSERT src_files 0 "${wxSOURCE_DIR}/src/common/dummy.cpp")
-    endif()
-    list(APPEND src_files ${wxSETUP_HEADER_FILE})
-
-    if(wxBUILD_SHARED)
-        set(wxBUILD_LIB_TYPE SHARED)
-        if(WIN32)
-            # Add WIN32 version information
-            list(APPEND src_files "${wxSOURCE_DIR}/src/msw/version.rc" "${wxSOURCE_DIR}/include/wx/msw/genrcdefs.h")
-        endif()
     else()
-        set(wxBUILD_LIB_TYPE STATIC)
+
+        if(wxBUILD_PRECOMP AND MSVC)
+            # Add dummy source file to be used by cotire for PCH creation
+            list(INSERT src_files 0 "${wxSOURCE_DIR}/src/common/dummy.cpp")
+        endif()
+        list(APPEND src_files ${wxSETUP_HEADER_FILE})
+
+        if(wxBUILD_SHARED)
+            set(wxBUILD_LIB_TYPE SHARED)
+            if(WIN32)
+                # Add WIN32 version information
+                list(APPEND src_files "${wxSOURCE_DIR}/src/msw/version.rc" "${wxSOURCE_DIR}/include/wx/msw/genrcdefs.h")
+            endif()
+        else()
+            set(wxBUILD_LIB_TYPE STATIC)
+        endif()
+
+        add_library(${name} ${wxBUILD_LIB_TYPE} ${src_files})
+        wx_set_target_properties(${name} ${wxADD_LIBRARY_IS_BASE})
+
+        # Setup install
+        wx_install(TARGETS ${name}
+            LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}"
+            ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}"
+            RUNTIME DESTINATION "lib${wxPLATFORM_LIB_DIR}"
+            BUNDLE DESTINATION Applications/wxWidgets
+            )
+
+        list(APPEND wxLIB_TARGETS ${name})
     endif()
-
-    add_library(${name} ${wxBUILD_LIB_TYPE} ${src_files})
-    wx_set_target_properties(${name} ${wxADD_LIBRARY_IS_BASE})
-
-    # Setup install
-    wx_install(TARGETS ${name}
-        LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}"
-        ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}"
-        RUNTIME DESTINATION "lib${wxPLATFORM_LIB_DIR}"
-        BUNDLE DESTINATION Applications/wxWidgets
-        )
-
-    set(wxLIB_TARGETS ${wxLIB_TARGETS} ${name} PARENT_SCOPE)
-endfunction()
+endmacro()
 
 # Enable cotire for target if precompiled headers are enabled
 macro(wx_target_enable_precomp target_name)
@@ -336,13 +341,15 @@ endmacro()
 # Enable precompiled headers for wx libraries
 macro(wx_finalize_lib target_name)
     set(wxLIB_TARGETS ${wxLIB_TARGETS} PARENT_SCOPE)
-    if(wxBUILD_PRECOMP AND TARGET ${target_name})
-        target_compile_definitions(${target_name} PRIVATE WX_PRECOMP)
-        set_target_properties(${target_name} PROPERTIES
-            COTIRE_CXX_PREFIX_HEADER_INIT "${wxSOURCE_DIR}/include/wx/wxprec.h")
-        wx_target_enable_precomp(${target_name})
+    if(wxBUILD_PRECOMP)
+        if(TARGET ${target_name})
+            target_compile_definitions(${target_name} PRIVATE WX_PRECOMP)
+            set_target_properties(${target_name} PROPERTIES
+                COTIRE_CXX_PREFIX_HEADER_INIT "${wxSOURCE_DIR}/include/wx/wxprec.h")
+            wx_target_enable_precomp(${target_name})
+        endif()
     elseif(MSVC)
-        target_compile_definitions(${target_name} PRIVATE NOPCH)
+        wx_lib_compile_definitions(${target_name} PRIVATE NOPCH)
     endif()
 endmacro()
 
@@ -354,6 +361,8 @@ macro(wx_lib_link_libraries name)
         cmake_parse_arguments(_LIB_LINK "" "" "PUBLIC;PRIVATE" ${ARGN})
         list(APPEND wxMONO_LIBS_PUBLIC ${_LIB_LINK_PUBLIC})
         list(APPEND wxMONO_LIBS_PRIVATE ${_LIB_LINK_PRIVATE})
+        set(wxMONO_LIBS_PUBLIC ${wxMONO_LIBS_PUBLIC} PARENT_SCOPE)
+        set(wxMONO_LIBS_PRIVATE ${wxMONO_LIBS_PRIVATE} PARENT_SCOPE)
     else()
         target_link_libraries(${name};${ARGN})
     endif()
@@ -377,6 +386,8 @@ macro(wx_lib_include_directories name)
         cmake_parse_arguments(_LIB_INCLUDE_DIRS "" "" "PUBLIC;PRIVATE" ${ARGN})
         list(APPEND wxMONO_INCLUDE_DIRS_PUBLIC ${_LIB_INCLUDE_DIRS_PUBLIC})
         list(APPEND wxMONO_INCLUDE_DIRS_PRIVATE ${_LIB_INCLUDE_DIRS_PRIVATE})
+        set(wxMONO_INCLUDE_DIRS_PUBLIC ${wxMONO_INCLUDE_DIRS_PUBLIC} PARENT_SCOPE)
+        set(wxMONO_INCLUDE_DIRS_PRIVATE ${wxMONO_INCLUDE_DIRS_PRIVATE} PARENT_SCOPE)
     else()
         target_include_directories(${name};BEFORE;${ARGN})
     endif()
@@ -390,6 +401,8 @@ macro(wx_lib_compile_definitions name)
         cmake_parse_arguments(_LIB_DEFINITIONS "" "" "PUBLIC;PRIVATE" ${ARGN})
         list(APPEND wxMONO_DEFINITIONS_PUBLIC ${_LIB_DEFINITIONS_PUBLIC})
         list(APPEND wxMONO_DEFINITIONS_PRIVATE ${_LIB_DEFINITIONS_PRIVATE})
+        set(wxMONO_DEFINITIONS_PUBLIC ${wxMONO_DEFINITIONS_PUBLIC} PARENT_SCOPE)
+        set(wxMONO_DEFINITIONS_PRIVATE ${wxMONO_DEFINITIONS_PRIVATE} PARENT_SCOPE)
     else()
         target_compile_definitions(${name};${ARGN})
     endif()
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 45a7696d01..4f8fc884c2 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -17,6 +17,7 @@ if(wxBUILD_MONOLITHIC)
     set(wxMONO_LIBS_PUBLIC)
     set(wxMONO_INCLUDE_DIRS_PRIVATE)
     set(wxMONO_INCLUDE_DIRS_PUBLIC)
+    set(wxMONO_NONCOMPILED_CPP_FILES)
 endif()
 
 # Define third party libraries
@@ -39,7 +40,6 @@ endmacro()
 # Define base libraries
 set(LIBS base)
 add_opt_lib(net wxUSE_SOCKETS)
-add_opt_lib(xml wxUSE_XML)
 
 # Define UI libraries
 if(wxUSE_GUI)
@@ -62,6 +62,12 @@ if(wxUSE_GUI)
     add_opt_lib(qa wxUSE_DEBUGREPORT)
 endif() # wxUSE_GUI
 
+# Include XML library last
+# In the monolithic build, where all target properties (include dirs) from different targets are concatenated,
+# wxml might include system expat, which might use Mono, which has it's own copy of png.
+# Thus to ensure wx's core library includes the right png class, core must be processed first before xml
+add_opt_lib(xml wxUSE_XML)
+
 # Include cmake file for every library
 foreach(LIB ${LIBS})
     add_subdirectory(${LIB})
@@ -87,6 +93,10 @@ if(wxBUILD_MONOLITHIC)
             target_compile_definitions(mono ${vis} ${wxMONO_DEFINITIONS_${vis}})
         endif()
     endforeach()
+    foreach(file ${wxMONO_NONCOMPILED_CPP_FILES})
+        set_source_files_properties(${file} PROPERTIES HEADER_FILE_ONLY TRUE)
+    endforeach()
+    wx_finalize_lib(mono)
 endif()
 
 # Propagate variable(s) to parent scope

From 8401d3fec99b44812ad2bb248b1f707f0b40bdd2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 17 May 2018 03:42:17 +0200
Subject: [PATCH 552/916] Fix coordinates adjustment for wxGenericListCtrl
 mouse events

wxListHeaderWindow event coordinates don't need to be adjusted, as it's
positioned at (0, 0) of its parent window anyhow, but wxListMainWindow
events do need to be adjusted to use the parent window coordinates, as
it's the only window that should be seen by the outside code -- and also
for consistency with the native MSW version.

This corrects the changes originally done in
651d7a1ff84fabae7da9455c4fcf81f3b83f7c9a

See #18133.
---
 src/generic/listctrl.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 1a09a29232..db4e1fd70a 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1366,13 +1366,6 @@ bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos)
     wxListEvent le( type, parent->GetId() );
     le.SetEventObject( parent );
     le.m_pointDrag = pos;
-
-    // the position should be relative to the parent window, not
-    // this one for compatibility with MSW and common sense: the
-    // user code doesn't know anything at all about this header
-    // window, so why should it get positions relative to it?
-    le.m_pointDrag.y -= GetSize().y;
-
     le.m_col = m_column;
     return !parent->GetEventHandler()->ProcessEvent( le ) || le.IsAllowed();
 }
@@ -2220,7 +2213,13 @@ void wxListMainWindow::SendNotify( size_t line,
 
     // set only for events which have position
     if ( point != wxDefaultPosition )
-        le.m_pointDrag = point;
+    {
+        // the position should be relative to the parent window, not
+        // this one for compatibility with MSW and common sense: the
+        // user code doesn't know anything at all about this window,
+        // so why should it get positions relative to it?
+        le.m_pointDrag = GetPosition() + point;
+    }
 
     // don't try to get the line info for virtual list controls: the main
     // program has it anyhow and if we did it would result in accessing all

From d9d5e1d5f7c315e28bd6599a733f9f541a39686c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 20 May 2018 17:57:17 +0200
Subject: [PATCH 553/916] Remove unused
 wxDEFINE_SCOPED_PTR_TYPE(wxTarHeaderBlock)

wxTarHeaderBlockPtr defined by this macro was never used, so just remove
it.
---
 src/common/tarstrm.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index f080e759de..a38e3f0715 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -155,8 +155,6 @@ private:
     static void check();
 };
 
-wxDEFINE_SCOPED_PTR_TYPE(wxTarHeaderBlock)
-
 // A table giving the field names and offsets in a tar header block
 const wxTarField wxTarHeaderBlock::fields[] =
 {

From 58e6355695e7852864aec255cab539c4ad3d77b7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 20 May 2018 17:58:09 +0200
Subject: [PATCH 554/916] Rename wxTarEntryPtr_ to wxTarEntryPtr

Remove the unusual underscore at the end of the type and use a single
wxDEFINE_SCOPED_PTR_TYPE() macro instead of 2 of them to simplify code.
---
 src/common/tarstrm.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index a38e3f0715..b8820febd6 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -639,8 +639,7 @@ void wxTarEntry::SetMode(int mode)
 /////////////////////////////////////////////////////////////////////////////
 // Input stream
 
-wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_)
-wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_)
+wxDEFINE_SCOPED_PTR_TYPE(wxTarEntry)
 
 wxTarInputStream::wxTarInputStream(wxInputStream& stream,
                                    wxMBConv& conv /*=wxConvLocal*/)
@@ -683,7 +682,7 @@ wxTarEntry *wxTarInputStream::GetNextEntry()
     if (!IsOk())
         return NULL;
 
-    wxTarEntryPtr_ entry(new wxTarEntry);
+    wxTarEntryPtr entry(new wxTarEntry);
 
     entry->SetMode(GetHeaderNumber(TAR_MODE));
     entry->SetUserId(GetHeaderNumber(TAR_UID));
@@ -1099,7 +1098,7 @@ wxTarOutputStream::~wxTarOutputStream()
 
 bool wxTarOutputStream::PutNextEntry(wxTarEntry *entry)
 {
-    wxTarEntryPtr_ e(entry);
+    wxTarEntryPtr e(entry);
 
     if (!CloseEntry())
         return false;

From d8200f109617c0434b6aaba7afa3cefa48c549e3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 20 May 2018 17:59:20 +0200
Subject: [PATCH 555/916] Remove unused wxTarHeaderBlock copy ctor

These objects are never copied, and if they were, the default
(compiler-generated) copy ctor would do the same thing this explicitly
defined copy ctor did, so just remove it.
---
 src/common/tarstrm.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index b8820febd6..247bcc3b18 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -129,8 +129,6 @@ class wxTarHeaderBlock
 public:
     wxTarHeaderBlock()
         { memset(data, 0, sizeof(data)); }
-    wxTarHeaderBlock(const wxTarHeaderBlock& hb)
-        { memcpy(data, hb.data, sizeof(data)); }
 
     bool Read(wxInputStream& in);
     bool Write(wxOutputStream& out);

From e54ec6c1915867416b0fd3600809a0ddcbaac331 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 20 May 2018 18:05:16 +0200
Subject: [PATCH 556/916] Add wxTarHeaderBlock::Clear() method encapsulating
 memset()

Using memset() with objects of (non-trivial) class type results in a
-Wclass-memaccess warning with g++ 8, so avoid doing this.

Add a Clear() method allowing to do the same thing without breaking
encapsulation.
---
 src/common/tarstrm.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index 247bcc3b18..f2f7109f28 100644
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -128,7 +128,9 @@ class wxTarHeaderBlock
 {
 public:
     wxTarHeaderBlock()
-        { memset(data, 0, sizeof(data)); }
+        { Clear(); }
+
+    void Clear(size_t len = 0) { memset(data, 0, len ? len : sizeof(data)); }
 
     bool Read(wxInputStream& in);
     bool Write(wxOutputStream& out);
@@ -1186,7 +1188,7 @@ bool wxTarOutputStream::CloseEntry()
     if (IsOk()) {
         wxFileOffset size = RoundUpSize(m_pos);
         if (size > m_pos) {
-            memset(m_hdr, 0, size - m_pos);
+            m_hdr->Clear(size - m_pos);
             m_parent_o_stream->Write(m_hdr, size - m_pos);
             m_lasterror = m_parent_o_stream->GetLastError();
         }
@@ -1210,7 +1212,7 @@ bool wxTarOutputStream::Close()
     if (!CloseEntry() || (m_tarsize == 0 && m_endrecWritten))
         return false;
 
-    memset(m_hdr, 0, sizeof(*m_hdr));
+    m_hdr->Clear();
     int count = (RoundUpSize(m_tarsize + 2 * TAR_BLOCKSIZE, m_BlockingFactor)
                     - m_tarsize) / TAR_BLOCKSIZE;
     while (count--)
@@ -1225,7 +1227,7 @@ bool wxTarOutputStream::Close()
 
 bool wxTarOutputStream::WriteHeaders(wxTarEntry& entry)
 {
-    memset(m_hdr, 0, sizeof(*m_hdr));
+    m_hdr->Clear();
 
     SetHeaderPath(entry.GetName(wxPATH_UNIX));
 
@@ -1271,7 +1273,7 @@ bool wxTarOutputStream::WriteHeaders(wxTarEntry& entry)
         // so prepare a regular header block for the pseudo-file.
         if (!m_hdr2)
             m_hdr2 = new wxTarHeaderBlock;
-        memset(m_hdr2, 0, sizeof(*m_hdr2));
+        m_hdr2->Clear();
 
         // an old tar that doesn't understand extended headers will
         // extract it as a file, so give these fields reasonable values

From c0b0562533609e453b2b0dae25c0780e477b768b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 20 May 2018 18:43:16 +0200
Subject: [PATCH 557/916] Avoid many -Wparentheses warnings from gtk/gtk.h with
 gcc8

Add wx/gtk/private/wrapgtk.h wrapping gtk/gtk.h in pragmas disabling
these warnings and include it everywhere instead of directly including
gtk/gtk.h.

Also include wx/gtk/private/gtk2-compat.h from this wrapper header as it
was included by 90% of the files including gtk/gtk.h itself and it seems
to be better and simpler to just always include it.
---
 include/wx/gtk/private.h               |  3 +--
 include/wx/gtk/private/addremovectrl.h |  2 +-
 include/wx/gtk/private/wrapgtk.h       | 19 +++++++++++++++++++
 include/wx/nativewin.h                 |  2 --
 samples/widgets/native.cpp             |  2 ++
 src/aui/dockart.cpp                    |  7 +------
 src/aui/framemanager.cpp               |  3 +--
 src/aui/tabartgtk.cpp                  |  2 --
 src/common/popupcmn.cpp                |  7 +------
 src/common/utilscmn.cpp                |  2 +-
 src/generic/graphicc.cpp               |  2 +-
 src/generic/splash.cpp                 |  2 +-
 src/generic/statusbr.cpp               |  2 --
 src/gtk/aboutdlg.cpp                   |  2 --
 src/gtk/activityindicator.cpp          |  3 +--
 src/gtk/animate.cpp                    |  2 --
 src/gtk/anybutton.cpp                  |  3 +--
 src/gtk/app.cpp                        |  1 -
 src/gtk/artgtk.cpp                     |  1 -
 src/gtk/assertdlg_gtk.cpp              |  4 +---
 src/gtk/bitmap.cpp                     |  2 --
 src/gtk/bmpcbox.cpp                    |  1 -
 src/gtk/button.cpp                     |  2 --
 src/gtk/calctrl.cpp                    |  2 +-
 src/gtk/checkbox.cpp                   |  3 +--
 src/gtk/checklst.cpp                   |  1 -
 src/gtk/choice.cpp                     |  2 --
 src/gtk/clrpicker.cpp                  |  2 +-
 src/gtk/collpane.cpp                   |  2 --
 src/gtk/colordlg.cpp                   |  2 --
 src/gtk/combobox.cpp                   |  2 --
 src/gtk/control.cpp                    |  1 -
 src/gtk/cursor.cpp                     |  3 +--
 src/gtk/dataview.cpp                   |  2 --
 src/gtk/dc.cpp                         |  2 +-
 src/gtk/dcmemory.cpp                   |  2 +-
 src/gtk/dcscreen.cpp                   |  2 +-
 src/gtk/dialog.cpp                     |  3 +--
 src/gtk/display.cpp                    |  3 +--
 src/gtk/dnd.cpp                        |  3 +--
 src/gtk/evtloop.cpp                    |  3 +--
 src/gtk/filedlg.cpp                    |  1 -
 src/gtk/filehistory.cpp                |  4 +---
 src/gtk/filepicker.cpp                 |  1 -
 src/gtk/frame.cpp                      |  3 +--
 src/gtk/gauge.cpp                      |  2 +-
 src/gtk/glcanvas.cpp                   |  3 +--
 src/gtk/hyperlink.cpp                  |  1 -
 src/gtk/listbox.cpp                    |  5 ++---
 src/gtk/menu.cpp                       |  2 --
 src/gtk/mimetype.cpp                   |  3 +--
 src/gtk/minifram.cpp                   |  3 +--
 src/gtk/msgdlg.cpp                     |  1 -
 src/gtk/nativewin.cpp                  |  3 +--
 src/gtk/nonownedwnd.cpp                |  3 +--
 src/gtk/notebook.cpp                   |  2 --
 src/gtk/popupwin.cpp                   |  2 +-
 src/gtk/print.cpp                      |  3 +--
 src/gtk/private.cpp                    |  1 -
 src/gtk/radiobox.cpp                   |  5 ++---
 src/gtk/radiobut.cpp                   |  2 --
 src/gtk/renderer.cpp                   |  2 --
 src/gtk/scrolwin.cpp                   |  3 +--
 src/gtk/settings.cpp                   |  3 +--
 src/gtk/slider.cpp                     |  3 +--
 src/gtk/spinbutt.cpp                   |  2 +-
 src/gtk/spinctrl.cpp                   |  2 --
 src/gtk/statbmp.cpp                    |  2 +-
 src/gtk/statbox.cpp                    |  3 +--
 src/gtk/statline.cpp                   |  3 +--
 src/gtk/stattext.cpp                   |  1 -
 src/gtk/taskbar.cpp                    |  3 +--
 src/gtk/textctrl.cpp                   |  2 --
 src/gtk/textentry.cpp                  |  2 --
 src/gtk/tglbtn.cpp                     |  1 -
 src/gtk/timer.cpp                      |  2 +-
 src/gtk/toolbar.cpp                    |  2 --
 src/gtk/toplevel.cpp                   | 10 ++++------
 src/gtk/utilsgtk.cpp                   |  4 +---
 src/gtk/win_gtk.cpp                    |  7 +------
 src/gtk/window.cpp                     |  5 ++---
 src/unix/mediactrl.cpp                 |  3 +--
 src/unix/mediactrl_gstplayer.cpp       |  3 +--
 src/unix/taskbarx11.cpp                |  2 +-
 src/unix/uiactionx11.cpp               |  2 +-
 src/unix/utilsx11.cpp                  |  5 +----
 86 files changed, 79 insertions(+), 164 deletions(-)
 create mode 100644 include/wx/gtk/private/wrapgtk.h

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 4c52f53c50..ce6efd5ad8 100644
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -11,10 +11,9 @@
 #ifndef _WX_GTK_PRIVATE_H_
 #define _WX_GTK_PRIVATE_H_
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 #include "wx/gtk/private/string.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 #ifndef G_VALUE_INIT
     // introduced in GLib 2.30
diff --git a/include/wx/gtk/private/addremovectrl.h b/include/wx/gtk/private/addremovectrl.h
index bce4061df5..a790c6e674 100644
--- a/include/wx/gtk/private/addremovectrl.h
+++ b/include/wx/gtk/private/addremovectrl.h
@@ -14,7 +14,7 @@
 #include "wx/bmpbuttn.h"
 #include "wx/toolbar.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 // ----------------------------------------------------------------------------
 // wxAddRemoveImpl
diff --git a/include/wx/gtk/private/wrapgtk.h b/include/wx/gtk/private/wrapgtk.h
new file mode 100644
index 0000000000..186e71ce11
--- /dev/null
+++ b/include/wx/gtk/private/wrapgtk.h
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/wrapgtk.h
+// Purpose:     Include gtk/gtk.h without warnings and with compatibility
+// Author:      Vadim Zeitlin
+// Created:     2018-05-20
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_WRAPGTK_H_
+#define _WX_GTK_PRIVATE_WRAPGTK_H_
+
+wxGCC_WARNING_SUPPRESS(parentheses)
+#include <gtk/gtk.h>
+wxGCC_WARNING_RESTORE(parentheses)
+
+#include "wx/gtk/private/gtk2-compat.h"
+
+#endif // _WX_GTK_PRIVATE_WRAPGTK_H_
diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h
index bf585d5796..ebde3ded93 100644
--- a/include/wx/nativewin.h
+++ b/include/wx/nativewin.h
@@ -38,8 +38,6 @@
     typedef HWND wxNativeContainerWindowHandle;
     typedef HWND wxNativeWindowHandle;
 #elif defined(__WXGTK__)
-    #include <gtk/gtk.h>
-
     // GdkNativeWindow is guint32 under GDK/X11 and gpointer under GDK/WIN32
     #ifdef __UNIX__
         typedef unsigned long wxNativeContainerWindowId;
diff --git a/samples/widgets/native.cpp b/samples/widgets/native.cpp
index 030b8f8c40..2bf606ac46 100644
--- a/samples/widgets/native.cpp
+++ b/samples/widgets/native.cpp
@@ -143,6 +143,8 @@ protected:
 
 #elif defined(__WXGTK__)
 
+#include <gtk/gtk.h>
+
 class NativeWindow : public wxNativeWindow
 {
 public:
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 0d4e2b7167..bc9e014bb3 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -42,13 +42,8 @@
 #endif
 
 #ifdef __WXGTK__
-#include <gtk/gtk.h>
 #include "wx/renderer.h"
-#ifdef __WXGTK20__
-   #include "wx/gtk/private/gtk2-compat.h"
-#else
-   #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
-#endif
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef __WXGTK3__
     #include "wx/graphics.h"
     #include "wx/gtk/private.h"
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 87c4c37542..b409771f18 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -222,8 +222,7 @@ wxEND_EVENT_TABLE()
 #else
   // __WXGTK20__
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 static void
 gtk_pseudo_window_realized_callback( GtkWidget *m_widget, void *WXUNUSED(win) )
diff --git a/src/aui/tabartgtk.cpp b/src/aui/tabartgtk.cpp
index 0c795f51eb..419ff06eea 100644
--- a/src/aui/tabartgtk.cpp
+++ b/src/aui/tabartgtk.cpp
@@ -36,8 +36,6 @@
 #include "wx/gtk/dc.h"
 #include "wx/gtk/private.h"
 
-#include <gtk/gtk.h>
-
 #include "wx/aui/auibook.h"
 #include "wx/aui/tabartgtk.h"
 #include "wx/renderer.h"
diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 1c71502574..f05fc5e97c 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -42,12 +42,7 @@
 #endif // __WXUNIVERSAL__
 
 #ifdef __WXGTK__
-    #include <gtk/gtk.h>
-    #if GTK_CHECK_VERSION(2,0,0)
-        #include "wx/gtk/private/gtk2-compat.h"
-    #else
-        #define gtk_widget_get_window(x) x->window
-    #endif
+    #include "wx/gtk/private/wrapgtk.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/private.h"
 #elif defined(__WXX11__)
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 81fddcc644..6000660563 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -104,7 +104,7 @@
 #endif
 
 #if wxUSE_GUI && defined(__WXGTK__)
-    #include <gtk/gtk.h>    // for GTK_XXX_VERSION constants
+    #include "wx/gtk/private/wrapgtk.h"    // for GTK_XXX_VERSION constants
 #endif
 
 #if wxUSE_GUI && defined(__WXQT__)
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index e228db9e1c..a1ad0dca9f 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -83,7 +83,7 @@ using namespace std;
 #endif
 
 #ifdef __WXGTK__
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/fontutil.h"
 #ifndef __WXGTK3__
 #include "wx/gtk/dc.h"
diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index c1227d329d..6094bd190c 100644
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -18,7 +18,7 @@
 #if wxUSE_SPLASH
 
 #ifdef __WXGTK20__
-    #include <gtk/gtk.h>
+    #include "wx/gtk/private/wrapgtk.h"
 #endif
 
 #include "wx/splash.h"
diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 76186c0257..f364677c7b 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -27,9 +27,7 @@
 #endif
 
 #ifdef __WXGTK20__
-    #include <gtk/gtk.h>
     #include "wx/gtk/private.h"
-    #include "wx/gtk/private/gtk2-compat.h"
 #endif
 
 // we only have to do it here when we use wxStatusBarGeneric in addition to the
diff --git a/src/gtk/aboutdlg.cpp b/src/gtk/aboutdlg.cpp
index e65eb41d24..8f00bead0e 100644
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -26,9 +26,7 @@
     #include "wx/window.h"
 #endif //WX_PRECOMP
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // GtkArray: temporary array of GTK strings
diff --git a/src/gtk/activityindicator.cpp b/src/gtk/activityindicator.cpp
index dd07fc376e..b63f8d4318 100644
--- a/src/gtk/activityindicator.cpp
+++ b/src/gtk/activityindicator.cpp
@@ -28,8 +28,7 @@
 
 #include "wx/math.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 // Macro return the specified expression only if GTK+ run time version is less
 // than 2.20 and compiling it only if it is less than 3.0 (which is why this
diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index afb78b9ca9..1bf80687e1 100644
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -25,8 +25,6 @@
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/object.h"
 
-#include <gtk/gtk.h>
-
 
 // ============================================================================
 // implementation
diff --git a/src/gtk/anybutton.cpp b/src/gtk/anybutton.cpp
index d58e318af2..bc12e5860c 100644
--- a/src/gtk/anybutton.cpp
+++ b/src/gtk/anybutton.cpp
@@ -18,8 +18,7 @@
 
 #include "wx/stockitem.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 // ----------------------------------------------------------------------------
 // GTK callbacks
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 82b2102837..2784771dc5 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -28,7 +28,6 @@
 #include "wx/apptrait.h"
 #include "wx/fontmap.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 #include "wx/gtk/mimetype.h"
diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index 195c501063..b5fa77f9af 100644
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -21,7 +21,6 @@
 
 #include "wx/artprov.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 #if !GTK_CHECK_VERSION(2,8,0)
diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp
index f71bba371c..34c193bdde 100644
--- a/src/gtk/assertdlg_gtk.cpp
+++ b/src/gtk/assertdlg_gtk.cpp
@@ -10,10 +10,8 @@
 
 #if wxDEBUG_LEVEL
 
-#include <gtk/gtk.h>
-#include "wx/gtk/assertdlg_gtk.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private.h"
+#include "wx/gtk/assertdlg_gtk.h"
 #include "wx/gtk/private/mnemonics.h"
 #include "wx/translation.h"
 #include "wx/stockitem.h"
diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 4a7e240242..0d45b88619 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -23,8 +23,6 @@
 #include "wx/gtk/private/object.h"
 #include "wx/gtk/private.h"
 
-#include <gtk/gtk.h>
-
 GdkWindow* wxGetTopLevelGDK();
 
 #ifndef __WXGTK3__
diff --git a/src/gtk/bmpcbox.cpp b/src/gtk/bmpcbox.cpp
index 9fc5ac0e1f..b7a124cd3a 100644
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -29,7 +29,6 @@
     #include "wx/log.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // ============================================================================
diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 96e1fb2605..247c5150b8 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -17,9 +17,7 @@
 
 #include "wx/stockitem.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/list.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/calctrl.cpp b/src/gtk/calctrl.cpp
index aa325ae0b6..221fa53ef5 100644
--- a/src/gtk/calctrl.cpp
+++ b/src/gtk/calctrl.cpp
@@ -19,7 +19,7 @@
 
 #include "wx/calctrl.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 extern "C" {
 
diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 72beb09210..401f94358d 100644
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -13,8 +13,7 @@
 
 #include "wx/checkbox.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/eventsdisabler.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 4105ce2716..74d3ebdf46 100644
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -14,7 +14,6 @@
 
 #include "wx/checklst.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/treeview.h"
 
diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index f224679451..9c6ebc9039 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -16,9 +16,7 @@
     #include "wx/arrstr.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/eventsdisabler.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp
index 16754db196..856421e94e 100644
--- a/src/gtk/clrpicker.cpp
+++ b/src/gtk/clrpicker.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/clrpicker.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 // ============================================================================
 // implementation
diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index e02c0be1da..4c8d1d38f8 100644
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -23,9 +23,7 @@
 #include "wx/sizer.h"
 #include "wx/panel.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 // the lines below duplicate the same definitions in collpaneg.cpp, if we have
 // another implementation of this class we should extract them to a common file
diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index ce8aba58d8..7f7d11a5ed 100644
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -23,9 +23,7 @@
     #include "wx/intl.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/dialogcount.h"
 
 extern "C" {
diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 4c0231dcf3..578088c0fd 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -20,9 +20,7 @@
     #include "wx/arrstr.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 // ----------------------------------------------------------------------------
 // GTK callbacks
diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index c43f727d15..772e2f8c8a 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -22,7 +22,6 @@
 #include "wx/utils.h"
 #include "wx/sysopt.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/mnemonics.h"
 
diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index b80f4872fe..07fe835b85 100644
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -18,9 +18,8 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/object.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 GdkWindow* wxGetTopLevelGDK();
 
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 2877a9996c..8c87aee3ee 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -32,11 +32,9 @@
 #include "wx/gtk/dcclient.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/event.h"
 #include "wx/gtk/private/gdkconv.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/list.h"
 #include "wx/gtk/private/treeview.h"
 using namespace wxGTKImpl;
diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 4a6603f5ee..3e7868173c 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -19,7 +19,7 @@
 #include "wx/icon.h"
 #include "wx/gtk/dc.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
     : wxGCDCImpl(owner)
diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index a75c8ed21d..9ac137d837 100644
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -11,7 +11,7 @@
 
 #include "wx/gtk/dcmemory.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 //-----------------------------------------------------------------------------
 // wxMemoryDCImpl
diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index c895c9e200..ea9f607ed9 100644
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -11,7 +11,7 @@
 
 #include "wx/gtk/dcscreen.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 //-----------------------------------------------------------------------------
 // wxScreenDCImpl
diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 5483eca3bc..c399ad5775 100644
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -19,8 +19,7 @@
 #include "wx/scopedptr.h"
 #include "wx/modalhook.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/dialogcount.h"
 
 wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
diff --git a/src/gtk/display.cpp b/src/gtk/display.cpp
index e04ca9160d..d3fc6e465c 100644
--- a/src/gtk/display.cpp
+++ b/src/gtk/display.cpp
@@ -14,11 +14,10 @@
 #endif
 #include "wx/utils.h" // wxClientDisplayRect
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_X11
     #include <gdk/gdkx.h>
 #endif
-#include "wx/gtk/private/gtk2-compat.h"
 
 #if !defined(GDK_WINDOWING_WIN32)
 
diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index ddcf5cd0d1..2638a0ccff 100644
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -24,8 +24,7 @@
 
 #include "wx/scopeguard.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 //----------------------------------------------------------------------------
 // global data
diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 7a2a98c4ef..bd5225e4c5 100644
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -34,8 +34,7 @@
 #include "wx/private/eventloopsourcesmanager.h"
 #include "wx/apptrait.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 GdkWindow* wxGetTopLevelGDK();
 
diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 91541c7986..7aa39cdfb3 100644
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -19,7 +19,6 @@
     #include "wx/msgdlg.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/mnemonics.h"
 
diff --git a/src/gtk/filehistory.cpp b/src/gtk/filehistory.cpp
index a81da0a7c5..e0eabf4d74 100644
--- a/src/gtk/filehistory.cpp
+++ b/src/gtk/filehistory.cpp
@@ -28,10 +28,8 @@
 
 #include "wx/filename.h"
 
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "wx/gtk/private/string.h"
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/string.h"
 
 // ============================================================================
 // implementation
diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 8ee67cb02b..8940155922 100644
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -25,7 +25,6 @@
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // ============================================================================
diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index f902f70fea..7a6a3e93db 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -17,8 +17,7 @@
     #include "wx/statusbr.h"
 #endif // WX_PRECOMP
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 // ----------------------------------------------------------------------------
 // event tables
diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp
index 85c044899b..e6d600a74f 100644
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/gauge.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 //-----------------------------------------------------------------------------
 // wxGauge
diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 1e68741ca0..5cfdb34f40 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -15,9 +15,8 @@
 
 #include "wx/glcanvas.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #include <gdk/gdkx.h>
-#include "wx/gtk/private/gtk2-compat.h"
 
 #if WXWIN_COMPATIBILITY_2_8
 
diff --git a/src/gtk/hyperlink.cpp b/src/gtk/hyperlink.cpp
index d4b0786cdf..5a11df73e9 100644
--- a/src/gtk/hyperlink.cpp
+++ b/src/gtk/hyperlink.cpp
@@ -29,7 +29,6 @@
 #ifndef WX_PRECOMP
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 11ad433739..78b5255668 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -28,15 +28,14 @@
     #include "wx/tooltip.h"
 #endif
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/eventsdisabler.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/object.h"
 #include "wx/gtk/private/treeentry_gtk.h"
 #include "wx/gtk/private/treeview.h"
 
+#include <gdk/gdkkeysyms.h>
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 9d164d06df..6aac109556 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -25,9 +25,7 @@
 #include "wx/accel.h"
 #include "wx/stockitem.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/mnemonics.h"
 
 // Number of currently open modal dialogs, defined in src/gtk/toplevel.cpp.
diff --git a/src/gtk/mimetype.cpp b/src/gtk/mimetype.cpp
index 7031c1ea52..99f5aa19a0 100644
--- a/src/gtk/mimetype.cpp
+++ b/src/gtk/mimetype.cpp
@@ -13,11 +13,10 @@
 
 #include "wx/gtk/mimetype.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 #include "wx/gtk/private/string.h"
 #include "wx/gtk/private/object.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 #if defined(__UNIX__)
 wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime)
diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 20735bc921..b342f7f13d 100644
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -24,8 +24,7 @@
 #include "wx/gtk/dcclient.h"
 #endif
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/gtk3-compat.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 386ad774db..77d2d6a0ea 100644
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -25,7 +25,6 @@
 
 #include "wx/modalhook.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"
 #include "wx/gtk/private/mnemonics.h"
diff --git a/src/gtk/nativewin.cpp b/src/gtk/nativewin.cpp
index b3664b55b0..8bba19c685 100644
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -27,8 +27,7 @@
 
 #include "wx/nativewin.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 #ifdef GDK_WINDOWING_X11
     #include <gdk/gdkx.h>
diff --git a/src/gtk/nonownedwnd.cpp b/src/gtk/nonownedwnd.cpp
index b23a76a0a1..b23a53c191 100644
--- a/src/gtk/nonownedwnd.cpp
+++ b/src/gtk/nonownedwnd.cpp
@@ -31,8 +31,7 @@
 
 #include "wx/graphics.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 // ----------------------------------------------------------------------------
 // wxNonOwnedWindowShapeImpl: base class for region and path-based classes.
diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 35cd915ca6..0f141cfe8e 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -24,9 +24,7 @@
 #include "wx/imaglist.h"
 #include "wx/fontutil.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // wxGtkNotebookPage
diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 1b211db1c4..6c1b56f86d 100644
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -16,7 +16,7 @@
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 #include "wx/gtk/private/win_gtk.h"
 
diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index 62578a44e5..b43a1f148b 100644
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -34,7 +34,7 @@
 #include "wx/paper.h"
 #include "wx/modalhook.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 #if GTK_CHECK_VERSION(2,14,0)
 #include <gtk/gtkunixprint.h>
@@ -46,7 +46,6 @@
 wxFORCE_LINK_THIS_MODULE(gtk_print)
 
 #include "wx/gtk/private/object.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 // Useful to convert angles from degrees to radians.
 static const double DEG2RAD  = M_PI / 180.0;
diff --git a/src/gtk/private.cpp b/src/gtk/private.cpp
index 1971c52b60..6f40083d48 100644
--- a/src/gtk/private.cpp
+++ b/src/gtk/private.cpp
@@ -27,7 +27,6 @@
     #include "wx/module.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index a92985a16a..b59022bd4b 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -17,10 +17,9 @@
     #include "wx/tooltip.h"
 #endif
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
+
+#include <gdk/gdkkeysyms.h>
 
 //-----------------------------------------------------------------------------
 // wxGTKRadioButtonInfo
diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 9637a8004c..9b87a178ad 100644
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -13,9 +13,7 @@
 
 #include "wx/radiobut.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // data
diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 6b31d490d8..ef0636771e 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -37,9 +37,7 @@
 #include "wx/gtk/dc.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 #if defined(__WXGTK3__) && !GTK_CHECK_VERSION(3,14,0)
     #define GTK_STATE_FLAG_CHECKED (1 << 11)
diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 021c5243ce..95765bf0c7 100644
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -18,8 +18,7 @@
 
 #include "wx/scrolwin.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 // ----------------------------------------------------------------------------
 // wxScrollHelper implementation
diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 87748f5271..d65178723b 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -20,9 +20,8 @@
 #include "wx/fontutil.h"
 #include "wx/fontenum.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/win_gtk.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);
 
diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 69d994abc3..2d86c965cf 100644
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -18,8 +18,7 @@
     #include "wx/math.h"
 #endif
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/eventsdisabler.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 28ae45dbbd..a0a3ebef55 100644
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/spinbutt.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 //-----------------------------------------------------------------------------
 // data
diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 5a22d6fbe4..932bc4623d 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -20,9 +20,7 @@
     #include "wx/wxcrtvararg.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // data
diff --git a/src/gtk/statbmp.cpp b/src/gtk/statbmp.cpp
index 4a56efc6f1..9b9a7c9d41 100644
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/statbmp.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 6979591287..f5a69afa5f 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -13,8 +13,7 @@
 
 #include "wx/statbox.h"
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/win_gtk.h"
 
 // constants taken from GTK sources
diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp
index a9b52ab88e..d7752e0a29 100644
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -13,8 +13,7 @@
 
 #if wxUSE_STATLINE
 
-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 
 //-----------------------------------------------------------------------------
 // wxStaticLine
diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 78e154c006..36d87b502c 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -13,7 +13,6 @@
 
 #include "wx/stattext.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index f501457b03..bf0f27a399 100644
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -23,14 +23,13 @@
     #include "wx/icon.h"
 #endif
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_X11
     #include <gdk/gdkx.h>
 #endif
 #ifndef __WXGTK3__
     #include "eggtrayicon.h"
 #endif
-#include "wx/gtk/private/gtk2-compat.h"
 
 wxGCC_WARNING_SUPPRESS(deprecated-declarations)
 
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 5febd63944..281099dce9 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -29,9 +29,7 @@
 #include <sys/stat.h>
 #include <ctype.h>
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/gtk3-compat.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index c608a609de..bc4735a8a7 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -33,9 +33,7 @@
 
 #include "wx/textcompleter.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/object.h"
 #include "wx/gtk/private/string.h"
 
diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 0778546883..bb27f5c234 100644
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -20,7 +20,6 @@
     #include "wx/button.h"
 #endif
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/eventsdisabler.h"
 #include "wx/gtk/private/list.h"
diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index 5e819097eb..83bacce20a 100644
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -14,7 +14,7 @@
 #include "wx/gtk/private/timer.h"
 #include "wx/app.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 
 // ----------------------------------------------------------------------------
 // wxTimerImpl
diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp
index e7ead42550..d857972eff 100644
--- a/src/gtk/toolbar.cpp
+++ b/src/gtk/toolbar.cpp
@@ -14,9 +14,7 @@
 
 #include "wx/toolbar.h"
 
-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/gtk3-compat.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index bdb8ffa790..57a457a418 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -32,18 +32,16 @@
 #include "wx/evtloop.h"
 #include "wx/sysopt.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk3-compat.h"
+#include "wx/gtk/private/win_gtk.h"
+
 #ifdef GDK_WINDOWING_X11
     #include <gdk/gdkx.h>
     #include <X11/Xatom.h>  // XA_CARDINAL
     #include "wx/unix/utilsx11.h"
 #endif
 
-#include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
-#include "wx/gtk/private/gtk3-compat.h"
-#include "wx/gtk/private/win_gtk.h"
-
 // ----------------------------------------------------------------------------
 // data
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 7a43641e96..7cdbd871c8 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -25,7 +25,7 @@
 #include "wx/gtk/private/timer.h"
 #include "wx/evtloop.h"
 
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_WIN32
 #include <gdk/gdkwin32.h>
 #endif
@@ -54,8 +54,6 @@
     #include "wx/unix/utilsx11.h"
 #endif
 
-#include "wx/gtk/private/gtk2-compat.h"
-
 GdkWindow* wxGetTopLevelGDK();
 
 //----------------------------------------------------------------------------
diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index 2adab9c58a..98b17fe117 100644
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -8,13 +8,8 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
-#include <gtk/gtk.h>
-#include "wx/gtk/private/win_gtk.h"
-
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/win_gtk.h"
 
 /*
 wxPizza is a custom GTK+ widget derived from GtkFixed.  A custom widget
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index b2700cb280..fa49c0f2d9 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -37,16 +37,15 @@
 
 #include <ctype.h>
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/gtk3-compat.h"
 #include "wx/gtk/private/event.h"
 #include "wx/gtk/private/win_gtk.h"
 #include "wx/private/textmeasure.h"
 using namespace wxGTKImpl;
 
+#include <gdk/gdkkeysyms.h>
+
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #include "wx/x11/private/wrapxkb.h"
diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index bdcb909b4b..a71f5bf043 100644
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -34,9 +34,8 @@
 #include "wx/vector.h"              // wxVector<wxString>
 
 #ifdef __WXGTK__
-    #include <gtk/gtk.h>
+    #include "wx/gtk/private/wrapgtk.h"
     #include <gdk/gdkx.h>
-    #include "wx/gtk/private/gtk2-compat.h"
 #endif
 
 //-----------------------------------------------------------------------------
diff --git a/src/unix/mediactrl_gstplayer.cpp b/src/unix/mediactrl_gstplayer.cpp
index b7c22c0a04..235bdbc721 100644
--- a/src/unix/mediactrl_gstplayer.cpp
+++ b/src/unix/mediactrl_gstplayer.cpp
@@ -28,9 +28,8 @@
 #include "wx/vector.h"              // wxVector<wxString>
 
 #ifdef __WXGTK__
-    #include <gtk/gtk.h>
+    #include "wx/gtk/private/wrapgtk.h"
     #include <gdk/gdkx.h>
-    #include "wx/gtk/private/gtk2-compat.h"
 #endif
 
 //=============================================================================
diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 5633edbbde..5bd8837f2e 100644
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -64,7 +64,7 @@
 // ----------------------------------------------------------------------------
 
 #if defined(__WXGTK__)
-    #include <gtk/gtk.h>
+    #include "wx/gtk/private/wrapgtk.h"
     #include <gdk/gdkx.h>
     #define GetDisplay()        GDK_DISPLAY()
     #define GetXWindow(wxwin)   GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
diff --git a/src/unix/uiactionx11.cpp b/src/unix/uiactionx11.cpp
index aac179e6e4..96fe8c0629 100644
--- a/src/unix/uiactionx11.cpp
+++ b/src/unix/uiactionx11.cpp
@@ -28,7 +28,7 @@
 #include "wx/unix/utilsx11.h"
 
 #ifdef __WXGTK3__
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 GtkWidget* wxGetTopLevelGTK();
 #endif
 
diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 50d5dd0c0e..8b9f37b831 100644
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -37,12 +37,9 @@
 #endif
 
 #ifdef __WXGTK__
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#ifdef __WXGTK20__
-#include "wx/gtk/private/gtk2-compat.h"     // gdk_window_get_screen()
-#endif
 #endif
 GdkWindow* wxGetTopLevelGDK();
 GtkWidget* wxGetTopLevelGTK();

From f1ea4afdbe1b5d02ef3dd0a7e9dc8806a4225e10 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 May 2018 16:39:02 +0200
Subject: [PATCH 558/916] Make wxHtmlPrintout::m_Renderer{,Hdr} objects instead
 of pointers

There is no need to allocate these objects on the heap and delete them
later when we can just make them members of wxHtmlPrintout object
itself.

No real changes.
---
 include/wx/html/htmprint.h |  3 +-
 src/html/htmprint.cpp      | 64 +++++++++++++++++---------------------
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 6098b9bd94..71ef634f88 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -121,7 +121,6 @@ class WXDLLIMPEXP_HTML wxHtmlPrintout : public wxPrintout
 {
 public:
     wxHtmlPrintout(const wxString& title = wxT("Printout"));
-    virtual ~wxHtmlPrintout();
 
     void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = true);
             // prepares the class for printing this html document.
@@ -207,7 +206,7 @@ private:
     wxString m_Headers[2], m_Footers[2];
 
     int m_HeaderHeight, m_FooterHeight;
-    wxHtmlDCRenderer *m_Renderer, *m_RendererHdr;
+    wxHtmlDCRenderer m_Renderer, m_RendererHdr;
     float m_MarginTop, m_MarginBottom, m_MarginLeft, m_MarginRight, m_MarginSpace;
 
     // list of HTML filters
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 5709a798e1..9f5c8d39d1 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -193,8 +193,6 @@ wxList wxHtmlPrintout::m_Filters;
 
 wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {
-    m_Renderer = new wxHtmlDCRenderer;
-    m_RendererHdr = new wxHtmlDCRenderer;
     m_NumPages = INT_MAX;
     m_Document = m_BasePath = wxEmptyString; m_BasePathIsDir = true;
     m_Headers[0] = m_Headers[1] = wxEmptyString;
@@ -206,12 +204,6 @@ wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 
 
 
-wxHtmlPrintout::~wxHtmlPrintout()
-{
-    delete m_Renderer;
-    delete m_RendererHdr;
-}
-
 void wxHtmlPrintout::CleanUpStatics()
 {
     WX_CLEAR_LIST(wxList, m_Filters);
@@ -315,34 +307,34 @@ void wxHtmlPrintout::OnPreparePrinting()
 
     /* prepare headers/footers renderer: */
 
-    m_RendererHdr->SetDC(GetDC(),
+    m_RendererHdr.SetDC(GetDC(),
                          (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
                          (double)ppiPrinterY / (double)ppiScreenY);
-    m_RendererHdr->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)),
+    m_RendererHdr.SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)),
                           (int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)));
     if (!m_Headers[0].empty())
     {
-        m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[0], 1));
-        m_HeaderHeight = m_RendererHdr->GetTotalHeight();
+        m_RendererHdr.SetHtmlText(TranslateHeader(m_Headers[0], 1));
+        m_HeaderHeight = m_RendererHdr.GetTotalHeight();
     }
     else if (!m_Headers[1].empty())
     {
-        m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[1], 1));
-        m_HeaderHeight = m_RendererHdr->GetTotalHeight();
+        m_RendererHdr.SetHtmlText(TranslateHeader(m_Headers[1], 1));
+        m_HeaderHeight = m_RendererHdr.GetTotalHeight();
     }
     if (!m_Footers[0].empty())
     {
-        m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[0], 1));
-        m_FooterHeight = m_RendererHdr->GetTotalHeight();
+        m_RendererHdr.SetHtmlText(TranslateHeader(m_Footers[0], 1));
+        m_FooterHeight = m_RendererHdr.GetTotalHeight();
     }
     else if (!m_Footers[1].empty())
     {
-        m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[1], 1));
-        m_FooterHeight = m_RendererHdr->GetTotalHeight();
+        m_RendererHdr.SetHtmlText(TranslateHeader(m_Footers[1], 1));
+        m_FooterHeight = m_RendererHdr.GetTotalHeight();
     }
 
     /* prepare main renderer: */
-    m_Renderer->SetDC(GetDC(),
+    m_Renderer.SetDC(GetDC(),
                       (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
                       (double)ppiPrinterY / (double)ppiScreenY);
 
@@ -353,12 +345,12 @@ void wxHtmlPrintout::OnPreparePrinting()
     if ( m_FooterHeight )
         printAreaH -= int(m_FooterHeight + m_MarginSpace * ppmm_v);
 
-    m_Renderer->SetSize(printAreaW, printAreaH);
-    m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);
+    m_Renderer.SetSize(printAreaW, printAreaH);
+    m_Renderer.SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);
 
     if ( CheckFit(wxSize(printAreaW, printAreaH),
-                  wxSize(m_Renderer->GetTotalWidth(),
-                         m_Renderer->GetTotalHeight())) || IsPreview() )
+                  wxSize(m_Renderer.GetTotalWidth(),
+                         m_Renderer.GetTotalHeight())) || IsPreview() )
     {
         // do paginate the document
         CountPages();
@@ -496,12 +488,12 @@ void wxHtmlPrintout::CountPages()
     m_PageBreaks.Add( 0);
     do
     {
-        pos = m_Renderer->Render((int)( ppmm_h * m_MarginLeft),
+        pos = m_Renderer.Render((int)( ppmm_h * m_MarginLeft),
                                  (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight),
                                  m_PageBreaks,
                                  pos, true, INT_MAX);
         m_PageBreaks.Add( pos);
-    } while (pos < m_Renderer->GetTotalHeight());
+    } while (pos < m_Renderer.GetTotalHeight());
 }
 
 
@@ -529,29 +521,29 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
     dc->SetUserScale((double)dc_w / (double)pageWidth,
                      (double)dc_h / (double)pageHeight);
 
-    m_Renderer->SetDC(dc,
+    m_Renderer.SetDC(dc,
                       (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
                       (double)ppiPrinterY / (double)ppiScreenY);
 
     dc->SetBackgroundMode(wxTRANSPARENT);
 
-    m_Renderer->Render((int) (ppmm_h * m_MarginLeft),
+    m_Renderer.Render((int) (ppmm_h * m_MarginLeft),
                          (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), m_PageBreaks,
                          m_PageBreaks[page-1], false, m_PageBreaks[page]-m_PageBreaks[page-1]);
 
 
-    m_RendererHdr->SetDC(dc,
+    m_RendererHdr.SetDC(dc,
                          (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
                          (double)ppiPrinterY / (double)ppiScreenY);
     if (!m_Headers[page % 2].empty())
     {
-        m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[page % 2], page));
-        m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop), m_PageBreaks);
+        m_RendererHdr.SetHtmlText(TranslateHeader(m_Headers[page % 2], page));
+        m_RendererHdr.Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop), m_PageBreaks);
     }
     if (!m_Footers[page % 2].empty())
     {
-        m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[page % 2], page));
-        m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight), m_PageBreaks);
+        m_RendererHdr.SetHtmlText(TranslateHeader(m_Footers[page % 2], page));
+        m_RendererHdr.Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight), m_PageBreaks);
     }
 }
 
@@ -604,16 +596,16 @@ void wxHtmlPrintout::SetMargins(const wxPageSetupDialogData& pageSetupData)
 void wxHtmlPrintout::SetFonts(const wxString& normal_face, const wxString& fixed_face,
                               const int *sizes)
 {
-    m_Renderer->SetFonts(normal_face, fixed_face, sizes);
-    m_RendererHdr->SetFonts(normal_face, fixed_face, sizes);
+    m_Renderer.SetFonts(normal_face, fixed_face, sizes);
+    m_RendererHdr.SetFonts(normal_face, fixed_face, sizes);
 }
 
 void wxHtmlPrintout::SetStandardFonts(int size,
                                       const wxString& normal_face,
                                       const wxString& fixed_face)
 {
-    m_Renderer->SetStandardFonts(size, normal_face, fixed_face);
-    m_RendererHdr->SetStandardFonts(size, normal_face, fixed_face);
+    m_Renderer.SetStandardFonts(size, normal_face, fixed_face);
+    m_RendererHdr.SetStandardFonts(size, normal_face, fixed_face);
 }
 
 

From 9544d102ddee1369f6e56558db7c892000581861 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 May 2018 16:43:49 +0200
Subject: [PATCH 559/916] Remove unnecessary wxHtmlPrintout members
 initialization

Don't initialize strings to their default (empty) value, this is just
useless.
---
 src/html/htmprint.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 9f5c8d39d1..1403019851 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -194,9 +194,7 @@ wxList wxHtmlPrintout::m_Filters;
 wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {
     m_NumPages = INT_MAX;
-    m_Document = m_BasePath = wxEmptyString; m_BasePathIsDir = true;
-    m_Headers[0] = m_Headers[1] = wxEmptyString;
-    m_Footers[0] = m_Footers[1] = wxEmptyString;
+    m_BasePathIsDir = true;
     m_HeaderHeight = m_FooterHeight = 0;
     SetMargins(); // to default values
     SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);

From a56b993c55b239b0183305c2a61e84a476ab9d15 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 May 2018 17:14:29 +0200
Subject: [PATCH 560/916] Use "for" loop in
 wxHtmlContainerCell::AdjustPagebreak()

Use a simpler form for iterating over all children.

No real changes.
---
 src/html/htmlcell.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index bf16620db8..0f14760198 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -704,15 +704,13 @@ wxHtmlContainerCell::AdjustPagebreak(int *pagebreak,
     if (!m_CanLiveOnPagebreak)
         return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, pageHeight);
 
-    wxHtmlCell *c = GetFirstChild();
     bool rt = false;
     int pbrk = *pagebreak - m_PosY;
 
-    while (c)
+    for ( wxHtmlCell *c = GetFirstChild(); c; c = c->GetNext() )
     {
         if (c->AdjustPagebreak(&pbrk, known_pagebreaks, pageHeight))
             rt = true;
-        c = c->GetNext();
     }
     if (rt)
         *pagebreak = pbrk + m_PosY;

From 9fa9880f979ee9abefcf18e4685e1ef56ff7592b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 May 2018 19:06:21 +0200
Subject: [PATCH 561/916] Pass known page breaks as const ref to
 wxHtmlDCRenderer::Render()

This method doesn't modify the known page breaks, it only uses them to
find the next one, so make it more clear by using const reference in the
function signature.
---
 include/wx/html/htmprint.h | 2 +-
 src/html/htmprint.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 71ef634f88..5e4584aec1 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -78,7 +78,7 @@ public:
     // set the same pagebreak twice.
     //
     // CAUTION! Render() changes DC's user scale and does NOT restore it!
-    int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
+    int Render(int x, int y, const wxArrayInt& known_pagebreaks, int from = 0,
                int dont_render = false, int to = INT_MAX);
 
     // returns total width of the html document
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 1403019851..c2195cc266 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -141,7 +141,7 @@ void wxHtmlDCRenderer::SetStandardFonts(int size,
 }
 
 int wxHtmlDCRenderer::Render(int x, int y,
-                             wxArrayInt& known_pagebreaks,
+                             const wxArrayInt& known_pagebreaks,
                              int from, int dont_render, int to)
 {
     wxCHECK_MSG( m_Cells, 0, "SetHtmlText() must be called before Render()" );

From a195bf86a21e9334c68eb5e4a5b0973104553460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bron?= <frederic.bron@m4x.org>
Date: Tue, 22 May 2018 07:46:11 +0200
Subject: [PATCH 562/916] Make compilation with mingw-w64 possible with
 -std=c++17.

The definition of macros min and max in include/wx/msw/wrapgdip.h
b/include/wx/msw/wrapgdip.h was clashing with the new bessel functions
that use std::numeric_limits<T>::min/max.

So #include <cmath> before #include <gdiplus.h> and use using
declarations of std::min and max instead of macros.
---
 include/wx/msw/wrapgdip.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/wx/msw/wrapgdip.h b/include/wx/msw/wrapgdip.h
index 7b12ea51f9..06f1401912 100644
--- a/include/wx/msw/wrapgdip.h
+++ b/include/wx/msw/wrapgdip.h
@@ -12,17 +12,14 @@
 
 #include "wx/msw/wrapwin.h"
 
-// these macros must be defined before gdiplus.h is included but we explicitly
-// prevent windows.h from defining them in wx/msw/wrapwin.h as they conflict
-// with standard functions of the same name elsewhere, so we have to pay for it
-// by manually redefining them ourselves here
-#ifndef max
-    #define max(a,b)            (((a) > (b)) ? (a) : (b))
-#endif
+// min and max must be available for gdiplus.h but we cannot define them as
+// macros because they conflict with std::numeric_limits<T>::min and max when
+// compiling with mingw-w64 and -std=c++17. This happens because with c++17,
+// math.h includes bessel_function which requires std::numeric_limits.
 
-#ifndef min
-    #define min(a,b)            (((a) < (b)) ? (a) : (b))
-#endif
+#include <cmath>
+using std::min;
+using std::max;
 
 // There are many clashes between the names of the member fields and parameters
 // in the standard gdiplus.h header and each of them results in C4458 with

From 7eef4a45493f6a5193c22c6157625b3ae08dcde9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 22 May 2018 17:01:07 +0200
Subject: [PATCH 563/916] Fix build with GTK+ < 2.20 due to undefined key code
 constants

Include gdk/gdkkeysyms.h from wx/gtk/private/gtk2-compat.h as it must be
included before it for the compatibility header to define the new names
for the key constants even when using old GTK+ versions.
---
 include/wx/gtk/private/gtk2-compat.h | 2 ++
 src/gtk/listbox.cpp                  | 2 --
 src/gtk/radiobox.cpp                 | 2 --
 src/gtk/window.cpp                   | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/wx/gtk/private/gtk2-compat.h b/include/wx/gtk/private/gtk2-compat.h
index 15052403c8..65c76cc7b2 100644
--- a/include/wx/gtk/private/gtk2-compat.h
+++ b/include/wx/gtk/private/gtk2-compat.h
@@ -539,6 +539,8 @@ static inline void wx_gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequis
 }
 #define gtk_widget_get_preferred_size wx_gtk_widget_get_preferred_size
 
+#include <gdk/gdkkeysyms.h>
+
 #if defined(GDK_Alt_L) && !defined(GDK_KEY_Alt_L)
 #define GDK_KEY_Alt_L GDK_Alt_L
 #define GDK_KEY_Alt_R GDK_Alt_R
diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 78b5255668..0a0f6a8c0f 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -34,8 +34,6 @@
 #include "wx/gtk/private/treeentry_gtk.h"
 #include "wx/gtk/private/treeview.h"
 
-#include <gdk/gdkkeysyms.h>
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index b59022bd4b..635fba4a87 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -19,8 +19,6 @@
 
 #include "wx/gtk/private.h"
 
-#include <gdk/gdkkeysyms.h>
-
 //-----------------------------------------------------------------------------
 // wxGTKRadioButtonInfo
 //-----------------------------------------------------------------------------
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index fa49c0f2d9..e6889a3549 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -44,8 +44,6 @@
 #include "wx/private/textmeasure.h"
 using namespace wxGTKImpl;
 
-#include <gdk/gdkkeysyms.h>
-
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #include "wx/x11/private/wrapxkb.h"

From 802c77b964e179ed51b6169cdf0d83832e0490ce Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Mon, 21 May 2018 21:21:23 +0200
Subject: [PATCH 564/916] Fix building without precompiled headers on Windows

---
 include/wx/msw/private/graphicsd2d.h | 3 +++
 src/msw/crashrpt.cpp                 | 1 +
 src/msw/graphicsd2d.cpp              | 8 +-------
 src/msw/rt/notifmsgrt.cpp            | 2 ++
 src/msw/rt/utilsrt.cpp               | 4 ++++
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/wx/msw/private/graphicsd2d.h b/include/wx/msw/private/graphicsd2d.h
index 993f61a960..390799d067 100644
--- a/include/wx/msw/private/graphicsd2d.h
+++ b/include/wx/msw/private/graphicsd2d.h
@@ -15,6 +15,9 @@
 // Ensure no previous defines interfere with the Direct2D API headers
 #undef GetHwnd
 
+// include before wincodec.h to prevent winsock/winsock2 redefinition warnings
+#include "wx/msw/wrapwin.h"
+
 #include <d2d1.h>
 #include <dwrite.h>
 #include <wincodec.h>
diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 64bb5cd70d..42a2437d9d 100644
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -26,6 +26,7 @@
 #if wxUSE_CRASHREPORT
 
 #ifndef WX_PRECOMP
+    #include "wx/wxcrtvararg.h"
 #endif  //WX_PRECOMP
 
 #include "wx/msw/debughlp.h"
diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index 87e1a4bd01..da36e77523 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -14,9 +14,6 @@
 // Minimum supported client: Windows 8 and Platform Update for Windows 7
 #define wxD2D_DEVICE_CONTEXT_SUPPORTED 0
 
-// Ensure no previous defines interfere with the Direct2D API headers
-#undef GetHwnd
-
 // We load these functions at runtime from the d2d1.dll.
 // However, since they are also used inside the d2d1.h header we must provide
 // implementations matching the exact declarations. These defines ensures we
@@ -36,9 +33,7 @@
     #pragma warning(disable:4458) // declaration of 'xxx' hides class member
 #endif
 
-#include <d2d1.h>
-#include <dwrite.h>
-#include <wincodec.h>
+#include "wx/msw/private/graphicsd2d.h"
 
 #ifdef __MINGW64_TOOLCHAIN__
 #ifndef DWRITE_E_NOFONT
@@ -78,7 +73,6 @@
 #include "wx/private/graphics.h"
 #include "wx/stack.h"
 #include "wx/sharedptr.h"
-#include "wx/msw/private/graphicsd2d.h"
 
 // This must be the last header included to only affect the DEFINE_GUID()
 // occurrences below but not any GUIDs declared in the standard files included
diff --git a/src/msw/rt/notifmsgrt.cpp b/src/msw/rt/notifmsgrt.cpp
index af5cf3c578..1f7e7fd1a3 100644
--- a/src/msw/rt/notifmsgrt.cpp
+++ b/src/msw/rt/notifmsgrt.cpp
@@ -16,6 +16,8 @@
 #if wxUSE_NOTIFICATION_MESSAGE && wxUSE_WINRT
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/module.h"
     #include "wx/string.h"
 #endif // WX_PRECOMP
 
diff --git a/src/msw/rt/utilsrt.cpp b/src/msw/rt/utilsrt.cpp
index ecc12be979..c21c7fe55a 100644
--- a/src/msw/rt/utilsrt.cpp
+++ b/src/msw/rt/utilsrt.cpp
@@ -26,6 +26,10 @@
 
 #if wxUSE_WINRT
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif //WX_PRECOMP
+
 #include <roapi.h>
 
 #include "wx/dynlib.h"

From 9b4855ea5e7c604b3715dee58fdb55c2f8bfb1b4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 May 2018 17:06:11 +0200
Subject: [PATCH 565/916] Fix compilation of wxDFB wxApp::Initialize()

Use wxCmdLineArgsArray::Init() instead of assignment operator in Unicode
build.

This was broken by 70a499f635a8f42bfdd9c719faa6ddbd05bf7d6a.
---
 src/dfb/app.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp
index c1d4f134a0..73763699ff 100644
--- a/src/dfb/app.cpp
+++ b/src/dfb/app.cpp
@@ -92,7 +92,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     // update internal arg[cv] as DFB may have removed processed options:
     this->argc = argc;
+#if wxUSE_UNICODE
+    this->argv.Init(argc, argv);
+#else
     this->argv = argv;
+#endif
 
     if ( !wxIDirectFB::Get() )
         return false;

From 6121b08b678113d4be3636255b5d151d8c6f6255 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 May 2018 17:09:09 +0200
Subject: [PATCH 566/916] Compilation fix for wxGUIEventLoop in wxDFB

Rename YieldFor() to DoYieldFor() in the header too.

This was broken by f740cc38817430c6989182e5d1d970fb043f9b4a
---
 include/wx/dfb/evtloop.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/wx/dfb/evtloop.h b/include/wx/dfb/evtloop.h
index 7a0dd0e056..c328e21d1e 100644
--- a/include/wx/dfb/evtloop.h
+++ b/include/wx/dfb/evtloop.h
@@ -24,11 +24,12 @@ class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxConsoleEventLoop
 public:
     wxGUIEventLoop();
 
-    virtual bool YieldFor(long eventsToProcess);
-
     // returns DirectFB event buffer used by wx
     static wxIDirectFBEventBufferPtr GetDirectFBEventBuffer();
 
+protected:
+    virtual void DoYieldFor(long eventsToProcess);
+
 private:
     static void InitBuffer();
     static void CleanUp();

From 935d6f939b899943b9f47d4453a2deaa0b6d94f0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 May 2018 17:13:08 +0200
Subject: [PATCH 567/916] Fix compilation of generic wxNotebook used by wxMotif

This should have been part of bee28c2730ce94a4e0eead18139c7d28ad6186ed
---
 src/generic/notebook.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 01c4e29fdb..ea7e20266b 100644
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -281,10 +281,10 @@ bool wxNotebook::DeletePage(size_t nPage)
 
     m_tabView->RemoveTab(GetPageId(m_tabView, pPage));
 
-    m_pages.Remove(pPage);
+    m_pages.erase(m_pages.begin() + nPage);
     delete pPage;
 
-    if (m_pages.GetCount() == 0)
+    if (m_pages.empty())
     {
         m_selection = -1;
         m_tabView->SetTabSelection(-1, false);
@@ -330,9 +330,9 @@ wxWindow* wxNotebook::DoRemovePage(size_t nPage)
 
     m_tabView->RemoveTab(GetPageId(m_tabView, pPage));
 
-    m_pages.Remove(pPage);
+    m_pages.erase(m_pages.begin() + nPage);
 
-    if (m_pages.GetCount() == 0)
+    if (m_pages.empty())
     {
       m_selection = -1;
       m_tabView->SetTabSelection(-1, true);
@@ -392,7 +392,7 @@ bool wxNotebook::DeleteAllPages()
     for ( nPage = 0; nPage < nPageCount; nPage++ )
         delete m_pages[nPage];
 
-    m_pages.Clear();
+    m_pages.clear();
 
     return true;
 }
@@ -413,7 +413,7 @@ bool wxNotebook::InsertPage(size_t nPage,
       pPage->Show(false);
 
     // save the pointer to the page
-    m_pages.Insert(pPage, nPage);
+    m_pages.insert(m_pages.begin() + nPage, pPage);
 
     if (bSelect)
     {
@@ -522,7 +522,7 @@ bool wxNotebook::RefreshLayout(bool force)
 
         // fit the notebook page to the tab control's display area
 
-        size_t nCount = m_pages.Count();
+        size_t nCount = m_pages.size();
         for ( size_t nPage = 0; nPage < nCount; nPage++ ) {
             wxNotebookPage *pPage = m_pages[nPage];
             wxRect clientRect = GetAvailableClientSize();

From b6f0693a4103060f121b229d567127ca88dac752 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 May 2018 17:22:54 +0200
Subject: [PATCH 568/916] Use wxDCClipper in wxHtmlDCRenderer code

Use wxDCClipper instead of manually calling DestroyClippingRegion().
This is simpler and safer and also potentially more correct as
wxDCClipper restores the previous clipping region, if any, unlike the
old code -- even though this probably doesn't matter here as the
printing DC seems unlikely to be clipped.
---
 src/html/htmprint.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index c2195cc266..84f77b7df4 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -161,12 +161,11 @@ int wxHtmlDCRenderer::Render(int x, int y,
         wxDefaultHtmlRenderingStyle rstyle;
         rinfo.SetStyle(&rstyle);
         m_DC->SetBrush(*wxWHITE_BRUSH);
-        m_DC->SetClippingRegion(x, y, m_Width, hght);
+        wxDCClipper clip(*m_DC, x, y, m_Width, hght);
         m_Cells->Draw(*m_DC,
                       x, (y - from),
                       y, y + hght,
                       rinfo);
-        m_DC->DestroyClippingRegion();
     }
 
     if (pbreak < m_Cells->GetHeight()) return pbreak;

From 048b7f44ec44a428f9b115121be299ea329276b2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 May 2018 17:52:31 +0200
Subject: [PATCH 569/916] Add wxPrintout::SetUp() to reuse the same code in all
 ports

MSW, GTK, OSX and Postscript implementations all did almost exactly the
same thing to initialize wxPrintout, so extract this common code into a
new wxPrintout method and just call it instead.

There should be no changes in behaviour.
---
 include/wx/prntbase.h     |  4 ++++
 src/common/prntbase.cpp   | 27 +++++++++++++++++++++++++++
 src/generic/printps.cpp   | 18 +-----------------
 src/gtk/print.cpp         | 13 +------------
 src/msw/printwin.cpp      | 28 +++-------------------------
 src/osx/core/printmac.cpp | 12 +-----------
 6 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 18987fffb3..1056e27d0e 100644
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -281,6 +281,10 @@ public:
 
     virtual wxString GetTitle() const { return m_printoutTitle; }
 
+    // Port-specific code should call this function to initialize this object
+    // with everything it needs, instead of using individual accessors below.
+    bool SetUp(wxDC& dc);
+
     wxDC *GetDC() const { return m_printoutDC; }
     void SetDC(wxDC *dc) { m_printoutDC = dc; }
 
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index eb2d92ecdb..cfecbd6158 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -638,6 +638,33 @@ void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toP
     *toPage = 1;
 }
 
+bool wxPrintout::SetUp(wxDC& dc)
+{
+    SetPPIScreen(wxGetDisplayPPI());
+
+    // We need to know printer PPI. In most ports, this can be retrieved from
+    // the printer DC, but in others it is computed (probably for legacy
+    // reasons) outside of wxDC code, so don't override it if it had been
+    // already set.
+    if ( !m_PPIPrinterX || !m_PPIPrinterY )
+    {
+        SetPPIPrinter(dc.GetPPI());
+        if ( !m_PPIPrinterX || !m_PPIPrinterY )
+        {
+            // But if we couldn't get it in any way, we can't continue.
+            return false;
+        }
+    }
+
+    SetDC(&dc);
+
+    dc.GetSize(&m_pageWidthPixels, &m_pageHeightPixels);
+    m_paperRectPixels = wxRect(0, 0, m_pageWidthPixels, m_pageHeightPixels);
+    dc.GetSizeMM(&m_pageWidthMM, &m_pageHeightMM);
+
+    return true;
+}
+
 void wxPrintout::FitThisSizeToPaper(const wxSize& imageSize)
 {
     // Set the DC scale and origin so that the given image size fits within the
diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index cedf7278f7..efcdb879b6 100644
--- a/src/generic/printps.cpp
+++ b/src/generic/printps.cpp
@@ -105,24 +105,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
         return false;
     }
 
-    wxSize ScreenPixels = wxGetDisplaySize();
-    wxSize ScreenMM = wxGetDisplaySizeMM();
-
-    printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
-                            (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
-    printout->SetPPIPrinter( dc->GetResolution(),
-                             dc->GetResolution() );
-
     // Set printout parameters
-    printout->SetDC(dc);
-
-    int w, h;
-    dc->GetSize(&w, &h);
-    printout->SetPageSizePixels((int)w, (int)h);
-    printout->SetPaperRectPixels(wxRect(0, 0, w, h));
-    int mw, mh;
-    dc->GetSizeMM(&mw, &mh);
-    printout->SetPageSizeMM((int)mw, (int)mh);
+    printout->SetUp(*dc);
 
     // Create an abort window
     wxBeginBusyCursor();
diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index 62578a44e5..9089e57f52 100644
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -1024,19 +1024,8 @@ void wxGtkPrinter::BeginPrint(wxPrintout *printout, GtkPrintOperation *operation
         return;
     }
 
-    printout->SetPPIScreen(wxGetDisplayPPI());
-    printout->SetPPIPrinter( printDC->GetResolution(),
-                             printDC->GetResolution() );
+    printout->SetUp(*m_dc);
 
-    printout->SetDC(m_dc);
-
-    int w, h;
-    m_dc->GetSize(&w, &h);
-    printout->SetPageSizePixels((int)w, (int)h);
-    printout->SetPaperRectPixels(wxRect(0, 0, w, h));
-    int mw, mh;
-    m_dc->GetSizeMM(&mw, &mh);
-    printout->SetPageSizeMM((int)mw, (int)mh);
     printout->OnPreparePrinting();
 
     // Get some parameters from the printout, if defined.
diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 6d1e9c40c7..48e61003c1 100644
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -115,36 +115,14 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         return false;
     }
 
-    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
-
-    HDC hdc = ::GetDC(NULL);
-    int logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
-    int logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
-    ::ReleaseDC(NULL, hdc);
-
-    int logPPIPrinterX = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSX);
-    int logPPIPrinterY = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSY);
-    if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
+    // Set printout parameters
+    if (!printout->SetUp(*dc))
     {
         delete dc;
         sm_lastError = wxPRINTER_ERROR;
         return false;
     }
 
-    printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
-    printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
-
-    // Set printout parameters
-    printout->SetDC(dc);
-
-    int w, h;
-    dc->GetSize(&w, &h);
-    printout->SetPageSizePixels((int)w, (int)h);
-    printout->SetPaperRectPixels(dc->GetPaperRect());
-
-    dc->GetSizeMM(&w, &h);
-    printout->SetPageSizeMM((int)w, (int)h);
-
     // Create an abort window
     wxBusyCursor busyCursor;
 
@@ -169,7 +147,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     wxPrintAbortDialog *win = CreateAbortWindow(parent, printout);
     wxYield();
 
-    ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);
+    ::SetAbortProc(GetHdcOf(*dc), wxAbortProc);
 
     if (!win)
     {
diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp
index 9bc7f7fccf..c14c376226 100644
--- a/src/osx/core/printmac.cpp
+++ b/src/osx/core/printmac.cpp
@@ -585,8 +585,6 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
         return false;
     }
 
-    printout->SetPPIScreen(wxGetDisplayPPI());
-
     PMResolution res;
     PMPrinter printer;
     wxOSXPrintData* nativeData = (wxOSXPrintData*)
@@ -607,15 +605,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     printout->SetPPIPrinter(int(res.hRes), int(res.vRes));
 
     // Set printout parameters
-    printout->SetDC(dc);
-
-    int w, h;
-    dc->GetSize(&w, &h);
-    printout->SetPageSizePixels((int)w, (int)h);
-    printout->SetPaperRectPixels(dc->GetPaperRect());
-    wxCoord mw, mh;
-    dc->GetSizeMM(&mw, &mh);
-    printout->SetPageSizeMM((int)mw, (int)mh);
+    printout->SetUp(*dc);
 
     // Create an abort window
     wxBeginBusyCursor();

From dd92a269c3cdee5f35c078b7821eb92f688978b1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 May 2018 18:12:26 +0200
Subject: [PATCH 570/916] Add a simple unit test for wxHtmlPrintout pagination
 logic

Verify that the number of pages to be printed is as expected.
---
 tests/Makefile.in              |  4 ++
 tests/html/htmprint.cpp        | 82 ++++++++++++++++++++++++++++++++++
 tests/makefile.bcc             |  4 ++
 tests/makefile.gcc             |  4 ++
 tests/makefile.vc              |  4 ++
 tests/test.bkl                 |  1 +
 tests/test_gui.vcxproj         |  3 +-
 tests/test_gui.vcxproj.filters |  5 ++-
 tests/test_vc7_test_gui.vcproj |  3 ++
 tests/test_vc8_test_gui.vcproj |  4 ++
 tests/test_vc9_test_gui.vcproj |  4 ++
 11 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 tests/html/htmprint.cpp

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d20559e8fe..bc37e442f9 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -243,6 +243,7 @@ TEST_GUI_OBJECTS =  \
 	test_gui_rawbmp.o \
 	test_gui_htmlparser.o \
 	test_gui_htmlwindow.o \
+	test_gui_htmprint.o \
 	test_gui_accelentry.o \
 	test_gui_menu.o \
 	test_gui_guifuncs.o \
@@ -997,6 +998,9 @@ test_gui_htmlparser.o: $(srcdir)/html/htmlparser.cpp $(TEST_GUI_ODEP)
 test_gui_htmlwindow.o: $(srcdir)/html/htmlwindow.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/html/htmlwindow.cpp
 
+test_gui_htmprint.o: $(srcdir)/html/htmprint.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/html/htmprint.cpp
+
 test_gui_accelentry.o: $(srcdir)/menu/accelentry.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/menu/accelentry.cpp
 
diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
new file mode 100644
index 0000000000..0466182845
--- /dev/null
+++ b/tests/html/htmprint.cpp
@@ -0,0 +1,82 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/html/htmprint.cpp
+// Purpose:     wxHtmlPrintout tests
+// Author:      Vadim Zeitlin
+// Created:     2018-05-22
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#if wxUSE_HTML
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+#endif // WX_PRECOMP
+
+#include "wx/html/htmprint.h"
+
+namespace
+{
+
+// Return the number of pages in the printout.
+int CountPages(wxHtmlPrintout& pr)
+{
+    REQUIRE_NOTHROW( pr.OnPreparePrinting() );
+
+    int pageMin = -1,
+        pageMax = -1,
+        selFrom = -1,
+        selTo   = -1;
+    REQUIRE_NOTHROW( pr.GetPageInfo(&pageMin, &pageMax, &selFrom, &selTo) );
+
+    // This should be always the case.
+    CHECK( pageMin == 1 );
+
+    // Return the really interesting value to the caller.
+    return pageMax;
+}
+
+} // anonymous namespace
+
+TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
+{
+    wxHtmlPrintout pr;
+
+    wxBitmap bmp(1000, 1000);
+    wxMemoryDC dc(bmp);
+    pr.SetUp(dc);
+
+    // Empty or short HTML documents should be printed on a single page only.
+    CHECK( CountPages(pr) == 1 );
+
+    pr.SetHtmlText("<p>Hello world!</p>");
+    CHECK( CountPages(pr) == 1 );
+
+    // This one should be too big to fit on a single page.
+    pr.SetHtmlText
+       (
+            "<img width=\"100\" height=\"600\" src=\"dummy\"/>"
+            "<br/>"
+            "<img width=\"100\" height=\"600\" src=\"dummy\"/>"
+       );
+    CHECK( CountPages(pr) == 2 );
+
+    // Special case: normally images are not split, but if the image height is
+    // greater than the page height, it should be.
+    pr.SetHtmlText
+       (
+            "<img width=\"100\" height=\"2500\" src=\"dummy\"/>"
+       );
+    CHECK( CountPages(pr) == 3 );
+}
+
+#endif //wxUSE_HTML
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 30897885eb..69ff216d07 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -229,6 +229,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_rawbmp.obj \
 	$(OBJS)\test_gui_htmlparser.obj \
 	$(OBJS)\test_gui_htmlwindow.obj \
+	$(OBJS)\test_gui_htmprint.obj \
 	$(OBJS)\test_gui_accelentry.obj \
 	$(OBJS)\test_gui_menu.obj \
 	$(OBJS)\test_gui_guifuncs.obj \
@@ -1050,6 +1051,9 @@ $(OBJS)\test_gui_htmlparser.obj: .\html\htmlparser.cpp
 $(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
 
+$(OBJS)\test_gui_htmprint.obj: .\html\htmprint.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\html\htmprint.cpp
+
 $(OBJS)\test_gui_accelentry.obj: .\menu\accelentry.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\menu\accelentry.cpp
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index b9a05edb64..9855000899 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -224,6 +224,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_rawbmp.o \
 	$(OBJS)\test_gui_htmlparser.o \
 	$(OBJS)\test_gui_htmlwindow.o \
+	$(OBJS)\test_gui_htmprint.o \
 	$(OBJS)\test_gui_accelentry.o \
 	$(OBJS)\test_gui_menu.o \
 	$(OBJS)\test_gui_guifuncs.o \
@@ -1027,6 +1028,9 @@ $(OBJS)\test_gui_htmlparser.o: ./html/htmlparser.cpp
 $(OBJS)\test_gui_htmlwindow.o: ./html/htmlwindow.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_gui_htmprint.o: ./html/htmprint.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_accelentry.o: ./menu/accelentry.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 8ae6c6c439..60ecf9ff0c 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -235,6 +235,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_rawbmp.obj \
 	$(OBJS)\test_gui_htmlparser.obj \
 	$(OBJS)\test_gui_htmlwindow.obj \
+	$(OBJS)\test_gui_htmprint.obj \
 	$(OBJS)\test_gui_accelentry.obj \
 	$(OBJS)\test_gui_menu.obj \
 	$(OBJS)\test_gui_guifuncs.obj \
@@ -1229,6 +1230,9 @@ $(OBJS)\test_gui_htmlparser.obj: .\html\htmlparser.cpp
 $(OBJS)\test_gui_htmlwindow.obj: .\html\htmlwindow.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmlwindow.cpp
 
+$(OBJS)\test_gui_htmprint.obj: .\html\htmprint.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\html\htmprint.cpp
+
 $(OBJS)\test_gui_accelentry.obj: .\menu\accelentry.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\menu\accelentry.cpp
 
diff --git a/tests/test.bkl b/tests/test.bkl
index 47016bcf33..4db76b86cb 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -249,6 +249,7 @@
             image/rawbmp.cpp
             html/htmlparser.cpp
             html/htmlwindow.cpp
+            html/htmprint.cpp
             menu/accelentry.cpp
             menu/menu.cpp
             misc/guifuncs.cpp
diff --git a/tests/test_gui.vcxproj b/tests/test_gui.vcxproj
index af4d68b517..d7710c370f 100644
--- a/tests/test_gui.vcxproj
+++ b/tests/test_gui.vcxproj
@@ -535,6 +535,7 @@
     <ClCompile Include="graphics\measuring.cpp" />
     <ClCompile Include="html\htmlparser.cpp" />
     <ClCompile Include="html\htmlwindow.cpp" />
+    <ClCompile Include="html\htmprint.cpp" />
     <ClCompile Include="image\image.cpp" />
     <ClCompile Include="image\rawbmp.cpp" />
     <ClCompile Include="menu\accelentry.cpp" />
@@ -564,4 +565,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/test_gui.vcxproj.filters b/tests/test_gui.vcxproj.filters
index 40ab41a51d..bd3fbfdc4d 100644
--- a/tests/test_gui.vcxproj.filters
+++ b/tests/test_gui.vcxproj.filters
@@ -293,10 +293,13 @@
     <ClCompile Include="graphics\graphmatrix.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="html\htmprint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\samples\sample.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 484c4776ac..eade1cba94 100644
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -439,6 +439,9 @@
 			<File
 				RelativePath=".\html\htmlwindow.cpp">
 			</File>
+			<File
+				RelativePath=".\html\htmprint.cpp">
+			</File>
 			<File
 				RelativePath=".\controls\hyperlinkctrltest.cpp">
 			</File>
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 15fda65a98..8ab1a7002d 100644
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -1054,6 +1054,10 @@
 				RelativePath=".\html\htmlwindow.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\html\htmprint.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\controls\hyperlinkctrltest.cpp"
 				>
diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 6e99dc8de7..6852c292ab 100644
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -1026,6 +1026,10 @@
 				RelativePath=".\html\htmlwindow.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\html\htmprint.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\controls\hyperlinkctrltest.cpp"
 				>

From 896e2d472c915ac20d7ace2bcff5b82663b863a0 Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Thu, 24 May 2018 08:11:46 +0200
Subject: [PATCH 571/916] set wxUSE_DISPLAY=1 for OpenVMS

---
 lib/vms.opt          | 1 +
 lib/vms_gtk.opt      | 2 ++
 setup.h_vms          | 4 ++--
 src/unix/descrip.mms | 6 +++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/vms.opt b/lib/vms.opt
index abc3ca3c52..873b5e8642 100644
--- a/lib/vms.opt
+++ b/lib/vms.opt
@@ -4,6 +4,7 @@ sys$library:libpng.olb/lib
 sys$library:libz.olb/lib
 sys$library:tiff.olb/lib
 X11:libxpm.olb/lib
+sys$library:libxinerama.olb/lib
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share
 sys$library:decw$xtlibshrr5.exe/share
diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt
index 5cc8077e0a..48fbb0270e 100644
--- a/lib/vms_gtk.opt
+++ b/lib/vms_gtk.opt
@@ -10,4 +10,6 @@ sys$share:libgtk.exe/share
 sys$share:libgdk.exe/share
 sys$share:libglib.exe/share
 sys$share:pthread$rtl.exe/share
+sys$library:libxinerama.olb/lib
+sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share
diff --git a/setup.h_vms b/setup.h_vms
index f4056c716d..85bc02d2f9 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 23 April 2018                                                      *
+ * Date : 18 May 2018                                                        *
  *                                                                           *
  *****************************************************************************/
 
@@ -510,7 +510,7 @@ typedef pid_t GPid;
 
 #define wxUSE_CARET         1
 
-#define wxUSE_DISPLAY       0
+#define wxUSE_DISPLAY       1
 
 #define wxUSE_GEOMETRY            1
 
diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index e31ec59dc1..5681043bc8 100644
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 13 June 2016                                                        *
+# Date : 22 May 2018                                                         *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -126,6 +126,10 @@ sound_sdl.obj : sound_sdl.cpp
 stdpaths.obj : stdpaths.cpp
 taskbarx11.obj : taskbarx11.cpp
 displayx11.obj : displayx11.cpp
+	pipe gsed -e "s/X11\/extensions/X11/" < $(MMS$TARGET_NAME).cpp\
+	> $(MMS$TARGET_NAME).cpp_
+	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp_
+	delete $(MMS$TARGET_NAME).cpp_;*
 timerunx.obj : timerunx.cpp
 evtloopunix.obj : evtloopunix.cpp
 	cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn evtloopunix.cpp

From 81750e5b88dfdd2c174ddd4d1cffdb497efb40f1 Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Thu, 24 May 2018 08:19:27 +0200
Subject: [PATCH 572/916] Add libxinerama to the link option files for OpenVMS

---
 lib/{VMS_GTK2.OPT => vms_gtk2.opt}         | 2 ++
 lib/{VMS_X11_UNIV.OPT => vms_x11_univ.opt} | 1 +
 2 files changed, 3 insertions(+)
 rename lib/{VMS_GTK2.OPT => vms_gtk2.opt} (88%)
 rename lib/{VMS_X11_UNIV.OPT => vms_x11_univ.opt} (93%)

diff --git a/lib/VMS_GTK2.OPT b/lib/vms_gtk2.opt
similarity index 88%
rename from lib/VMS_GTK2.OPT
rename to lib/vms_gtk2.opt
index 1efb99b6ff..f6c06c98f1 100644
--- a/lib/VMS_GTK2.OPT
+++ b/lib/vms_gtk2.opt
@@ -15,4 +15,6 @@ sys$share:libglib2.exe/share
 sys$share:freetype2shr/share
 sys$share:libfontconfig/share
 sys$share:pthread$rtl.exe/share
+sys$library:libxinerama.olb/lib
+sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share
diff --git a/lib/VMS_X11_UNIV.OPT b/lib/vms_x11_univ.opt
similarity index 93%
rename from lib/VMS_X11_UNIV.OPT
rename to lib/vms_x11_univ.opt
index 36680e33c0..eca1f4645c 100644
--- a/lib/VMS_X11_UNIV.OPT
+++ b/lib/vms_x11_univ.opt
@@ -11,5 +11,6 @@ sys$share:freetype2shr/share
 sys$share:libfontconfig/share
 sys$share:pthread$rtl.exe/share
 sys$share:libXrender.exe/share
+sys$library:libxinerama.olb/lib
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share

From b0ae6681bedc2c5868c3a6784a9ccfe0a146acfa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 May 2018 00:30:38 +0200
Subject: [PATCH 573/916] Add a test of explicit page breaks in wxHtmlPrintout
 too

Check that using the style forcing a page break does work.
---
 tests/html/htmprint.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 0466182845..905a70d34e 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -77,6 +77,15 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
             "<img width=\"100\" height=\"2500\" src=\"dummy\"/>"
        );
     CHECK( CountPages(pr) == 3 );
+
+    // Test explicit page breaks too.
+    pr.SetHtmlText
+       (
+            "First page"
+            "<div style=\"page-break-before:always\"/>"
+            "Second page"
+       );
+    CHECK( CountPages(pr) == 2 );
 }
 
 #endif //wxUSE_HTML

From 0ada873c4521b9691b445972531617bbd4071384 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 23 May 2018 19:43:23 +0200
Subject: [PATCH 574/916] Slightly simplify wxHtmlDCRenderer::Render()

Use "totalHeight" variable to make it more clear that
m_Cells->GetHeight() and GetTotalHeight() are the same value.
---
 src/html/htmprint.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 84f77b7df4..a11eeae995 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -168,8 +168,8 @@ int wxHtmlDCRenderer::Render(int x, int y,
                       rinfo);
     }
 
-    if (pbreak < m_Cells->GetHeight()) return pbreak;
-    else return GetTotalHeight();
+    const int totalHeight = GetTotalHeight();
+    return pbreak < totalHeight ? pbreak : totalHeight;
 }
 
 int wxHtmlDCRenderer::GetTotalWidth() const

From e01892c6697480654715d0698557bea9b3573621 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 May 2018 00:13:35 +0200
Subject: [PATCH 575/916] Split and simplify wxHtmlDCRenderer::Render()

This function was difficult to understand as it did two quite different
things depending on the value of its "dont_render" argument and using it
also made CountPages() logic more complicated than necessary.

Simplify the code by splitting Render() into FindNextPageBreak(), which
is used by CountPages(), and Render() itself, which doesn't need to deal
with pagination at all as it's either already provided the page start
and end positions or can just assume that everything fits on a single
page (the latter is the case for the headers and footers renderer).

This is a notionally backwards-incompatible change, but no code using
wxHtmlDCRenderer could be found in the wild and the new API is so much
simpler that it seems to be worth switching to it.
---
 docs/changes.txt             |  3 ++
 include/wx/html/htmprint.h   | 21 +++-------
 interface/wx/html/htmprint.h | 24 +++--------
 src/html/htmprint.cpp        | 78 ++++++++++++++++--------------------
 4 files changed, 48 insertions(+), 78 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index daa8c0c192..9275e58a29 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -66,6 +66,9 @@ Changes in behaviour which may result in build errors
 - wx/treebook.h doesn't include wx/treectrl.h (and, via it, wx/textctrl.h) any
   more, include these headers explicitly from your code if necessary.
 
+- wxHtmlDCRenderer::Render() arguments have changed, simply omit the ones not
+  existing in the function signature any more to update the code using it.
+
 
 3.1.2: (released 2018-??-??)
 ----------------------------
diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 5e4584aec1..8bd6d67e91 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -62,30 +62,19 @@ public:
                           const wxString& normal_face = wxEmptyString,
                           const wxString& fixed_face = wxEmptyString);
 
+    // Finds the next page break after the specified (vertical) position.
+    // Returns wxNOT_FOUND if passed in position is the last page break.
+    int FindNextPageBreak(const wxArrayInt& known_pagebreaks, int pos);
+
     // [x,y] is position of upper-left corner of printing rectangle (see SetSize)
     // from is y-coordinate of the very first visible cell
     // to is y-coordinate of the next following page break, if any
-    // Returned value is y coordinate of first cell than didn't fit onto page.
-    // Use this value as 'from' in next call to Render in order to print multiple pages
-    // document
-    // If dont_render is TRUE then nothing is rendered into DC and it only counts
-    // pixels and return y coord of the next page
-    //
-    // known_pagebreaks and number_of_pages are used only when counting pages;
-    // otherwise, their default values should be used. Their purpose is to
-    // support pagebreaks using a subset of CSS2's <DIV>. The <DIV> handler
-    // needs to know what pagebreaks have already been set so that it doesn't
-    // set the same pagebreak twice.
-    //
-    // CAUTION! Render() changes DC's user scale and does NOT restore it!
-    int Render(int x, int y, const wxArrayInt& known_pagebreaks, int from = 0,
-               int dont_render = false, int to = INT_MAX);
+    void Render(int x, int y, int from = 0, int to = INT_MAX);
 
     // returns total width of the html document
     int GetTotalWidth() const;
 
     // returns total height of the html document
-    // (compare Render's return value with this)
     int GetTotalHeight() const;
 
 private:
diff --git a/interface/wx/html/htmprint.h b/interface/wx/html/htmprint.h
index 7d0ceaf15e..9036a6f1ff 100644
--- a/interface/wx/html/htmprint.h
+++ b/interface/wx/html/htmprint.h
@@ -38,10 +38,9 @@ public:
     /**
         Returns the height of the HTML text in pixels.
 
-        This is important if area height (see wxHtmlDCRenderer::SetSize) is
-        smaller that total height and thus the page cannot fit into it. In that
-        case you're supposed to call Render() as long as its return value is
-        smaller than GetTotalHeight()'s.
+        If the height of the area used with this renderer (see
+        wxHtmlDCRenderer::SetSize) is smaller that total height, the renderer
+        will produce more than one page of output.
 
         @see GetTotalWidth()
     */
@@ -52,19 +51,11 @@ public:
 
         @param x,y
             position of upper-left corner of printing rectangle (see SetSize()).
-        @param known_pagebreaks
-            @todo docme
         @param from
             y-coordinate of the very first visible cell.
-        @param dont_render
-            if @true then this method only returns y coordinate of the next page
-            and does not output anything.
         @param to
-            y-coordinate of the last visible cell.
-
-        Returned value is y coordinate of first cell than didn't fit onto page.
-        Use this value as from in next call to Render() in order to print
-        multipages document.
+            y-coordinate of the last visible cell or @c INT_MAX to use the full
+            page height.
 
         @note
         The following three methods @b must always be called before any call to
@@ -72,11 +63,8 @@ public:
         - SetDC()
         - SetSize()
         - SetHtmlText()
-
-        @note Render() changes the DC's user scale and does NOT restore it.
     */
-    int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
-               int dont_render = false, int to = INT_MAX);
+    void Render(int x, int y, int from = 0, int to = INT_MAX);
 
     /**
         Assign DC instance to the renderer.
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index a11eeae995..a65ccb524b 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -140,36 +140,37 @@ void wxHtmlDCRenderer::SetStandardFonts(int size,
     // else: SetHtmlText() not yet called, no need for relayout
 }
 
-int wxHtmlDCRenderer::Render(int x, int y,
-                             const wxArrayInt& known_pagebreaks,
-                             int from, int dont_render, int to)
+int wxHtmlDCRenderer::FindNextPageBreak(const wxArrayInt& known_pagebreaks,
+                                        int pos)
 {
-    wxCHECK_MSG( m_Cells, 0, "SetHtmlText() must be called before Render()" );
-    wxCHECK_MSG( m_DC, 0, "SetDC() must be called before Render()" );
+    // Stop looking for page breaks if the previous one was already at the end
+    // of the last page.
+    //
+    // For an empty HTML document total height is 0, but we still must have at
+    // least a single page in it, so handle the case of pos == 0 specially.
+    if ( pos != 0 && pos >= GetTotalHeight() )
+        return wxNOT_FOUND;
 
-    int pbreak, hght;
+    pos += m_Height;
+    while (m_Cells->AdjustPagebreak(&pos, known_pagebreaks, m_Height)) {}
+    return pos;
+}
 
-    pbreak = (int)(from + m_Height);
-    while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks, m_Height)) {}
-    hght = pbreak - from;
-    if(to < hght)
-        hght = to;
+void wxHtmlDCRenderer::Render(int x, int y, int from, int to)
+{
+    wxCHECK_RET( m_DC, "SetDC() must be called before Render()" );
 
-    if (!dont_render)
-    {
-        wxHtmlRenderingInfo rinfo;
-        wxDefaultHtmlRenderingStyle rstyle;
-        rinfo.SetStyle(&rstyle);
-        m_DC->SetBrush(*wxWHITE_BRUSH);
-        wxDCClipper clip(*m_DC, x, y, m_Width, hght);
-        m_Cells->Draw(*m_DC,
-                      x, (y - from),
-                      y, y + hght,
-                      rinfo);
-    }
+    const int hght = to == INT_MAX ? m_Height : to - from;
 
-    const int totalHeight = GetTotalHeight();
-    return pbreak < totalHeight ? pbreak : totalHeight;
+    wxHtmlRenderingInfo rinfo;
+    wxDefaultHtmlRenderingStyle rstyle;
+    rinfo.SetStyle(&rstyle);
+    m_DC->SetBrush(*wxWHITE_BRUSH);
+    wxDCClipper clip(*m_DC, x, y, m_Width, hght);
+    m_Cells->Draw(*m_DC,
+                  x, (y - from),
+                  y, y + hght,
+                  rinfo);
 }
 
 int wxHtmlDCRenderer::GetTotalWidth() const
@@ -470,27 +471,16 @@ void wxHtmlPrintout::SetFooter(const wxString& footer, int pg)
 void wxHtmlPrintout::CountPages()
 {
     wxBusyCursor wait;
-    int pageWidth, pageHeight, mm_w, mm_h;
-    float ppmm_h, ppmm_v;
 
-    GetPageSizePixels(&pageWidth, &pageHeight);
-    GetPageSizeMM(&mm_w, &mm_h);
-    ppmm_h = (float)pageWidth / mm_w;
-    ppmm_v = (float)pageHeight / mm_h;
-
-    int pos = 0;
     m_NumPages = 0;
 
     m_PageBreaks.Clear();
-    m_PageBreaks.Add( 0);
-    do
+
+    for ( int pos = 0; pos != wxNOT_FOUND; )
     {
-        pos = m_Renderer.Render((int)( ppmm_h * m_MarginLeft),
-                                 (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight),
-                                 m_PageBreaks,
-                                 pos, true, INT_MAX);
         m_PageBreaks.Add( pos);
-    } while (pos < m_Renderer.GetTotalHeight());
+        pos = m_Renderer.FindNextPageBreak(m_PageBreaks, pos);
+    }
 }
 
 
@@ -525,8 +515,8 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
     dc->SetBackgroundMode(wxTRANSPARENT);
 
     m_Renderer.Render((int) (ppmm_h * m_MarginLeft),
-                         (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), m_PageBreaks,
-                         m_PageBreaks[page-1], false, m_PageBreaks[page]-m_PageBreaks[page-1]);
+                         (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight),
+                         m_PageBreaks[page-1], m_PageBreaks[page]);
 
 
     m_RendererHdr.SetDC(dc,
@@ -535,12 +525,12 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
     if (!m_Headers[page % 2].empty())
     {
         m_RendererHdr.SetHtmlText(TranslateHeader(m_Headers[page % 2], page));
-        m_RendererHdr.Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop), m_PageBreaks);
+        m_RendererHdr.Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop));
     }
     if (!m_Footers[page % 2].empty())
     {
         m_RendererHdr.SetHtmlText(TranslateHeader(m_Footers[page % 2], page));
-        m_RendererHdr.Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight), m_PageBreaks);
+        m_RendererHdr.Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight));
     }
 }
 

From 63add2cd1931b01b928b73d574397c792791d6a1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 May 2018 15:47:08 +0200
Subject: [PATCH 576/916] Don't call AdjustPagebreak() in a loop, this seems
 useless

There doesn't seem to be any reason to call this function more than once
on the same cell as the existing implementations are idempotent and it's
difficult to see why this should ever not be the case.
---
 include/wx/html/htmlcell.h   |  1 -
 interface/wx/html/htmlcell.h | 10 ++--------
 src/html/htmprint.cpp        |  2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 6f726b2795..80535d39f3 100644
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -286,7 +286,6 @@ public:
     // few pixels up.
     //
     // Returned value : true if pagebreak was modified, false otherwise
-    // Usage : while (container->AdjustPagebreak(&p)) {}
     virtual bool AdjustPagebreak(int *pagebreak,
                                  const wxArrayInt& known_pagebreaks,
                                  int pageHeight) const;
diff --git a/interface/wx/html/htmlcell.h b/interface/wx/html/htmlcell.h
index 665de5f5b4..1ad5aa7382 100644
--- a/interface/wx/html/htmlcell.h
+++ b/interface/wx/html/htmlcell.h
@@ -198,19 +198,13 @@ public:
         Returns @true if pagebreak was modified, @false otherwise.
 
         @param pagebreak
-            position in pixel of the pagebreak.
+            position in pixels of the pagebreak.
 
         @param known_pagebreaks
             the list of the previous pagebreaks
 
         @param pageHeight
-            the height in pixel of the page drawable area
-
-        Usage:
-        @code
-        while (container->AdjustPagebreak(&p, kp, ph)) {}
-        @endcode
-
+            the height in pixels of the page drawable area
     */
     virtual bool AdjustPagebreak(int* pagebreak,
                                  const wxArrayInt& known_pagebreaks,
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index a65ccb524b..5a1e4d0c87 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -152,7 +152,7 @@ int wxHtmlDCRenderer::FindNextPageBreak(const wxArrayInt& known_pagebreaks,
         return wxNOT_FOUND;
 
     pos += m_Height;
-    while (m_Cells->AdjustPagebreak(&pos, known_pagebreaks, m_Height)) {}
+    m_Cells->AdjustPagebreak(&pos, known_pagebreaks, m_Height);
     return pos;
 }
 

From 71948018f48ed428f63b34b29c909dea9d744d10 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 May 2018 17:51:40 +0200
Subject: [PATCH 577/916] Add a sanity check for AdjustPagebreak()
 implementation

Verify that this function never adjusts page break so far back that it
comes before the previous one (or even at the same position).

This avoids infinite loops in CountPages() even if a custom cell class
implements its overridden AdjustPagebreak() incorrectly.
---
 src/html/htmprint.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 5a1e4d0c87..f42b008fff 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -151,9 +151,16 @@ int wxHtmlDCRenderer::FindNextPageBreak(const wxArrayInt& known_pagebreaks,
     if ( pos != 0 && pos >= GetTotalHeight() )
         return wxNOT_FOUND;
 
-    pos += m_Height;
-    m_Cells->AdjustPagebreak(&pos, known_pagebreaks, m_Height);
-    return pos;
+    int posNext = pos + m_Height;
+    if ( m_Cells->AdjustPagebreak(&posNext, known_pagebreaks, m_Height) )
+    {
+        // Check that AdjustPagebreak() returns the page break at a strictly
+        // greater position than that of the previous page, otherwise
+        // CountPages() would enter into an infinite loop.
+        wxCHECK_MSG( posNext > pos, wxNOT_FOUND, "Bug in AdjustPagebreak()" );
+    }
+
+    return posNext;
 }
 
 void wxHtmlDCRenderer::Render(int x, int y, int from, int to)

From c58d81d32d7faa6dd53a124f27675b3d50b5567b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 May 2018 17:46:14 +0200
Subject: [PATCH 578/916] Simplify wxHtmlPageBreakCell::AdjustPagebreak()

There is no need to look in the known page breaks array for a page break
at the position of this cell, all we care about is whether this cell is
on the current page or not: we must insert a page break if, and only if,
it is.

No real changes in behaviour, but the code is now much simpler to
understand and this change paves way for removing "known_pagebreaks"
entirely, as it was only added for the use in this function (see
f2034f1b6e04a39f6d882cf6cdd53c11bf39f5d7 from 15 years ago), which
doesn't even actually need it.

It should also make pagination code somewhat faster.
---
 src/html/m_layout.cpp | 44 ++++++++-----------------------------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 619ec2bb08..4dba82e6d1 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -80,47 +80,19 @@ private:
 
 bool
 wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak,
-                                     const wxArrayInt& known_pagebreaks,
-                                     int WXUNUSED(pageHeight)) const
+                                     const wxArrayInt& WXUNUSED(known_pagebreaks),
+                                     int pageHeight) const
 {
-    // When we are counting pages, 'known_pagebreaks' is non-NULL.
-    // That's the only time we change 'pagebreak'. Otherwise, pages
-    // were already counted, 'known_pagebreaks' is NULL, and we don't
-    // do anything except return false.
-    //
-    // We also simply return false if the 'pagebreak' argument is
-    // less than (vertically above) or the same as the current
-    // vertical position. Otherwise we'd be setting a pagebreak above
-    // the current cell, which is incorrect, or duplicating a
-    // pagebreak that has already been set.
-    if( known_pagebreaks.GetCount() == 0 || *pagebreak <= m_PosY)
-    {
-        return false;
-    }
-
-    // m_PosY is only the vertical offset from the parent. The pagebreak
-    // required here is the total page offset, so m_PosY must be added
-    // to the parent's offset and height.
-    int total_height = m_PosY;
-    for ( wxHtmlCell *parent = GetParent(); parent; parent = parent->GetParent() )
-    {
-        total_height += parent->GetPosY();
-    }
-
-
-    // Search the array of pagebreaks to see whether we've already set
-    // a pagebreak here.
-    int where = known_pagebreaks.Index( total_height);
-    // Add a pagebreak only if there isn't one already set here.
-    if( wxNOT_FOUND != where)
-    {
-        return false;
-    }
-    else
+    // Request a page break at the position of this cell if it's on the current
+    // page. Note that it's important not to do it unconditionally or we could
+    // end up in an infinite number of page breaks at this cell position.
+    if ( m_PosY < *pagebreak && m_PosY > *pagebreak - pageHeight )
     {
         *pagebreak = m_PosY;
         return true;
     }
+
+    return false;
 }
 
 

From b9b6ccb80461fb694130e046e9f23d3919ff3ecb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 May 2018 18:05:58 +0200
Subject: [PATCH 579/916] Remove "known_pagebreaks" from
 wxHtmlCell::AdjustPagebreak()

This parameter is not actually needed for any reasonable page breaking
algorithm, as it shouldn't care about any previous page breaks except
for the last one, which is already known as "*pagebreak - pageHeight" in
this function.

Removing it will allow to stop using wxArrayInt in the code using this
method and switch to an std::vector<int> instead.

This is not a backwards compatible change, but it seems that there is
very little code actually overriding this function (none could be found
in any open source repositories) and updating it should be as simple as
removing the now unneeded argument.
---
 docs/changes.txt             |  3 +++
 include/wx/html/htmlcell.h   | 24 +++++++++++++-----------
 include/wx/html/htmprint.h   |  2 +-
 interface/wx/html/htmlcell.h | 33 ++++++++++++++++++---------------
 src/html/htmlcell.cpp        | 12 ++++--------
 src/html/htmprint.cpp        |  7 +++----
 src/html/m_layout.cpp        |  8 ++------
 7 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 9275e58a29..f59a0fd64e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -69,6 +69,9 @@ Changes in behaviour which may result in build errors
 - wxHtmlDCRenderer::Render() arguments have changed, simply omit the ones not
   existing in the function signature any more to update the code using it.
 
+- wxHtmlCell::AdjustPagebreak() has lost its "known_pagebreaks" argument,
+  update your code if you override this method (you shouldn't be calling it).
+
 
 3.1.2: (released 2018-??-??)
 ----------------------------
diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 80535d39f3..282b7cd964 100644
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -279,16 +279,20 @@ public:
                                    const wxPoint& pos,
                                    const wxMouseEvent& event);
 
-    // This method used to adjust pagebreak position. The parameter is variable
-    // that contains y-coordinate of page break (= horizontal line that should
-    // not be crossed by words, images etc.). If this cell cannot be divided
-    // into two pieces (each one on another page) then it moves the pagebreak
-    // few pixels up.
+    // This method is called when paginating HTML, e.g. when printing.
+    //
+    // On input, pagebreak contains y-coordinate of page break (i.e. the
+    // horizontal line that should not be crossed by words, images etc.)
+    // relative to the parent cell on entry and may be modified to request a
+    // page break at a position before it if this cell cannot be divided into
+    // two pieces (each one on its own page).
+    //
+    // Note that page break must still happen on the current page, i.e. the
+    // returned value must be strictly greater than "*pagebreak - pageHeight"
+    // and less or equal to "*pagebreak" for the value of pagebreak on input.
     //
     // Returned value : true if pagebreak was modified, false otherwise
-    virtual bool AdjustPagebreak(int *pagebreak,
-                                 const wxArrayInt& known_pagebreaks,
-                                 int pageHeight) const;
+    virtual bool AdjustPagebreak(int *pagebreak, int pageHeight) const;
 
     // Sets cell's behaviour on pagebreaks (see AdjustPagebreak). Default
     // is true - the cell can be split on two pages
@@ -450,9 +454,7 @@ public:
     virtual void DrawInvisible(wxDC& dc, int x, int y,
                                wxHtmlRenderingInfo& info) wxOVERRIDE;
 
-    virtual bool AdjustPagebreak(int *pagebreak,
-                                 const wxArrayInt& known_pagebreaks,
-                                 int pageHeight) const wxOVERRIDE;
+    virtual bool AdjustPagebreak(int *pagebreak, int pageHeight) const wxOVERRIDE;
 
     // insert cell at the end of m_Cells list
     void InsertCell(wxHtmlCell *cell);
diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 8bd6d67e91..7edfa808db 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -64,7 +64,7 @@ public:
 
     // Finds the next page break after the specified (vertical) position.
     // Returns wxNOT_FOUND if passed in position is the last page break.
-    int FindNextPageBreak(const wxArrayInt& known_pagebreaks, int pos);
+    int FindNextPageBreak(int pos);
 
     // [x,y] is position of upper-left corner of printing rectangle (see SetSize)
     // from is y-coordinate of the very first visible cell
diff --git a/interface/wx/html/htmlcell.h b/interface/wx/html/htmlcell.h
index 1ad5aa7382..18b05a8a00 100644
--- a/interface/wx/html/htmlcell.h
+++ b/interface/wx/html/htmlcell.h
@@ -187,28 +187,31 @@ public:
     wxHtmlCell();
 
     /**
-        This method is used to adjust pagebreak position.
-        The first parameter is a variable that contains the y-coordinate of the page break
-        (= horizontal line that should not be crossed by words, images etc.).
-        If this cell cannot be divided into two pieces (each one on another page)
-        then it either moves the pagebreak a few pixels up, if possible, or, if
-        the cell cannot fit on the page at all, then the cell is forced to
-        split unconditionally.
+        This method is called when paginating HTML, e.g.\ when printing.
 
-        Returns @true if pagebreak was modified, @false otherwise.
+        User code should never call this function, but may need to override it
+        in custom HTML cell classes with any specific page breaking
+        requirements.
+
+        On input, @a pagebreak contains y-coordinate of page break (i.e. the
+        horizontal line that should not be crossed by words, images etc.)
+        relative to the parent cell on entry and may be modified to request a
+        page break at a position before it if this cell cannot be divided into
+        two pieces (each one on its own page).
+
+        Note that page break must still happen on the current page, i.e. the
+        returned value must be strictly greater than @code *pagebreak -
+        pageHeight @endcode and less or equal to @c *pagebreak for the value of
+        @a pagebreak on input.
 
         @param pagebreak
             position in pixels of the pagebreak.
-
-        @param known_pagebreaks
-            the list of the previous pagebreaks
-
         @param pageHeight
             the height in pixels of the page drawable area
+
+        @return @true if pagebreak was modified, @false otherwise.
     */
-    virtual bool AdjustPagebreak(int* pagebreak,
-                                 const wxArrayInt& known_pagebreaks,
-                                 int pageHeight) const;
+    virtual bool AdjustPagebreak(int* pagebreak, int pageHeight) const;
 
     /**
         Renders the cell.
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 0f14760198..176c5e79c4 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -157,9 +157,7 @@ wxHtmlCell::GetMouseCursorAt(wxHtmlWindowInterface *window,
 
 
 bool
-wxHtmlCell::AdjustPagebreak(int *pagebreak,
-                            const wxArrayInt& WXUNUSED(known_pagebreaks),
-                            int pageHeight) const
+wxHtmlCell::AdjustPagebreak(int *pagebreak, int pageHeight) const
 {
     // Notice that we always break the cells bigger than the page height here
     // as otherwise we wouldn't be able to break them at all.
@@ -697,19 +695,17 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const
 
 
 bool
-wxHtmlContainerCell::AdjustPagebreak(int *pagebreak,
-                                     const wxArrayInt& known_pagebreaks,
-                                     int pageHeight) const
+wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int pageHeight) const
 {
     if (!m_CanLiveOnPagebreak)
-        return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, pageHeight);
+        return wxHtmlCell::AdjustPagebreak(pagebreak, pageHeight);
 
     bool rt = false;
     int pbrk = *pagebreak - m_PosY;
 
     for ( wxHtmlCell *c = GetFirstChild(); c; c = c->GetNext() )
     {
-        if (c->AdjustPagebreak(&pbrk, known_pagebreaks, pageHeight))
+        if (c->AdjustPagebreak(&pbrk, pageHeight))
             rt = true;
     }
     if (rt)
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index f42b008fff..199f89b835 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -140,8 +140,7 @@ void wxHtmlDCRenderer::SetStandardFonts(int size,
     // else: SetHtmlText() not yet called, no need for relayout
 }
 
-int wxHtmlDCRenderer::FindNextPageBreak(const wxArrayInt& known_pagebreaks,
-                                        int pos)
+int wxHtmlDCRenderer::FindNextPageBreak(int pos)
 {
     // Stop looking for page breaks if the previous one was already at the end
     // of the last page.
@@ -152,7 +151,7 @@ int wxHtmlDCRenderer::FindNextPageBreak(const wxArrayInt& known_pagebreaks,
         return wxNOT_FOUND;
 
     int posNext = pos + m_Height;
-    if ( m_Cells->AdjustPagebreak(&posNext, known_pagebreaks, m_Height) )
+    if ( m_Cells->AdjustPagebreak(&posNext, m_Height) )
     {
         // Check that AdjustPagebreak() returns the page break at a strictly
         // greater position than that of the previous page, otherwise
@@ -486,7 +485,7 @@ void wxHtmlPrintout::CountPages()
     for ( int pos = 0; pos != wxNOT_FOUND; )
     {
         m_PageBreaks.Add( pos);
-        pos = m_Renderer.FindNextPageBreak(m_PageBreaks, pos);
+        pos = m_Renderer.FindNextPageBreak(pos);
     }
 }
 
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 4dba82e6d1..95b0afbab2 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -65,9 +65,7 @@ class wxHtmlPageBreakCell : public wxHtmlCell
 public:
     wxHtmlPageBreakCell() {}
 
-    bool AdjustPagebreak(int* pagebreak,
-                         const wxArrayInt& known_pagebreaks,
-                         int pageHeight) const wxOVERRIDE;
+    bool AdjustPagebreak(int* pagebreak, int pageHeight) const wxOVERRIDE;
 
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
@@ -79,9 +77,7 @@ private:
 };
 
 bool
-wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak,
-                                     const wxArrayInt& WXUNUSED(known_pagebreaks),
-                                     int pageHeight) const
+wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int pageHeight) const
 {
     // Request a page break at the position of this cell if it's on the current
     // page. Note that it's important not to do it unconditionally or we could

From edeca4d9d66ce4ef51eae3f18dc165c21be612ee Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 May 2018 18:11:45 +0200
Subject: [PATCH 580/916] Use wxVector<int> instead of wxArrayInt in
 wxHtmlDCRenderer

No real changes, just prefer standard-like template class to the legacy
wx one.
---
 include/wx/html/htmprint.h |  3 ++-
 src/html/htmprint.cpp      | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 7edfa808db..e2462ceaf5 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -20,6 +20,7 @@
 
 #include "wx/print.h"
 #include "wx/printdlg.h"
+#include "wx/vector.h"
 
 #include <limits.h> // INT_MAX
 
@@ -188,7 +189,7 @@ private:
 
 private:
     int m_NumPages;
-    wxArrayInt m_PageBreaks;
+    wxVector<int> m_PageBreaks;
 
     wxString m_Document, m_BasePath;
     bool m_BasePathIsDir;
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 199f89b835..703fe6387a 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -388,19 +388,19 @@ bool wxHtmlPrintout::OnPrintPage(int page)
 void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
 {
     *minPage = 1;
-    if ( m_NumPages >= (signed)m_PageBreaks.GetCount()-1)
+    if ( m_NumPages >= (signed)m_PageBreaks.size()-1)
         *maxPage = m_NumPages;
     else
-        *maxPage = (signed)m_PageBreaks.GetCount()-1;
+        *maxPage = (signed)m_PageBreaks.size()-1;
     *selPageFrom = 1;
-    *selPageTo = (signed)m_PageBreaks.GetCount()-1;
+    *selPageTo = (signed)m_PageBreaks.size()-1;
 }
 
 
 
 bool wxHtmlPrintout::HasPage(int pageNum)
 {
-    return pageNum > 0 && (unsigned)pageNum < m_PageBreaks.GetCount();
+    return pageNum > 0 && (unsigned)pageNum < m_PageBreaks.size();
 }
 
 
@@ -480,11 +480,11 @@ void wxHtmlPrintout::CountPages()
 
     m_NumPages = 0;
 
-    m_PageBreaks.Clear();
+    m_PageBreaks.clear();
 
     for ( int pos = 0; pos != wxNOT_FOUND; )
     {
-        m_PageBreaks.Add( pos);
+        m_PageBreaks.push_back(pos);
         pos = m_Renderer.FindNextPageBreak(pos);
     }
 }
@@ -550,7 +550,7 @@ wxString wxHtmlPrintout::TranslateHeader(const wxString& instr, int page)
     num.Printf(wxT("%i"), page);
     r.Replace(wxT("@PAGENUM@"), num);
 
-    num.Printf(wxT("%lu"), (unsigned long)(m_PageBreaks.GetCount() - 1));
+    num.Printf(wxT("%lu"), (unsigned long)(m_PageBreaks.size() - 1));
     r.Replace(wxT("@PAGESCNT@"), num);
 
 #if wxUSE_DATETIME

From c5bb583cdffb91d12947d3d586a30141faab22e2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 25 May 2018 01:22:29 +0200
Subject: [PATCH 581/916] Replace wxList used in wxHtmlPrintout with wxVector<>
 too

Prefer the use of the standard-like template class to macro-based list.

It also makes more sense to use a vector rather than a linked list here,
as the elements are never removed from or inserted into m_Filters, so
there is no reason to prefer the list structure.
---
 include/wx/html/htmprint.h |  2 +-
 src/html/htmprint.cpp      | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index e2462ceaf5..2efafaf29f 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -200,7 +200,7 @@ private:
     float m_MarginTop, m_MarginBottom, m_MarginLeft, m_MarginRight, m_MarginSpace;
 
     // list of HTML filters
-    static wxList m_Filters;
+    static wxVector<wxHtmlFilter*> m_Filters;
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlPrintout);
 };
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 703fe6387a..d7d3e7059a 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -195,7 +195,7 @@ int wxHtmlDCRenderer::GetTotalHeight() const
 //--------------------------------------------------------------------------------
 
 
-wxList wxHtmlPrintout::m_Filters;
+wxVector<wxHtmlFilter*> wxHtmlPrintout::m_Filters;
 
 wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {
@@ -210,13 +210,16 @@ wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 
 void wxHtmlPrintout::CleanUpStatics()
 {
-    WX_CLEAR_LIST(wxList, m_Filters);
+    for ( size_t n = 0; n < m_Filters.size(); ++n )
+        delete m_Filters[n];
+
+    m_Filters.clear();
 }
 
 // Adds input filter
 void wxHtmlPrintout::AddFilter(wxHtmlFilter *filter)
 {
-    m_Filters.Append(filter);
+    m_Filters.push_back(filter);
 }
 
 bool
@@ -432,17 +435,15 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
     wxHtmlFilterHTML defaultFilter;
     wxString doc;
 
-    wxList::compatibility_iterator node = m_Filters.GetFirst();
-    while (node)
+    for ( size_t n = 0; n < m_Filters.size(); ++n )
     {
-        wxHtmlFilter *h = (wxHtmlFilter*) node->GetData();
+        wxHtmlFilter* const h = m_Filters[n];
         if (h->CanRead(*ff))
         {
             doc = h->ReadFile(*ff);
             done = true;
             break;
         }
-        node = node->GetNext();
     }
 
     if (!done)

From 8d7601295ba7ed8ac44f866fd60f75ef205c88e1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 25 May 2018 01:31:54 +0200
Subject: [PATCH 582/916] Make wxHtmlDCRenderer::FindNextPageBreak() const

It doesn't modify the renderer.
---
 include/wx/html/htmprint.h | 2 +-
 src/html/htmprint.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 2efafaf29f..a455dec747 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -65,7 +65,7 @@ public:
 
     // Finds the next page break after the specified (vertical) position.
     // Returns wxNOT_FOUND if passed in position is the last page break.
-    int FindNextPageBreak(int pos);
+    int FindNextPageBreak(int pos) const;
 
     // [x,y] is position of upper-left corner of printing rectangle (see SetSize)
     // from is y-coordinate of the very first visible cell
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index d7d3e7059a..3b03b2e67c 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -140,7 +140,7 @@ void wxHtmlDCRenderer::SetStandardFonts(int size,
     // else: SetHtmlText() not yet called, no need for relayout
 }
 
-int wxHtmlDCRenderer::FindNextPageBreak(int pos)
+int wxHtmlDCRenderer::FindNextPageBreak(int pos) const
 {
     // Stop looking for page breaks if the previous one was already at the end
     // of the last page.

From bf9712978aa7344416e1b35ff0c9808f7132c1f6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 25 May 2018 01:32:31 +0200
Subject: [PATCH 583/916] Document wxHtmlDCRenderer::FindNextPageBreak()

This is a useful (even if mostly trivial) function, so document it and
mention it in Render() documentation too.
---
 interface/wx/html/htmprint.h | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/interface/wx/html/htmprint.h b/interface/wx/html/htmprint.h
index 9036a6f1ff..6e6a0908dc 100644
--- a/interface/wx/html/htmprint.h
+++ b/interface/wx/html/htmprint.h
@@ -46,9 +46,39 @@ public:
     */
     int GetTotalHeight() const;
 
+    /**
+        Finds the next page break after the specified (vertical) position.
+
+        An example of using this method:
+
+        @code
+        std::vector<int> pages;
+        for ( int pos = 0; pos != wxNOT_FOUND; pos = renderer.FindNextPageBreak(pos) )
+        {
+            pages.push_back(pos);
+        }
+
+        // "pages" vector now contains all page break positions and, in
+        // particular, its size() returns the number of pages
+        @endcode
+
+        @param pos Absolute position of the last page break. For the initial
+            call of this function, it should be 0 and for the subsequent ones
+            it should be the previous return value.
+        @return Position of the next page break or @c wxNOT_FOUND if there are
+            no more of them.
+
+        @since 3.1.2
+    */
+    int FindNextPageBreak(int pos) const;
+
     /**
         Renders HTML text to the DC.
 
+        When using multi-page documents, FindNextPageBreak() can be used to
+        find the values for @a from and @a to, which should be the consecutive
+        page breaks returned by that function.
+
         @param x,y
             position of upper-left corner of printing rectangle (see SetSize()).
         @param from

From adfde70054f6911faeffc9cf6f9cde29baf275a7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 25 May 2018 01:35:34 +0200
Subject: [PATCH 584/916] Remove redundant wxHtmlDCRenderer::m_NumPages

The actual number of pages is given by the number of elements in
m_PageBreaks vector after CountPages() is shown and is unknown until
then, so m_NumPages is completely unnecessary and can be just removed.
---
 include/wx/html/htmprint.h | 3 +--
 src/html/htmprint.cpp      | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index a455dec747..3c0d12f6ab 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -184,11 +184,10 @@ private:
     wxString TranslateHeader(const wxString& instr, int page);
             // substitute @PAGENUM@ and @PAGESCNT@ by real values
     void CountPages();
-            // counts pages and fills m_NumPages and m_PageBreaks
+            // fills m_PageBreaks, which indirectly gives the number of pages
 
 
 private:
-    int m_NumPages;
     wxVector<int> m_PageBreaks;
 
     wxString m_Document, m_BasePath;
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 3b03b2e67c..781c9f4d98 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -199,7 +199,6 @@ wxVector<wxHtmlFilter*> wxHtmlPrintout::m_Filters;
 
 wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {
-    m_NumPages = INT_MAX;
     m_BasePathIsDir = true;
     m_HeaderHeight = m_FooterHeight = 0;
     SetMargins(); // to default values
@@ -391,8 +390,8 @@ bool wxHtmlPrintout::OnPrintPage(int page)
 void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
 {
     *minPage = 1;
-    if ( m_NumPages >= (signed)m_PageBreaks.size()-1)
-        *maxPage = m_NumPages;
+    if ( m_PageBreaks.empty() )
+        *maxPage = INT_MAX;
     else
         *maxPage = (signed)m_PageBreaks.size()-1;
     *selPageFrom = 1;
@@ -479,8 +478,6 @@ void wxHtmlPrintout::CountPages()
 {
     wxBusyCursor wait;
 
-    m_NumPages = 0;
-
     m_PageBreaks.clear();
 
     for ( int pos = 0; pos != wxNOT_FOUND; )

From 8dffab05563c6833c3376ff238f5a15b1ea621f7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 May 2018 22:28:33 +0200
Subject: [PATCH 585/916] Add another page-break-before test to pagination unit
 test

Check that the nested elements with this style are handled as expected.
---
 tests/html/htmprint.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 905a70d34e..58df3ed3e2 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -86,6 +86,19 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
             "Second page"
        );
     CHECK( CountPages(pr) == 2 );
+
+    pr.SetHtmlText
+       (
+            "Something"
+            "<div style=\"page-break-before:always\">"
+                "<div style=\"page-break-before:always\">"
+                    "<div style=\"page-break-before:always\">"
+                        "whatever"
+                    "</div>"
+                "</div>"
+            "</div>"
+       );
+    CHECK( CountPages(pr) == 2 );
 }
 
 #endif //wxUSE_HTML

From b55578e40c1cd7133bab2613feba24ee6c63b9c5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 May 2018 22:43:28 +0200
Subject: [PATCH 586/916] Fix HTML pagination test for high DPI values

The standard margins, expressed in millimeters, could result in the
usable page space being much smaller than 1000px used for the DC size
when using higher DPIs, which means that the test checking that a 2400px
image took only 3 pages could fail, as it could require 4 of them in
this case.

Fix this by getting rid of the margins, as this should ensure that the
page height is exactly 1000px now, independently of the actual DPI.
---
 tests/html/htmprint.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 58df3ed3e2..34560d9cb8 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -51,6 +51,14 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
 {
     wxHtmlPrintout pr;
 
+    // Pagination works in terms of printer page size, which is obtained by
+    // subtracting margins from the total size and margins are expressed in
+    // millimeters, so their conversion to pixels depends on DPI. To ensure
+    // that we get the same results for all values of DPI, get just get rid
+    // of the margins entirely (it would also be possible to adjust them by
+    // the DPI-dependent factor, but it doesn't seem to be worth doing it).
+    pr.SetMargins(0, 0, 0, 0, 0);
+
     wxBitmap bmp(1000, 1000);
     wxMemoryDC dc(bmp);
     pr.SetUp(dc);

From 424f64f27d94f83ed946ebfcf9b9543c828f9f25 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 May 2018 22:56:05 +0200
Subject: [PATCH 587/916] Fix invalid cast in wxMSW AutoHANDLE::InvalidHandle()

Somehow this compiled with the previous gcc versions (as well as MSVS),
but a static_cast from an integer wxUIntPtr type to a pointer HANDLE
type is obviously invalid and a reinterpret_cast is needed here.

This fixes compilation with g++ 8.
---
 include/wx/msw/private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index f833a58a0f..1e4d0f8fcd 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -145,7 +145,7 @@ protected:
     // implicitly convertible to HANDLE, which is a pointer.
     static HANDLE InvalidHandle()
     {
-        return static_cast<HANDLE>(INVALID_VALUE);
+        return reinterpret_cast<HANDLE>(INVALID_VALUE);
     }
 
     void DoClose()

From d4f380e16ee23de85ed4907e9bcc344b9c0cd885 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 28 May 2018 22:10:56 +0200
Subject: [PATCH 588/916] Use Bind() instead of Connect() in wxWidgets code

Use more modern function which allows to avoid wxXXXEventHandler()
macros use.

No real changes.
---
 include/wx/compositewin.h        | 20 ++++----------
 include/wx/containr.h            | 13 +++++----
 include/wx/docview.h             | 12 +++------
 include/wx/filepicker.h          | 10 +++----
 include/wx/generic/custombgwin.h |  8 +++---
 src/aui/framemanager.cpp         | 15 +++++------
 src/common/clrpickercmn.cpp      |  5 ++--
 src/common/combocmn.cpp          |  9 ++-----
 src/common/fontpickercmn.cpp     |  4 +--
 src/common/pickerbase.cpp        | 13 +++------
 src/common/prntbase.cpp          |  6 ++---
 src/common/treebase.cpp          |  2 +-
 src/common/wincmn.cpp            | 20 +++-----------
 src/generic/aboutdlgg.cpp        |  6 ++---
 src/generic/calctrlg.cpp         | 13 +++------
 src/generic/clrpickerg.cpp       |  4 +--
 src/generic/datavgen.cpp         |  2 +-
 src/generic/datectlg.cpp         |  4 +--
 src/generic/filepickerg.cpp      |  4 +--
 src/generic/fontpickerg.cpp      |  4 +--
 src/generic/hyperlinkg.cpp       | 22 +++++++--------
 src/generic/mdig.cpp             |  8 +++---
 src/generic/richtooltipg.cpp     |  2 +-
 src/generic/statbmpg.cpp         |  2 +-
 src/generic/stattextg.cpp        |  2 +-
 src/generic/timectrlg.cpp        | 40 ++++-----------------------
 src/gtk/anybutton.cpp            | 12 +++------
 src/gtk/filepicker.cpp           |  4 +--
 src/gtk/nonownedwnd.cpp          | 16 ++---------
 src/msw/calctrl.cpp              |  6 ++---
 src/msw/dialog.cpp               |  3 +--
 src/msw/mediactrl_am.cpp         |  6 ++---
 src/msw/mediactrl_qt.cpp         |  5 ++--
 src/msw/mediactrl_wmp10.cpp      |  8 +++---
 src/msw/nonownedwnd.cpp          | 22 +++------------
 src/msw/ole/activex.cpp          | 11 +++-----
 src/msw/statbmp.cpp              |  2 +-
 src/msw/statbox.cpp              |  2 +-
 src/msw/textctrl.cpp             |  2 +-
 src/osx/cocoa/filedlg.mm         |  2 +-
 src/propgrid/advprops.cpp        | 12 +++------
 src/propgrid/manager.cpp         | 46 +++++++++++++-------------------
 src/propgrid/propgrid.cpp        | 45 ++++++++-----------------------
 src/propgrid/props.cpp           | 41 ++++++++++------------------
 src/ribbon/panel.cpp             | 21 +++++++--------
 src/stc/ScintillaWX.cpp          |  4 +--
 src/unix/mediactrl.cpp           |  4 +--
 src/unix/taskbarx11.cpp          |  7 ++---
 48 files changed, 168 insertions(+), 363 deletions(-)

diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h
index c9a339ac44..8483414686 100644
--- a/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@ -172,11 +172,7 @@ protected:
     // Default ctor sets things up for handling children events correctly.
     wxCompositeWindow()
     {
-        this->Connect
-              (
-                  wxEVT_CREATE,
-                  wxWindowCreateEventHandler(wxCompositeWindow::OnWindowCreate)
-              );
+        this->Bind(wxEVT_CREATE, &wxCompositeWindow::OnWindowCreate, this);
     }
 
 private:
@@ -191,15 +187,11 @@ private:
 
         wxWindow *child = event.GetWindow();
         if ( child == this )
-            return; // not a child, we don't want to Connect() to ourselves
+            return; // not a child, we don't want to bind to ourselves
 
-        child->Connect(wxEVT_SET_FOCUS,
-                       wxFocusEventHandler(wxCompositeWindow::OnSetFocus),
-                       NULL, this);
+        child->Bind(wxEVT_SET_FOCUS, &wxCompositeWindow::OnSetFocus, this);
 
-        child->Connect(wxEVT_KILL_FOCUS,
-                       wxFocusEventHandler(wxCompositeWindow::OnKillFocus),
-                       NULL, this);
+        child->Bind(wxEVT_KILL_FOCUS, &wxCompositeWindow::OnKillFocus, this);
 
         // Some events should be only handled for non-toplevel children. For
         // example, we want to close the control in wxDataViewCtrl when Enter
@@ -213,9 +205,7 @@ private:
             win = win->GetParent();
         }
 
-        child->Connect(wxEVT_CHAR,
-                       wxKeyEventHandler(wxCompositeWindow::OnChar),
-                       NULL, this);
+        child->Bind(wxEVT_CHAR, &wxCompositeWindow::OnChar, this);
     }
 
     void OnChar(wxKeyEvent& event)
diff --git a/include/wx/containr.h b/include/wx/containr.h
index 2251a7cd75..4c0d9d5de8 100644
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -199,14 +199,13 @@ public:
         m_container.SetContainerWindow(this);
 
 #ifndef wxHAS_NATIVE_TAB_TRAVERSAL
-        BaseWindowClass::Connect(wxEVT_NAVIGATION_KEY,
-                wxNavigationKeyEventHandler(wxNavigationEnabled::OnNavigationKey));
+        BaseWindowClass::Bind(wxEVT_NAVIGATION_KEY,
+                              &wxNavigationEnabled::OnNavigationKey, this);
 
-        BaseWindowClass::Connect(wxEVT_SET_FOCUS,
-                wxFocusEventHandler(wxNavigationEnabled::OnFocus));
-
-        BaseWindowClass::Connect(wxEVT_CHILD_FOCUS,
-                wxChildFocusEventHandler(wxNavigationEnabled::OnChildFocus));
+        BaseWindowClass::Bind(wxEVT_SET_FOCUS,
+                              &wxNavigationEnabled::OnFocus, this);
+        BaseWindowClass::Bind(wxEVT_CHILD_FOCUS,
+                              &wxNavigationEnabled::OnChildFocus, this);
 #endif // !wxHAS_NATIVE_TAB_TRAVERSAL
     }
 
diff --git a/include/wx/docview.h b/include/wx/docview.h
index 3fb726cada..64378d574f 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -712,10 +712,8 @@ public:
         if ( !BaseClass::Create(parent, id, title, pos, size, style, name) )
             return false;
 
-        this->Connect(wxEVT_ACTIVATE,
-                      wxActivateEventHandler(wxDocChildFrameAny::OnActivate));
-        this->Connect(wxEVT_CLOSE_WINDOW,
-                      wxCloseEventHandler(wxDocChildFrameAny::OnCloseWindow));
+        this->Bind(wxEVT_ACTIVATE, &wxDocChildFrameAny::OnActivate, this);
+        this->Bind(wxEVT_CLOSE_WINDOW, &wxDocChildFrameAny::OnCloseWindow, this);
 
         return true;
     }
@@ -867,10 +865,8 @@ public:
         if ( !BaseFrame::Create(frame, id, title, pos, size, style, name) )
             return false;
 
-        this->Connect(wxID_EXIT, wxEVT_MENU,
-                      wxCommandEventHandler(wxDocParentFrameAny::OnExit));
-        this->Connect(wxEVT_CLOSE_WINDOW,
-                      wxCloseEventHandler(wxDocParentFrameAny::OnCloseWindow));
+        this->Bind(wxEVT_MENU, &wxDocParentFrameAny::OnExit, this, wxID_EXIT);
+        this->Bind(wxEVT_CLOSE_WINDOW, &wxDocParentFrameAny::OnCloseWindow, this);
 
         return true;
     }
diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index 6c9b3f85a7..c17e820bf2 100644
--- a/include/wx/filepicker.h
+++ b/include/wx/filepicker.h
@@ -277,9 +277,8 @@ public:     // overrides
 
     virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE
     {
-        sender->Connect( wxEVT_FILEPICKER_CHANGED,
-            wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ),
-            NULL, eventSink );
+        sender->Bind(wxEVT_FILEPICKER_CHANGED,
+            &wxFileDirPickerCtrlBase::OnFileDirChange, eventSink );
     }
 
 
@@ -377,9 +376,8 @@ public:     // overrides
 
     virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE
     {
-        sender->Connect( wxEVT_DIRPICKER_CHANGED,
-            wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ),
-            NULL, eventSink );
+        sender->Bind( wxEVT_DIRPICKER_CHANGED,
+            &wxFileDirPickerCtrlBase::OnFileDirChange, eventSink );
     }
 
 
diff --git a/include/wx/generic/custombgwin.h b/include/wx/generic/custombgwin.h
index 633dbd5bc9..c646b700c8 100644
--- a/include/wx/generic/custombgwin.h
+++ b/include/wx/generic/custombgwin.h
@@ -67,18 +67,18 @@ protected:
 
         if ( m_bitmapBg.IsOk() )
         {
-            BaseWindowClass::Connect
+            BaseWindowClass::Bind
             (
                 wxEVT_ERASE_BACKGROUND,
-                wxEraseEventHandler(wxCustomBackgroundWindow::OnEraseBackground)
+                &wxCustomBackgroundWindow::OnEraseBackground, this
             );
         }
         else
         {
-            BaseWindowClass::Disconnect
+            BaseWindowClass::Unbind
             (
                 wxEVT_ERASE_BACKGROUND,
-                wxEraseEventHandler(wxCustomBackgroundWindow::OnEraseBackground)
+                &wxCustomBackgroundWindow::OnEraseBackground, this
             );
         }
     }
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 87c4c37542..9456f2b7ae 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -859,8 +859,7 @@ void wxAuiManager::UpdateHintWindowConfig()
                                          wxDefaultPosition, wxSize(1,1),
                                          wxFRAME_FLOAT_ON_PARENT
                                          | wxFRAME_TOOL_WINDOW );
-            m_hintWnd->Connect(wxEVT_ACTIVATE,
-                wxActivateEventHandler(wxAuiManager::OnHintActivate), NULL, this);
+            m_hintWnd->Bind(wxEVT_ACTIVATE, &wxAuiManager::OnHintActivate, this);
 
             // Can't set the bg colour of a Frame in wxMac
             wxPanel* p = new wxPanel(m_hintWnd);
@@ -3285,8 +3284,8 @@ void wxAuiManager::OnHintFadeTimer(wxTimerEvent& WXUNUSED(event))
     if (!m_hintWnd || m_hintFadeAmt >= m_hintFadeMax)
     {
         m_hintFadeTimer.Stop();
-        Disconnect(m_hintFadeTimer.GetId(), wxEVT_TIMER,
-                   wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
+        Unbind(wxEVT_TIMER, &wxAuiManager::OnHintFadeTimer, this,
+               m_hintFadeTimer.GetId());
         return;
     }
 
@@ -3330,8 +3329,8 @@ void wxAuiManager::ShowHint(const wxRect& rect)
             // start fade in timer
             m_hintFadeTimer.SetOwner(this);
             m_hintFadeTimer.Start(5);
-            Connect(m_hintFadeTimer.GetId(), wxEVT_TIMER,
-                    wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
+            Bind(wxEVT_TIMER, &wxAuiManager::OnHintFadeTimer, this,
+                 m_hintFadeTimer.GetId());
         }
     }
     else  // Not using a transparent hint window...
@@ -3402,8 +3401,8 @@ void wxAuiManager::HideHint()
         m_hintFadeTimer.Stop();
         // In case this is called while a hint fade is going, we need to
         // disconnect the event handler.
-        Disconnect(m_hintFadeTimer.GetId(), wxEVT_TIMER,
-                   wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
+        Unbind(wxEVT_TIMER, &wxAuiManager::OnHintFadeTimer, this,
+               m_hintFadeTimer.GetId());
         m_lastHint = wxRect();
         return;
     }
diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 6f5f118c93..f22482a2cd 100644
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -67,9 +67,8 @@ bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id,
     // complete sizer creation
     wxPickerBase::PostCreation();
 
-    m_picker->Connect(wxEVT_COLOURPICKER_CHANGED,
-            wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange),
-            NULL, this);
+    m_picker->Bind(wxEVT_COLOURPICKER_CHANGED,
+            &wxColourPickerCtrl::OnColourChange, this);
 
     return true;
 }
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index e3bab06d47..b1e0645abd 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1094,15 +1094,10 @@ wxComboCtrlBase::CreateTextCtrl(int style)
                        style);
 
         // Connecting the events is currently the most reliable way
-        wxWindowID id = m_text->GetId();
-        m_text->Connect(id, wxEVT_TEXT,
-                        wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
-                        NULL, this);
+        m_text->Bind(wxEVT_TEXT, &wxComboCtrlBase::OnTextCtrlEvent, this);
         if ( style & wxTE_PROCESS_ENTER )
         {
-            m_text->Connect(id, wxEVT_TEXT_ENTER,
-                            wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
-                            NULL, this);
+            m_text->Bind(wxEVT_TEXT_ENTER, &wxComboCtrlBase::OnTextCtrlEvent, this);
         }
 
         m_text->SetHint(m_hintText);
diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp
index 40b96f9432..5c958fcc93 100644
--- a/src/common/fontpickercmn.cpp
+++ b/src/common/fontpickercmn.cpp
@@ -74,9 +74,7 @@ bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
     // complete sizer creation
     wxPickerBase::PostCreation();
 
-    m_picker->Connect(wxEVT_FONTPICKER_CHANGED,
-            wxFontPickerEventHandler(wxFontPickerCtrl::OnFontChange),
-            NULL, this);
+    m_picker->Bind(wxEVT_FONTPICKER_CHANGED, &wxFontPickerCtrl::OnFontChange, this);
 
     return true;
 }
diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 306166686d..d8d793e0f6 100644
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -91,16 +91,9 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // set the initial contents of the textctrl
         m_text->SetValue(text);
 
-        m_text->Connect(m_text->GetId(), wxEVT_TEXT,
-                wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate),
-                NULL, this);
-        m_text->Connect(m_text->GetId(), wxEVT_KILL_FOCUS,
-                wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus),
-                NULL, this);
-
-        m_text->Connect(m_text->GetId(), wxEVT_DESTROY,
-                wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
-                NULL, this);
+        m_text->Bind(wxEVT_TEXT, &wxPickerBase::OnTextCtrlUpdate, this);
+        m_text->Bind(wxEVT_KILL_FOCUS, &wxPickerBase::OnTextCtrlKillFocus, this);
+        m_text->Bind(wxEVT_DESTROY, &wxPickerBase::OnTextCtrlDelete, this);
 
         m_sizer->Add(m_text,
                      wxSizerFlags(1).CentreVertical().Border(wxRIGHT));
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index eb2d92ecdb..6eb4f9a396 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -1139,10 +1139,8 @@ public:
         m_maxPage =
         m_page = 1;
 
-        Connect(wxEVT_KILL_FOCUS,
-                wxFocusEventHandler(wxPrintPageTextCtrl::OnKillFocus));
-        Connect(wxEVT_TEXT_ENTER,
-                wxCommandEventHandler(wxPrintPageTextCtrl::OnTextEnter));
+        Bind(wxEVT_KILL_FOCUS, &wxPrintPageTextCtrl::OnKillFocus, this);
+        Bind(wxEVT_TEXT_ENTER, &wxPrintPageTextCtrl::OnTextEnter, this);
     }
 
     // Update the pages range, must be called after OnPreparePrinting() as
diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 50359c40f4..b71e2d07a0 100644
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -179,7 +179,7 @@ wxTreeCtrlBase::wxTreeCtrlBase()
     // quick DoGetBestSize calculation
     m_quickBestSize = true;
 
-    Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(wxTreeCtrlBase::OnCharHook));
+    Bind(wxEVT_CHAR_HOOK, &wxTreeCtrlBase::OnCharHook, this);
 }
 
 wxTreeCtrlBase::~wxTreeCtrlBase()
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 497c075bce..82f3340f0f 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -3022,10 +3022,7 @@ wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y)
 {
     gs_popupMenuSelection = wxID_NONE;
 
-    Connect(wxEVT_MENU,
-            wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
-            NULL,
-            this);
+    Bind(wxEVT_MENU, &wxWindowBase::InternalOnPopupMenu, this);
 
     // it is common to construct the menu passed to this function dynamically
     // using some fixed range of ids which could clash with the ids used
@@ -3034,21 +3031,12 @@ wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y)
     // elsewhere in the program code and this is difficult to avoid in the
     // program itself, so instead we just temporarily suspend UI updating while
     // this menu is shown
-    Connect(wxEVT_UPDATE_UI,
-            wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate),
-            NULL,
-            this);
+    Bind(wxEVT_UPDATE_UI, &wxWindowBase::InternalOnPopupMenuUpdate, this);
 
     PopupMenu(&menu, x, y);
 
-    Disconnect(wxEVT_UPDATE_UI,
-               wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate),
-               NULL,
-               this);
-    Disconnect(wxEVT_MENU,
-               wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
-               NULL,
-               this);
+    Unbind(wxEVT_UPDATE_UI, &wxWindowBase::InternalOnPopupMenuUpdate, this);
+    Unbind(wxEVT_MENU, &wxWindowBase::InternalOnPopupMenu, this);
 
     return gs_popupMenuSelection;
 }
diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index 9cb175334d..4340dabce1 100644
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -220,10 +220,8 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* paren
     CentreOnParent();
 
 #if !wxUSE_MODAL_ABOUT_DIALOG
-    Connect(wxEVT_CLOSE_WINDOW,
-            wxCloseEventHandler(wxGenericAboutDialog::OnCloseWindow));
-    Connect(wxID_OK, wxEVT_BUTTON,
-            wxCommandEventHandler(wxGenericAboutDialog::OnOK));
+    Bind(wxEVT_CLOSE_WINDOW, &wxGenericAboutDialog::OnCloseWindow, this);
+    Bind(wxEVT_BUTTON, &wxGenericAboutDialog::OnOK, this, wxID_OK);
 #endif // !wxUSE_MODAL_ABOUT_DIALOG
 
     return true;
diff --git a/src/generic/calctrlg.cpp b/src/generic/calctrlg.cpp
index a3b396221f..58875a3066 100644
--- a/src/generic/calctrlg.cpp
+++ b/src/generic/calctrlg.cpp
@@ -278,9 +278,7 @@ void wxGenericCalendarCtrl::CreateMonthComboBox()
                           wxDefaultCoord,
                           wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
 
-    m_comboMonth->Connect(m_comboMonth->GetId(), wxEVT_COMBOBOX,
-                          wxCommandEventHandler(wxGenericCalendarCtrl::OnMonthChange),
-                          NULL, this);
+    m_comboMonth->Bind(wxEVT_COMBOBOX, &wxGenericCalendarCtrl::OnMonthChange, this);
 }
 
 void wxGenericCalendarCtrl::CreateYearSpinCtrl()
@@ -292,13 +290,8 @@ void wxGenericCalendarCtrl::CreateYearSpinCtrl()
                                 wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
                                 -4300, 10000, GetDate().GetYear());
 
-    m_spinYear->Connect(m_spinYear->GetId(), wxEVT_TEXT,
-                        wxCommandEventHandler(wxGenericCalendarCtrl::OnYearTextChange),
-                        NULL, this);
-
-    m_spinYear->Connect(m_spinYear->GetId(), wxEVT_SPINCTRL,
-                        wxSpinEventHandler(wxGenericCalendarCtrl::OnYearChange),
-                        NULL, this);
+    m_spinYear->Bind(wxEVT_TEXT, &wxGenericCalendarCtrl::OnYearTextChange, this);
+    m_spinYear->Bind(wxEVT_SPINCTRL, &wxGenericCalendarCtrl::OnYearChange, this);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 6cd4055e16..5bb576a3c2 100644
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -57,9 +57,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
-    Connect(GetId(), wxEVT_BUTTON,
-            wxCommandEventHandler(wxGenericColourButton::OnButtonClick),
-            NULL, this);
+    Bind(wxEVT_BUTTON, &wxGenericColourButton::OnButtonClick, this, GetId());
 
     m_colour = col;
     UpdateColour();
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index bc4ed646ef..982947dedf 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1514,7 +1514,7 @@ public:
     wxWindow( parent, wxID_ANY, wxPoint(0,0), size )
     {
         m_bitmap = bitmap;
-        Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) );
+        Bind(wxEVT_PAINT, &wxBitmapCanvas::OnPaint, this);
     }
 
     void OnPaint( wxPaintEvent &WXUNUSED(event) )
diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 4a89d31d57..767a7454df 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -86,9 +86,7 @@ public:
         if ( !tx )
             tx = m_combo;
 
-        tx->Connect(wxEVT_KILL_FOCUS,
-                    wxFocusEventHandler(wxCalendarComboPopup::OnKillTextFocus),
-                    NULL, this);
+        tx->Bind(wxEVT_KILL_FOCUS, &wxCalendarComboPopup::OnKillTextFocus, this);
 
         return true;
     }
diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index 20f6f77e82..9beebb1636 100644
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -80,9 +80,7 @@ bool wxGenericFileDirButton::Create(wxWindow *parent,
     }
 
     // and handle user clicks on it
-    Connect(GetId(), wxEVT_BUTTON,
-            wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
-            NULL, this);
+    Bind(wxEVT_BUTTON, &wxGenericFileDirButton::OnButtonClick, this, GetId());
 
     // create the dialog associated with this button
     m_path = path;
diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp
index 6c74756fd8..481ff030ab 100644
--- a/src/generic/fontpickerg.cpp
+++ b/src/generic/fontpickerg.cpp
@@ -58,9 +58,7 @@ bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
-    Connect(GetId(), wxEVT_BUTTON,
-            wxCommandEventHandler(wxGenericFontButton::OnButtonClick),
-            NULL, this);
+    Bind(wxEVT_BUTTON, &wxGenericFontButton::OnButtonClick, this, GetId());
 
     InitFontData();
 
diff --git a/src/generic/hyperlinkg.cpp b/src/generic/hyperlinkg.cpp
index 1d0bb412d7..bc5239ce52 100644
--- a/src/generic/hyperlinkg.cpp
+++ b/src/generic/hyperlinkg.cpp
@@ -88,15 +88,15 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     //       behave correctly (as we intercept events doing things which interfere
     //       with GTK+'s native handling):
 
-    Connect( wxEVT_PAINT, wxPaintEventHandler(wxGenericHyperlinkCtrl::OnPaint) );
-    Connect( wxEVT_SET_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) );
-    Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler(wxGenericHyperlinkCtrl::OnFocus) );
-    Connect( wxEVT_CHAR, wxKeyEventHandler(wxGenericHyperlinkCtrl::OnChar) );
-    Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeaveWindow) );
+    Bind( wxEVT_PAINT, &wxGenericHyperlinkCtrl::OnPaint, this);
+    Bind( wxEVT_SET_FOCUS, &wxGenericHyperlinkCtrl::OnFocus, this);
+    Bind( wxEVT_KILL_FOCUS, &wxGenericHyperlinkCtrl::OnFocus, this);
+    Bind( wxEVT_CHAR, &wxGenericHyperlinkCtrl::OnChar, this);
+    Bind( wxEVT_LEAVE_WINDOW, &wxGenericHyperlinkCtrl::OnLeaveWindow, this);
 
-    Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftDown) );
-    Connect( wxEVT_LEFT_UP, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftUp) );
-    Connect( wxEVT_MOTION, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnMotion) );
+    Bind( wxEVT_LEFT_DOWN, &wxGenericHyperlinkCtrl::OnLeftDown, this);
+    Bind( wxEVT_LEFT_UP, &wxGenericHyperlinkCtrl::OnLeftUp, this);
+    Bind( wxEVT_MOTION, &wxGenericHyperlinkCtrl::OnMotion, this);
 
     ConnectMenuHandlers();
 
@@ -118,9 +118,9 @@ void wxGenericHyperlinkCtrl::Init()
 void wxGenericHyperlinkCtrl::ConnectMenuHandlers()
 {
     // Connect the event handlers for the context menu.
-    Connect( wxEVT_RIGHT_UP, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnRightUp) );
-    Connect( wxHYPERLINK_POPUP_COPY_ID, wxEVT_MENU,
-             wxCommandEventHandler(wxGenericHyperlinkCtrl::OnPopUpCopy) );
+    Bind( wxEVT_RIGHT_UP, &wxGenericHyperlinkCtrl::OnRightUp, this);
+    Bind( wxEVT_MENU, &wxGenericHyperlinkCtrl::OnPopUpCopy, this,
+          wxHYPERLINK_POPUP_COPY_ID);
 }
 
 wxSize wxGenericHyperlinkCtrl::DoGetBestClientSize() const
diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp
index a4f2117104..e2d01d4585 100644
--- a/src/generic/mdig.cpp
+++ b/src/generic/mdig.cpp
@@ -534,17 +534,15 @@ wxGenericMDIClientWindow::CreateGenericClient(wxWindow *parent)
         return false;
 
     m_notebook = new wxNotebook(this, wxID_ANY);
-    m_notebook->Connect
+    m_notebook->Bind
                 (
                     wxEVT_NOTEBOOK_PAGE_CHANGED,
-                    wxNotebookEventHandler(
-                        wxGenericMDIClientWindow::OnPageChanged),
-                    NULL,
+                    &wxGenericMDIClientWindow::OnPageChanged,
                     this
                 );
 
     // now that we have a notebook to resize, hook up OnSize() too
-    Connect(wxEVT_SIZE, wxSizeEventHandler(wxGenericMDIClientWindow::OnSize));
+    Bind(wxEVT_SIZE, &wxGenericMDIClientWindow::OnSize, this);
 
     return true;
 }
diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp
index d9dd480d96..574f36b672 100644
--- a/src/generic/richtooltipg.cpp
+++ b/src/generic/richtooltipg.cpp
@@ -252,7 +252,7 @@ public:
             return;
         }
 
-        Connect(wxEVT_TIMER, wxTimerEventHandler(wxRichToolTipPopup::OnTimer));
+        Bind(wxEVT_TIMER, &wxRichToolTipPopup::OnTimer, this);
 
         m_timeout = timeout; // set for use in OnTimer if we have a delay
         m_delayShow = delay != 0;
diff --git a/src/generic/statbmpg.cpp b/src/generic/statbmpg.cpp
index 285c86d798..d355fe7181 100644
--- a/src/generic/statbmpg.cpp
+++ b/src/generic/statbmpg.cpp
@@ -35,7 +35,7 @@ bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id,
         return false;
     m_scaleMode = Scale_None;
     SetBitmap(bitmap);
-    Connect(wxEVT_PAINT, wxPaintEventHandler(wxGenericStaticBitmap::OnPaint));
+    Bind(wxEVT_PAINT, &wxGenericStaticBitmap::OnPaint, this);
     return true;
 }
 
diff --git a/src/generic/stattextg.cpp b/src/generic/stattextg.cpp
index fa1db47c4a..fe2f13759c 100644
--- a/src/generic/stattextg.cpp
+++ b/src/generic/stattextg.cpp
@@ -44,7 +44,7 @@ bool wxGenericStaticText::Create(wxWindow *parent,
 
     SetLabel(label);
     SetInitialSize(size);
-    Connect(wxEVT_PAINT, wxPaintEventHandler(wxGenericStaticText::OnPaint));
+    Bind(wxEVT_PAINT, &wxGenericStaticText::OnPaint, this);
     return true;
 }
 
diff --git a/src/generic/timectrlg.cpp b/src/generic/timectrlg.cpp
index 6a3033cd0c..4037d6f56d 100644
--- a/src/generic/timectrlg.cpp
+++ b/src/generic/timectrlg.cpp
@@ -92,42 +92,12 @@ public:
         m_useAMPM = false;
 #endif
 
-        m_text->Connect
-                (
-                    wxEVT_SET_FOCUS,
-                    wxFocusEventHandler(wxTimePickerGenericImpl::OnTextSetFocus),
-                    NULL,
-                    this
-                );
-        m_text->Connect
-                (
-                    wxEVT_KEY_DOWN,
-                    wxKeyEventHandler(wxTimePickerGenericImpl::OnTextKeyDown),
-                    NULL,
-                    this
-                );
-        m_text->Connect
-                (
-                    wxEVT_LEFT_DOWN,
-                    wxMouseEventHandler(wxTimePickerGenericImpl::OnTextClick),
-                    NULL,
-                    this
-                );
+        m_text->Bind(wxEVT_SET_FOCUS, &wxTimePickerGenericImpl::OnTextSetFocus, this);
+        m_text->Bind(wxEVT_KEY_DOWN, &wxTimePickerGenericImpl::OnTextKeyDown, this);
+        m_text->Bind(wxEVT_LEFT_DOWN, &wxTimePickerGenericImpl::OnTextClick, this);
 
-        m_btn->Connect
-               (
-                    wxEVT_SPIN_UP,
-                    wxSpinEventHandler(wxTimePickerGenericImpl::OnArrowUp),
-                    NULL,
-                    this
-               );
-        m_btn->Connect
-               (
-                    wxEVT_SPIN_DOWN,
-                    wxSpinEventHandler(wxTimePickerGenericImpl::OnArrowDown),
-                    NULL,
-                    this
-               );
+        m_btn->Bind(wxEVT_SPIN_UP, &wxTimePickerGenericImpl::OnArrowUp, this);
+        m_btn->Bind(wxEVT_SPIN_DOWN, &wxTimePickerGenericImpl::OnArrowDown, this);
     }
 
     // Set the new value.
diff --git a/src/gtk/anybutton.cpp b/src/gtk/anybutton.cpp
index d58e318af2..05f80f3ac0 100644
--- a/src/gtk/anybutton.cpp
+++ b/src/gtk/anybutton.cpp
@@ -356,17 +356,13 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
         case State_Focused:
             if ( bitmap.IsOk() )
             {
-                Connect(wxEVT_SET_FOCUS,
-                        wxFocusEventHandler(wxAnyButton::GTKOnFocus));
-                Connect(wxEVT_KILL_FOCUS,
-                        wxFocusEventHandler(wxAnyButton::GTKOnFocus));
+                Bind(wxEVT_SET_FOCUS, &wxAnyButton::GTKOnFocus, this);
+                Bind(wxEVT_KILL_FOCUS, &wxAnyButton::GTKOnFocus, this);
             }
             else // no valid focused bitmap
             {
-                Disconnect(wxEVT_SET_FOCUS,
-                           wxFocusEventHandler(wxAnyButton::GTKOnFocus));
-                Disconnect(wxEVT_KILL_FOCUS,
-                           wxFocusEventHandler(wxAnyButton::GTKOnFocus));
+                Unbind(wxEVT_SET_FOCUS, &wxAnyButton::GTKOnFocus, this);
+                Unbind(wxEVT_KILL_FOCUS, &wxAnyButton::GTKOnFocus, this);
             }
             break;
 
diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 8ee67cb02b..ed04cb5d74 100644
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -89,9 +89,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         // we need to know when the dialog has been dismissed clicking OK...
         // NOTE: the "clicked" signal is not available for a GtkFileChooserButton
         //       thus we are forced to use wxFileDialog's event
-        m_dialog->Connect(wxEVT_BUTTON,
-                wxCommandEventHandler(wxFileButton::OnDialogOK),
-                NULL, this);
+        m_dialog->Bind(wxEVT_BUTTON, &wxFileButton::OnDialogOK, this);
 
         m_parent->DoAddChild( this );
 
diff --git a/src/gtk/nonownedwnd.cpp b/src/gtk/nonownedwnd.cpp
index b23a76a0a1..9f9d489dd6 100644
--- a/src/gtk/nonownedwnd.cpp
+++ b/src/gtk/nonownedwnd.cpp
@@ -135,24 +135,12 @@ public:
         m_mask(CreateShapeBitmap(path), *wxBLACK)
     {
 
-        m_win->Connect
-               (
-                wxEVT_PAINT,
-                wxPaintEventHandler(wxNonOwnedWindowShapeImplPath::OnPaint),
-                NULL,
-                this
-               );
+        m_win->Bind(wxEVT_PAINT, &wxNonOwnedWindowShapeImplPath::OnPaint, this);
     }
 
     virtual ~wxNonOwnedWindowShapeImplPath()
     {
-        m_win->Disconnect
-               (
-                wxEVT_PAINT,
-                wxPaintEventHandler(wxNonOwnedWindowShapeImplPath::OnPaint),
-                NULL,
-                this
-               );
+        m_win->Unbind(wxEVT_PAINT, &wxNonOwnedWindowShapeImplPath::OnPaint, this);
     }
 
     // Currently we always return false from here, if drawing the border
diff --git a/src/msw/calctrl.cpp b/src/msw/calctrl.cpp
index 86b320bd02..a538ff60f1 100644
--- a/src/msw/calctrl.cpp
+++ b/src/msw/calctrl.cpp
@@ -122,10 +122,8 @@ wxCalendarCtrl::Create(wxWindow *parent,
     SetHolidayAttrs();
     UpdateMarks();
 
-    Connect(wxEVT_LEFT_DOWN,
-            wxMouseEventHandler(wxCalendarCtrl::MSWOnClick));
-    Connect(wxEVT_LEFT_DCLICK,
-            wxMouseEventHandler(wxCalendarCtrl::MSWOnDoubleClick));
+    Bind(wxEVT_LEFT_DOWN, &wxCalendarCtrl::MSWOnClick, this);
+    Bind(wxEVT_LEFT_DCLICK, &wxCalendarCtrl::MSWOnDoubleClick, this);
 
     return true;
 }
diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 803853d8c4..45478e34a3 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -111,8 +111,7 @@ bool wxDialog::Create(wxWindow *parent,
     {
         CreateGripper();
 
-        Connect(wxEVT_CREATE,
-                wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
+        Bind(wxEVT_CREATE, &wxDialog::OnWindowCreate, this);
     }
 
     return true;
diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index 806b6c61ef..1b8c9e6bd7 100644
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -892,10 +892,10 @@ public:
     wxAMMediaEvtHandler(wxAMMediaBackend *amb) :
        m_amb(amb), m_bLoadEventSent(false)
     {
-        m_amb->m_pAX->Connect(m_amb->m_pAX->GetId(),
+        m_amb->m_pAX->Bind(
             wxEVT_ACTIVEX,
-            wxActiveXEventHandler(wxAMMediaEvtHandler::OnActiveX),
-            NULL, this
+            &wxAMMediaEvtHandler::OnActiveX, this,
+            m_amb->m_pAX->GetId()
                               );
     }
 
diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp
index 5bc3e37c4a..063abb1bd6 100644
--- a/src/msw/mediactrl_qt.cpp
+++ b/src/msw/mediactrl_qt.cpp
@@ -416,10 +416,9 @@ public:
         m_qtb = qtb;
         m_hwnd = hwnd;
 
-        m_qtb->m_ctrl->Connect(m_qtb->m_ctrl->GetId(),
+        m_qtb->m_ctrl->Bind(
             wxEVT_ERASE_BACKGROUND,
-            wxEraseEventHandler(wxQTMediaEvtHandler::OnEraseBackground),
-            NULL, this);
+            &wxQTMediaEvtHandler::OnEraseBackground, this);
     }
 
     void OnEraseBackground(wxEraseEvent& event);
diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index 581d7076de..d6a80fbacf 100644
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -681,11 +681,9 @@ public:
     wxWMP10MediaEvtHandler(wxWMP10MediaBackend *amb) :
        m_amb(amb)
     {
-        m_amb->m_pAX->Connect(m_amb->m_pAX->GetId(),
-            wxEVT_ACTIVEX,
-            wxActiveXEventHandler(wxWMP10MediaEvtHandler::OnActiveX),
-            NULL, this
-                              );
+        m_amb->m_pAX->Bind(wxEVT_ACTIVEX,
+            &wxWMP10MediaEvtHandler::OnActiveX, this,
+            m_amb->m_pAX->GetId());
     }
 
     void OnActiveX(wxActiveXEvent& event);
diff --git a/src/msw/nonownedwnd.cpp b/src/msw/nonownedwnd.cpp
index ce0449e6cc..3876870071 100644
--- a/src/msw/nonownedwnd.cpp
+++ b/src/msw/nonownedwnd.cpp
@@ -82,11 +82,7 @@ bool wxNonOwnedWindow::DoSetRegionShape(const wxRegion& region)
 #include "wx/msw/wrapgdip.h"
 
 // This class contains data used only when SetPath(wxGraphicsPath) is called.
-//
-// Notice that it derives from wxEvtHandler solely to allow Connect()-ing its
-// OnPaint() method to the window, we could get rid of this inheritance once
-// Bind() can be used in wx sources.
-class wxNonOwnedWindowShapeImpl : public wxEvtHandler
+class wxNonOwnedWindowShapeImpl
 {
 public:
     wxNonOwnedWindowShapeImpl(wxNonOwnedWindow* win, const wxGraphicsPath& path) :
@@ -107,24 +103,12 @@ public:
         // Connect to the paint event to draw the border.
         //
         // TODO: Do this only optionally?
-        m_win->Connect
-               (
-                wxEVT_PAINT,
-                wxPaintEventHandler(wxNonOwnedWindowShapeImpl::OnPaint),
-                NULL,
-                this
-               );
+        m_win->Bind(wxEVT_PAINT, &wxNonOwnedWindowShapeImpl::OnPaint, this);
     }
 
     virtual ~wxNonOwnedWindowShapeImpl()
     {
-        m_win->Disconnect
-               (
-                wxEVT_PAINT,
-                wxPaintEventHandler(wxNonOwnedWindowShapeImpl::OnPaint),
-                NULL,
-                this
-               );
+        m_win->Unbind(wxEVT_PAINT, &wxNonOwnedWindowShapeImpl::OnPaint, this);
     }
 
 private:
diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 83bcc429ad..b2f65a6b3c 100644
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -1131,14 +1131,9 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         wxWindow* pWnd = m_realparent;
         int id = m_realparent->GetId();
 
-        pWnd->Connect(id, wxEVT_SIZE,
-            wxSizeEventHandler(wxActiveXContainer::OnSize), 0, this);
-//        this->Connect(GetId(), wxEVT_PAINT,
-//            wxPaintEventHandler(wxActiveXContainer::OnPaint), 0, this);
-        pWnd->Connect(id, wxEVT_SET_FOCUS,
-            wxFocusEventHandler(wxActiveXContainer::OnSetFocus), 0, this);
-        pWnd->Connect(id, wxEVT_KILL_FOCUS,
-            wxFocusEventHandler(wxActiveXContainer::OnKillFocus), 0, this);
+        pWnd->Bind(wxEVT_SIZE, &wxActiveXContainer::OnSize, this, id);
+        pWnd->Bind(wxEVT_SET_FOCUS, &wxActiveXContainer::OnSetFocus, this, id);
+        pWnd->Bind(wxEVT_KILL_FOCUS, &wxActiveXContainer::OnKillFocus, this, id);
     }
 }
 
diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 66d2f37e02..c574663f6c 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -128,7 +128,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     // check if we have an image with alpha or not
     if ( wxTheApp->GetComCtl32Version() < 600 )
     {
-        Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBitmap::DoPaintManually));
+        Bind(wxEVT_PAINT, &wxStaticBitmap::DoPaintManually, this);
     }
 
     return true;
diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index fe7bd79546..7fb1ad9b1e 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -90,7 +90,7 @@ bool wxStaticBox::Create(wxWindow *parent,
 
     if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
     {
-        Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBox::OnPaint));
+        Bind(wxEVT_PAINT, &wxStaticBox::OnPaint, this);
 
         // Our OnPaint() completely erases our background, so don't do it in
         // WM_ERASEBKGND too to avoid flicker.
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 686435b620..51127c7d15 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -584,7 +584,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
         }
 #endif
         if ( !contextMenuConnected )
-            Connect(wxEVT_CONTEXT_MENU, wxContextMenuEventHandler(wxTextCtrl::OnContextMenu));
+            Bind(wxEVT_CONTEXT_MENU, &wxTextCtrl::OnContextMenu, this);
     }
     else
 #endif // wxUSE_RICHEDIT
diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index d6635e6137..fe69dfbd56 100644
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -390,7 +390,7 @@ wxWindow* wxFileDialog::CreateFilterPanel(wxWindow *extracontrol)
             if ( m_firstFileTypeFilter >= 0 )
                 m_filterChoice->SetSelection(m_firstFileTypeFilter);
         }
-        m_filterChoice->Connect(wxEVT_CHOICE, wxCommandEventHandler(wxFileDialog::OnFilterSelected), NULL, this);
+        m_filterChoice->Bind(wxEVT_CHOICE, &wxFileDialog::OnFilterSelected, this);
     }
         
     if(extracontrol)
diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 1896c4284c..0aa2e03cc8 100644
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -146,14 +146,10 @@ public:
         m_hasCapture = false;
         m_spins = 1;
 
-        Connect( wxEVT_LEFT_DOWN,
-                 wxMouseEventHandler(wxPGSpinButton::OnMouseEvent) );
-        Connect( wxEVT_LEFT_UP,
-                 wxMouseEventHandler(wxPGSpinButton::OnMouseEvent) );
-        Connect( wxEVT_MOTION,
-                 wxMouseEventHandler(wxPGSpinButton::OnMouseEvent) );
-        Connect( wxEVT_MOUSE_CAPTURE_LOST,
-          wxMouseCaptureLostEventHandler(wxPGSpinButton::OnMouseCaptureLost) );
+        Bind(wxEVT_LEFT_DOWN, &wxPGSpinButton::OnMouseEvent, this);
+        Bind(wxEVT_LEFT_UP, &wxPGSpinButton::OnMouseEvent, this);
+        Bind(wxEVT_MOTION, &wxPGSpinButton::OnMouseEvent, this);
+        Bind(wxEVT_MOUSE_CAPTURE_LOST, &wxPGSpinButton::OnMouseCaptureLost, this);
     }
 
     int GetSpins() const
diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 75acf2c64e..40e5ca82cb 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -1048,10 +1048,8 @@ wxPropertyGridPage* wxPropertyGridManager::InsertPage( int index,
             pageObj->m_toolId = tool->GetId();
 
             // Connect to toolbar button events.
-            Connect(pageObj->GetToolId(),
-                    wxEVT_TOOL,
-                    wxCommandEventHandler(
-                        wxPropertyGridManager::OnToolbarClick));
+            Bind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this,
+                 pageObj->GetToolId());
 
             m_pToolbar->Realize();
         }
@@ -1541,10 +1539,8 @@ void wxPropertyGridManager::RecreateControls()
                 m_categorizedModeToolId = tool->GetId();
                 tbModified = true;
 
-                Connect(m_categorizedModeToolId,
-                        wxEVT_TOOL,
-                        wxCommandEventHandler(
-                        wxPropertyGridManager::OnToolbarClick));
+                Bind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this,
+                     m_categorizedModeToolId);
             }
 
             if (m_alphabeticModeToolId == -1)
@@ -1560,10 +1556,8 @@ void wxPropertyGridManager::RecreateControls()
                 m_alphabeticModeToolId = tool->GetId();
                 tbModified = true;
 
-                Connect(m_alphabeticModeToolId,
-                        wxEVT_TOOL,
-                        wxCommandEventHandler(
-                        wxPropertyGridManager::OnToolbarClick));
+                Bind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this,
+                     m_alphabeticModeToolId);
             }
 
             // Both buttons should exist here.
@@ -1574,10 +1568,8 @@ void wxPropertyGridManager::RecreateControls()
             // Remove buttons if they exist.
             if (m_categorizedModeToolId != -1)
             {
-                Disconnect(m_categorizedModeToolId,
-                           wxEVT_TOOL,
-                           wxCommandEventHandler(
-                           wxPropertyGridManager::OnToolbarClick));
+                Unbind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this,
+                       m_categorizedModeToolId);
 
                 m_pToolbar->DeleteTool(m_categorizedModeToolId);
                 m_categorizedModeToolId = -1;
@@ -1586,10 +1578,8 @@ void wxPropertyGridManager::RecreateControls()
 
             if (m_alphabeticModeToolId != -1)
             {
-                Disconnect(m_alphabeticModeToolId,
-                            wxEVT_TOOL,
-                            wxCommandEventHandler(
-                            wxPropertyGridManager::OnToolbarClick));
+                Unbind(wxEVT_TOOL, &wxPropertyGridManager::OnToolbarClick, this,
+                       m_alphabeticModeToolId);
 
                 m_pToolbar->DeleteTool(m_alphabeticModeToolId);
                 m_alphabeticModeToolId = -1;
@@ -1943,18 +1933,18 @@ void wxPropertyGridManager::ReconnectEventHandlers(wxWindowID oldId, wxWindowID
 
     if (oldId != wxID_NONE)
     {
-        Disconnect(oldId, wxEVT_PG_SELECTED,
-          wxPropertyGridEventHandler(wxPropertyGridManager::OnPropertyGridSelect));
-        Disconnect(oldId, wxEVT_PG_COL_DRAGGING,
-          wxPropertyGridEventHandler(wxPropertyGridManager::OnPGColDrag));
+        Unbind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this,
+               oldId);
+        Unbind(wxEVT_PG_COL_DRAGGING, &wxPropertyGridManager::OnPGColDrag, this,
+               oldId);
     }
 
     if (newId != wxID_NONE)
     {
-        Connect(newId, wxEVT_PG_SELECTED,
-          wxPropertyGridEventHandler(wxPropertyGridManager::OnPropertyGridSelect));
-        Connect(newId, wxEVT_PG_COL_DRAGGING,
-          wxPropertyGridEventHandler(wxPropertyGridManager::OnPGColDrag));
+        Bind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this,
+             newId);
+        Bind(wxEVT_PG_COL_DRAGGING, &wxPropertyGridManager::OnPGColDrag, this,
+             newId);
     }
 }
 
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 3bc9611f1a..b08d74fabb 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -1039,13 +1039,8 @@ void wxPropertyGrid::DoBeginLabelEdit( unsigned int colIndex,
                                           0,
                                           colIndex);
 
-    wxWindowID id = tc->GetId();
-    tc->Connect(id, wxEVT_TEXT_ENTER,
-        wxCommandEventHandler(wxPropertyGrid::OnLabelEditorEnterPress),
-        NULL, this);
-    tc->Connect(id, wxEVT_KEY_DOWN,
-        wxKeyEventHandler(wxPropertyGrid::OnLabelEditorKeyPress),
-        NULL, this);
+    tc->Bind(wxEVT_TEXT_ENTER, &wxPropertyGrid::OnLabelEditorEnterPress, this);
+    tc->Bind(wxEVT_KEY_DOWN, &wxPropertyGrid::OnLabelEditorKeyPress, this);
 
     tc->SetFocus();
 
@@ -1227,9 +1222,7 @@ void wxPropertyGrid::OnTLPChanging( wxWindow* newTLP )
     // correct top-level window.
     if ( m_tlp )
     {
-        m_tlp->Disconnect( wxEVT_CLOSE_WINDOW,
-                           wxCloseEventHandler(wxPropertyGrid::OnTLPClose),
-                           NULL, this );
+        m_tlp->Unbind(wxEVT_CLOSE_WINDOW, &wxPropertyGrid::OnTLPClose, this);
         m_tlpClosed = m_tlp;
         m_tlpClosedTime = currentTime;
     }
@@ -1240,9 +1233,7 @@ void wxPropertyGrid::OnTLPChanging( wxWindow* newTLP )
         if ( newTLP != m_tlpClosed ||
              m_tlpClosedTime+250 < currentTime )
         {
-            newTLP->Connect( wxEVT_CLOSE_WINDOW,
-                             wxCloseEventHandler(wxPropertyGrid::OnTLPClose),
-                             NULL, this );
+            newTLP->Bind(wxEVT_CLOSE_WINDOW, &wxPropertyGrid::OnTLPClose, this);
             m_tlpClosed = NULL;
         }
         else
@@ -3928,33 +3919,19 @@ void wxPropertyGrid::SetupChildEventHandling( wxWindow* argWnd )
 
     if ( argWnd == m_wndEditor )
     {
-        argWnd->Connect(id, wxEVT_MOTION,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseMoveChild),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_LEFT_UP,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseUpChild),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_LEFT_DOWN,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseClickChild),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_RIGHT_UP,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseRightClickChild),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_ENTER_WINDOW,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseEntry),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_LEAVE_WINDOW,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseEntry),
-            NULL, this);
+        argWnd->Bind(wxEVT_MOTION, &wxPropertyGrid::OnMouseMoveChild, this, id);
+        argWnd->Bind(wxEVT_LEFT_UP, &wxPropertyGrid::OnMouseUpChild, this, id);
+        argWnd->Bind(wxEVT_LEFT_DOWN, &wxPropertyGrid::OnMouseClickChild, this, id);
+        argWnd->Bind(wxEVT_RIGHT_UP, &wxPropertyGrid::OnMouseRightClickChild, this, id);
+        argWnd->Bind(wxEVT_ENTER_WINDOW, &wxPropertyGrid::OnMouseEntry, this, id);
+        argWnd->Bind(wxEVT_LEAVE_WINDOW, &wxPropertyGrid::OnMouseEntry, this, id);
     }
 
     wxPropertyGridEditorEventForwarder* forwarder;
     forwarder = new wxPropertyGridEditorEventForwarder(this);
     argWnd->PushEventHandler(forwarder);
 
-    argWnd->Connect(id, wxEVT_KEY_DOWN,
-        wxCharEventHandler(wxPropertyGrid::OnChildKeyDown),
-        NULL, this);
+    argWnd->Bind(wxEVT_KEY_DOWN, &wxPropertyGrid::OnChildKeyDown, this, id);
 }
 
 void wxPropertyGrid::DeletePendingObjects()
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 3caf24177a..4fbd16c3d1 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -2471,38 +2471,25 @@ bool wxPGArrayEditorDialog::Create( wxWindow *parent,
         arr.push_back(ArrayGet(i));
     m_elb->SetStrings(arr);
 
+    m_elbSubPanel = m_elb->GetNewButton()->GetParent();
+
     // Connect event handlers
-    wxButton* but;
     wxListCtrl* lc = m_elb->GetListCtrl();
 
-    but = m_elb->GetNewButton();
-    m_elbSubPanel = but->GetParent();
-    but->Connect(but->GetId(), wxEVT_BUTTON,
-        wxCommandEventHandler(wxPGArrayEditorDialog::OnAddClick),
-        NULL, this);
+    m_elb->GetNewButton()->Bind(wxEVT_BUTTON,
+                                &wxPGArrayEditorDialog::OnAddClick, this);
+    m_elb->GetDelButton()->Bind(wxEVT_BUTTON,
+                                &wxPGArrayEditorDialog::OnDeleteClick, this);
+    m_elb->GetUpButton()->Bind(wxEVT_BUTTON,
+                               &wxPGArrayEditorDialog::OnUpClick, this);
+    m_elb->GetDownButton()->Bind(wxEVT_BUTTON,
+                                 &wxPGArrayEditorDialog::OnDownClick, this);
 
-    but = m_elb->GetDelButton();
-    but->Connect(but->GetId(), wxEVT_BUTTON,
-        wxCommandEventHandler(wxPGArrayEditorDialog::OnDeleteClick),
-        NULL, this);
+    lc->Bind(wxEVT_LIST_BEGIN_LABEL_EDIT,
+             &wxPGArrayEditorDialog::OnBeginLabelEdit, this);
 
-    but = m_elb->GetUpButton();
-    but->Connect(but->GetId(), wxEVT_BUTTON,
-        wxCommandEventHandler(wxPGArrayEditorDialog::OnUpClick),
-        NULL, this);
-
-    but = m_elb->GetDownButton();
-    but->Connect(but->GetId(), wxEVT_BUTTON,
-        wxCommandEventHandler(wxPGArrayEditorDialog::OnDownClick),
-        NULL, this);
-
-    lc->Connect(lc->GetId(), wxEVT_LIST_BEGIN_LABEL_EDIT,
-        wxListEventHandler(wxPGArrayEditorDialog::OnBeginLabelEdit),
-        NULL, this);
-
-    lc->Connect(lc->GetId(), wxEVT_LIST_END_LABEL_EDIT,
-        wxListEventHandler(wxPGArrayEditorDialog::OnEndLabelEdit),
-        NULL, this);
+    lc->Bind(wxEVT_LIST_END_LABEL_EDIT,
+             &wxPGArrayEditorDialog::OnEndLabelEdit, this);
 
     topsizer->Add(m_elb, wxSizerFlags(1).Expand().Border(0, spacing));
 
diff --git a/src/ribbon/panel.cpp b/src/ribbon/panel.cpp
index 82ac8ce39c..99f69bcd1d 100644
--- a/src/ribbon/panel.cpp
+++ b/src/ribbon/panel.cpp
@@ -227,14 +227,14 @@ void wxRibbonPanel::AddChild(wxWindowBase *child)
     // for children of the window. The panel wants to be in the hovered state
     // whenever the mouse cursor is within its boundary, so the events need to
     // be attached to children too.
-    child->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseEnterChild), NULL, this);
-    child->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseLeaveChild), NULL, this);
+    child->Bind(wxEVT_ENTER_WINDOW, &wxRibbonPanel::OnMouseEnterChild, this);
+    child->Bind(wxEVT_LEAVE_WINDOW, &wxRibbonPanel::OnMouseLeaveChild, this);
 }
 
 void wxRibbonPanel::RemoveChild(wxWindowBase *child)
 {
-    child->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseEnterChild), NULL, this);
-    child->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseLeaveChild), NULL, this);
+    child->Unbind(wxEVT_ENTER_WINDOW, &wxRibbonPanel::OnMouseEnterChild, this);
+    child->Unbind(wxEVT_LEAVE_WINDOW, &wxRibbonPanel::OnMouseLeaveChild, this);
 
     wxRibbonControl::RemoveChild(child);
 }
@@ -906,9 +906,8 @@ void wxRibbonPanel::OnKillFocus(wxFocusEvent& evt)
         if(IsAncestorOf(this, receiver))
         {
             m_child_with_focus = receiver;
-            receiver->Connect(wxEVT_KILL_FOCUS,
-                wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus),
-                NULL, this);
+            receiver->Bind(wxEVT_KILL_FOCUS,
+                &wxRibbonPanel::OnChildKillFocus, this);
         }
         else if(receiver == NULL || receiver != m_expanded_dummy)
         {
@@ -922,16 +921,16 @@ void wxRibbonPanel::OnChildKillFocus(wxFocusEvent& evt)
     if(m_child_with_focus == NULL)
         return; // Should never happen, but a check can't hurt
 
-    m_child_with_focus->Disconnect(wxEVT_KILL_FOCUS,
-      wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus), NULL, this);
+    m_child_with_focus->Unbind(wxEVT_KILL_FOCUS,
+      &wxRibbonPanel::OnChildKillFocus, this);
     m_child_with_focus = NULL;
 
     wxWindow *receiver = evt.GetWindow();
     if(receiver == this || IsAncestorOf(this, receiver))
     {
         m_child_with_focus = receiver;
-        receiver->Connect(wxEVT_KILL_FOCUS,
-            wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus), NULL, this);
+        receiver->Bind(wxEVT_KILL_FOCUS,
+            &wxRibbonPanel::OnChildKillFocus, this);
         evt.Skip();
     }
     else if(receiver == NULL || receiver != m_expanded_dummy)
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 3a9f543220..ad5f506c35 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -366,9 +366,9 @@ bool ScintillaWX::SetIdle(bool on) {
     if (idler.state != on) {
         // connect or disconnect the EVT_IDLE handler
         if (on)
-            stc->Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
+            stc->Bind(wxEVT_IDLE, &wxStyledTextCtrl::OnIdle, stc);
         else
-            stc->Disconnect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
+            stc->Unbind(wxEVT_IDLE, &wxStyledTextCtrl::OnIdle, stc);
         idler.state = on;
     }
     return idler.state;
diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp
index bdcb909b4b..c59a4c62b0 100644
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -205,8 +205,8 @@ class wxGStreamerMediaEventHandler : public wxEvtHandler
     public:
     wxGStreamerMediaEventHandler(wxGStreamerMediaBackend* be) : m_be(be)
     {
-        this->Connect(wxID_ANY, wxEVT_MEDIA_FINISHED,
-           wxMediaEventHandler(wxGStreamerMediaEventHandler::OnMediaFinish));
+        this->Bind(wxEVT_MEDIA_FINISHED,
+           &wxGStreamerMediaEventHandler::OnMediaFinish, this);
     }
 
     void OnMediaFinish(wxMediaEvent& event);
diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 5633edbbde..ab45c6cb8d 100644
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -256,8 +256,7 @@ wxTaskBarIcon::~wxTaskBarIcon()
 {
     if (m_iconWnd)
     {
-        m_iconWnd->Disconnect(wxEVT_DESTROY,
-            wxWindowDestroyEventHandler(wxTaskBarIcon::OnDestroy), NULL, this);
+        m_iconWnd->Unbind(wxEVT_DESTROY, &wxTaskBarIcon::OnDestroy, this);
         RemoveIcon();
     }
 }
@@ -290,9 +289,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
         m_iconWnd = new wxTaskBarIconArea(this, bmp);
         if (m_iconWnd->IsOk())
         {
-            m_iconWnd->Connect(wxEVT_DESTROY,
-                wxWindowDestroyEventHandler(wxTaskBarIcon::OnDestroy),
-                NULL, this);
+            m_iconWnd->Bind(wxEVT_DESTROY, &wxTaskBarIcon::OnDestroy, this);
             m_iconWnd->Show();
         }
         else

From 46ba9ca2f9930eeff21ef8e31fbb58ac4c3e2788 Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Sat, 5 May 2018 10:16:08 +0200
Subject: [PATCH 589/916] Fix automatic linking with MSVC for monolithic builds

MSVC users can simplify their projects by prepending
$(WXWIN)\include\msvc to the compiler include directories, which results
in automatic including the build-specific setup.h and linking all
required wxWidgets and system libraries.

This worked only for the default multilib builds but not for monolithic
builds where wxWidgets libraries are created and named differently.

This patch allows the users (by defining wxMONOLITHIC=1 in their
project) to use it also for monolithic builds.
---
 include/msvc/wx/setup.h | 105 ++++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 46 deletions(-)

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 588d34d9e2..9748ab0b0a 100644
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -149,20 +149,27 @@
 // special version for regex as it does have a Unicode version
 #define wx3RD_PARTY_LIB_NAME_U(name) "wx" name wxSUFFIX_STR
 
-#pragma comment(lib, wxWX_LIB_NAME("base", ""))
+#if defined(wxMONOLITHIC) && wxMONOLITHIC == 1
+    #pragma comment(lib, wxWX_LIB_NAME("msw", ""))
+#else
+    #pragma comment(lib, wxWX_LIB_NAME("base", ""))
 
-#ifndef wxNO_NET_LIB
-    #ifndef WXUSINGDLL
-        #pragma comment(lib, "wsock32")
+    #ifndef wxNO_NET_LIB
+        #pragma comment(lib, wxBASE_LIB_NAME("net"))
     #endif
-    #pragma comment(lib, wxBASE_LIB_NAME("net"))
-#endif
-#if wxUSE_XML && !defined(wxNO_XML_LIB)
-    #pragma comment(lib, wxBASE_LIB_NAME("xml"))
-    #if !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
+    #if wxUSE_XML && !defined(wxNO_XML_LIB)
+        #pragma comment(lib, wxBASE_LIB_NAME("xml"))        
     #endif
+#endif // defined(wxMONOLITHIC) && wxMONOLITHIC == 1
+
+#if !defined(wxNO_NET_LIB) && !defined(WXUSINGDLL)
+    #pragma comment(lib, "wsock32")
 #endif
+
+#if wxUSE_XML && !defined(wxNO_XML_LIB) && !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL)
+    #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
+#endif
+
 #if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL)
     #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
 #endif
@@ -181,48 +188,54 @@
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
     #endif
 
-    #pragma comment(lib, wxTOOLKIT_LIB_NAME("core"))
+    #if !defined(wxMONOLITHIC) || wxMONOLITHIC == 0
 
-    #ifndef wxNO_ADV_LIB
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv"))
-    #endif
+        #pragma comment(lib, wxTOOLKIT_LIB_NAME("core"))
+
+        #ifndef wxNO_ADV_LIB
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv"))
+        #endif
+
+        #if wxUSE_HTML && !defined(wxNO_HTML_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
+        #endif       
+        #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("qa"))
+        #endif
+        #if wxUSE_XRC && !defined(wxNO_XRC_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("xrc"))
+        #endif
+        #if wxUSE_AUI && !defined(wxNO_AUI_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("aui"))
+        #endif
+        #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("propgrid"))
+        #endif
+        #if wxUSE_RIBBON && !defined(wxNO_RIBBON_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("ribbon"))
+        #endif
+        #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("richtext"))
+        #endif
+        #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("media"))
+        #endif
+        #if wxUSE_STC && !defined(wxNO_STC_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("stc"))           
+        #endif
+        #if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB)
+            #pragma comment(lib, wxTOOLKIT_LIB_NAME("webview"))
+        #endif
+    #endif // !defined(wxMONOLITHIC) || wxMONOLITHIC == 0
 
-    #if wxUSE_HTML && !defined(wxNO_HTML_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
-    #endif
     #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)
         #pragma comment(lib, wxTOOLKIT_LIB_NAME("gl"))
     #endif
-    #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("qa"))
-    #endif
-    #if wxUSE_XRC && !defined(wxNO_XRC_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("xrc"))
-    #endif
-    #if wxUSE_AUI && !defined(wxNO_AUI_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("aui"))
-    #endif
-    #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("propgrid"))
-    #endif
-    #if wxUSE_RIBBON && !defined(wxNO_RIBBON_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("ribbon"))
-    #endif
-    #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("richtext"))
-    #endif
-    #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("media"))
-    #endif
-    #if wxUSE_STC && !defined(wxNO_STC_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("stc"))
-        #ifndef WXUSINGDLL
-            #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
-        #endif
-    #endif
-    #if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("webview"))
+
+    #if wxUSE_STC && !defined(wxNO_STC_LIB) && !defined(WXUSINGDLL)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
     #endif
+
 #endif // wxUSE_GUI
 
 

From 30c2bbf0810d92dcccd4a4790b4d36a2fb760514 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 31 May 2018 01:21:20 +0200
Subject: [PATCH 590/916] Factor out WXUSINGDLL check in MSVC-specific
 wx/setup.h

Don't repeat the same check for !defined(WXUSINGDLL) many times.

No real changes, this is just a simplification (which should be viewed
with "git diff -w --color-words" to see how little has really changed).
---
 include/msvc/wx/setup.h | 54 ++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 9748ab0b0a..8a7c0c488d 100644
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -162,31 +162,39 @@
     #endif
 #endif // defined(wxMONOLITHIC) && wxMONOLITHIC == 1
 
-#if !defined(wxNO_NET_LIB) && !defined(WXUSINGDLL)
-    #pragma comment(lib, "wsock32")
-#endif
+#if !defined(WXUSINGDLL)
+    #if !defined(wxNO_NET_LIB)
+        #pragma comment(lib, "wsock32")
+    #endif
 
-#if wxUSE_XML && !defined(wxNO_XML_LIB) && !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL)
-    #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
-#endif
+    #if wxUSE_XML && !defined(wxNO_XML_LIB) && !defined(wxNO_EXPAT_LIB)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
+    #endif
 
-#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL)
-    #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
-#endif
-#if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB) && !defined(WXUSINGDLL)
-    #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
-#endif
+    #if wxUSE_REGEX && !defined(wxNO_REGEX_LIB)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
+    #endif
+    #if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB)
+        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
+    #endif
+#endif // !defined(WXUSINGDLL)
 
 #if wxUSE_GUI
-    #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
-    #endif
-    #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
-    #endif
-    #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
-    #endif
+    #if !defined(WXUSINGDLL)
+        #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB)
+            #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
+        #endif
+        #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB)
+            #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
+        #endif
+        #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB)
+            #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
+        #endif
+        #if wxUSE_STC && !defined(wxNO_STC_LIB)
+            #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
+        #endif
+    #endif // !defined(WXUSINGDLL)
+
 
     #if !defined(wxMONOLITHIC) || wxMONOLITHIC == 0
 
@@ -232,10 +240,6 @@
         #pragma comment(lib, wxTOOLKIT_LIB_NAME("gl"))
     #endif
 
-    #if wxUSE_STC && !defined(wxNO_STC_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
-    #endif
-
 #endif // wxUSE_GUI
 
 

From 3d9d46b7549d1278c3d5220f6764a3970f3521b3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 31 May 2018 00:51:27 +0200
Subject: [PATCH 591/916] Don't send "page changed" events from wxNotebook dtor
 with GTK+ 3

These events are unexpected and inconsistent with the other platforms,
including GTK+ 2, so make sure we don't send them during the
destruction.

Closes https://github.com/wxWidgets/wxWidgets/pull/821
---
 src/gtk/notebook.cpp            |  7 +++++++
 tests/controls/notebooktest.cpp | 30 +++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 0f141cfe8e..93878cceb6 100644
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -151,6 +151,13 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
 
 wxNotebook::~wxNotebook()
 {
+    // Ensure that we don't generate page changing events during the
+    // destruction, this is unexpected and may reference the already (half)
+    // destroyed parent window, for example. So make sure our switch_page
+    // callback is not called from inside DeleteAllPages() by disconnecting all
+    // the callbacks associated with this widget.
+    GTKDisconnect(m_widget);
+
     DeleteAllPages();
 }
 
diff --git a/tests/controls/notebooktest.cpp b/tests/controls/notebooktest.cpp
index d8a6fb44a0..5471dda4ce 100644
--- a/tests/controls/notebooktest.cpp
+++ b/tests/controls/notebooktest.cpp
@@ -25,7 +25,7 @@
 class NotebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 {
 public:
-    NotebookTestCase() { }
+    NotebookTestCase() { m_notebook = NULL; m_numPageChanges = 0; }
 
     virtual void setUp();
     virtual void tearDown();
@@ -44,12 +44,18 @@ private:
         wxBOOK_CTRL_BASE_TESTS();
         CPPUNIT_TEST( Image );
         CPPUNIT_TEST( RowCount );
+        CPPUNIT_TEST( NoEventsOnDestruction );
     CPPUNIT_TEST_SUITE_END();
 
     void RowCount();
+    void NoEventsOnDestruction();
+
+    void OnPageChanged(wxNotebookEvent&) { m_numPageChanges++; }
 
     wxNotebook *m_notebook;
 
+    int m_numPageChanges;
+
     wxDECLARE_NO_COPY_CLASS(NotebookTestCase);
 };
 
@@ -90,4 +96,26 @@ void NotebookTestCase::RowCount()
 #endif
 }
 
+void NotebookTestCase::NoEventsOnDestruction()
+{
+    // We can't use EventCounter helper here as it doesn't deal with the window
+    // it's connected to being destroyed during its life-time, so do it
+    // manually.
+    m_notebook->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED,
+                     &NotebookTestCase::OnPageChanged, this);
+
+    // Normally deleting a page before the selected one results in page
+    // selection changing and the corresponding event.
+    m_notebook->DeletePage(0);
+    CHECK( m_numPageChanges == 1 );
+
+    // But deleting the entire control shouldn't generate any events, yet it
+    // used to do under GTK+ 3 when a page different from the first one was
+    // selected.
+    m_notebook->ChangeSelection(1);
+    m_notebook->Destroy();
+    m_notebook = NULL;
+    CHECK( m_numPageChanges == 1 );
+}
+
 #endif //wxUSE_NOTEBOOK

From 5f7a6bd15bde177641b78e2bdc50d22dbdb5c8d0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 29 May 2018 17:32:07 +0200
Subject: [PATCH 592/916] Replace Connect() with Bind() in all samples and
 utils too

Still use Connect() in unit tests which were written explicitly for it
and in EventConnector, which can't use Bind() as it uses a variable for
the event type.

No real changes, just use the newer and more convenient function.
---
 docs/doxygen/mainpages/samples.h     |   2 +-
 samples/calendar/calendar.cpp        |   7 +-
 samples/dataview/dataview.cpp        |   4 +-
 samples/dialogs/dialogs.cpp          |  51 ++-----
 samples/dll/my_dll.cpp               |   8 +-
 samples/dnd/dnd.cpp                  |   9 +-
 samples/docview/doc.cpp              |   8 +-
 samples/erase/erase.cpp              |   3 +-
 samples/event/event.cpp              |  30 ++--
 samples/fswatcher/fswatcher.cpp      |  36 ++---
 samples/grid/griddemo.cpp            |  12 +-
 samples/image/image.cpp              |   2 +-
 samples/ipc/baseclient.cpp           |   2 +-
 samples/keyboard/keyboard.cpp        |  49 ++----
 samples/layout/layout.cpp            |   6 +-
 samples/mdi/mdi.cpp                  |   4 +-
 samples/mediaplayer/mediaplayer.cpp  | 213 ++++++++-------------------
 samples/popup/popup.cpp              |   4 +-
 samples/propgrid/propgrid.cpp        |   8 -
 samples/scroll/scroll.cpp            |  20 ++-
 samples/shaped/shaped.cpp            |   2 +-
 samples/taborder/taborder.cpp        |   2 +-
 samples/webview/webview.cpp          | 188 ++++++++---------------
 samples/widgets/searchctrl.cpp       |   6 -
 samples/widgets/statbmp.cpp          |  11 +-
 samples/widgets/static.cpp           |  20 +--
 samples/widgets/widgets.cpp          |   4 +-
 samples/wrapsizer/wrapsizer.cpp      |   3 +-
 samples/xrc/myframe.cpp              |   4 +-
 samples/xrc/objrefdlg.cpp            |  34 ++---
 tests/menu/menu.cpp                  |  98 ++++++------
 utils/screenshotgen/src/guiframe.cpp |  24 +--
 32 files changed, 291 insertions(+), 583 deletions(-)

diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h
index 352e175f33..db03c9942f 100644
--- a/docs/doxygen/mainpages/samples.h
+++ b/docs/doxygen/mainpages/samples.h
@@ -274,7 +274,7 @@ wxDataObject to achieve this.
 
 This sample demonstrates various features of the wxWidgets events. It
 shows how to dynamic events and connecting/disconnecting the event handlers
-during run time by using wxEvtHandler::Connect() and wxEvtHandler::Disconnect(),
+during run time by using wxEvtHandler::Bind() and wxEvtHandler::Unbind(),
 and also how to use wxWindow::PushEventHandler() and wxWindow::PopEventHandler().
 
 @sampledir{event}
diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index ab523405ad..29cabc3488 100644
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -809,10 +809,9 @@ wxCalendarCtrlBase *MyPanel::DoCreateCalendar(const wxDateTime& dt, long style)
                                       wxDefaultSize,
                                       style);
 
-    calendar->Connect(wxEVT_RIGHT_DOWN,
-                      wxMouseEventHandler(MyFrame::OnCalRClick),
-                      NULL,
-                      ( MyFrame * )wxGetTopLevelParent(this));
+    calendar->Bind(wxEVT_RIGHT_DOWN,
+                   &MyFrame::OnCalRClick,
+                   ( MyFrame * )wxGetTopLevelParent(this));
 
     return calendar;
 }
diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 1393a86fee..26fbc1dde6 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -622,9 +622,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             m_ctrl[0] =
                 new wxDataViewCtrl( parent, ID_MUSIC_CTRL, wxDefaultPosition,
                                     wxDefaultSize, style );
-            m_ctrl[0]->Connect(wxEVT_CHAR,
-                               wxKeyEventHandler(MyFrame::OnDataViewChar),
-                               NULL, this);
+            m_ctrl[0]->Bind(wxEVT_CHAR, &MyFrame::OnDataViewChar, this);
 
             m_music_model = new MyMusicTreeModel;
             m_ctrl[0]->AssociateModel( m_music_model.get() );
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index c0ea4641a3..9de1fa2ab5 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -676,10 +676,8 @@ MyFrame::MyFrame(const wxString& title)
     m_infoBarAdvanced->AddButton(wxID_UNDO);
     m_infoBarAdvanced->AddButton(wxID_REDO);
 
-    m_infoBarAdvanced->Connect(wxID_REDO, wxEVT_BUTTON,
-                                wxCommandEventHandler(MyFrame::OnInfoBarRedo),
-                                NULL,
-                                this);
+    m_infoBarAdvanced->Bind(wxEVT_BUTTON, &MyFrame::OnInfoBarRedo, this,
+                            wxID_REDO);
 
     // adding and removing a button immediately doesn't make sense here, of
     // course, it's done just to show that it is possible
@@ -723,8 +721,8 @@ MyFrame::MyFrame(const wxString& title)
         static const int DIALOGS_SYSTEM_ABOUT = 0x4010;
 
         menu->Append(DIALOGS_SYSTEM_ABOUT, "&About");
-        Connect(DIALOGS_SYSTEM_ABOUT, wxEVT_MENU,
-                wxCommandEventHandler(MyFrame::ShowSimpleAboutDialog));
+        Bind(wxEVT_MENU, &MyFrame::ShowSimpleAboutDialog, this,
+             DIALOGS_SYSTEM_ABOUT);
     }
 #endif // __WXMSW__
 }
@@ -966,7 +964,8 @@ void MyFrame::MessageBoxWindowModal(wxCommandEvent& WXUNUSED(event))
                  "so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used.";
     }
     dialog->SetExtendedMessage(extmsg);
-    dialog->Connect( wxEVT_WINDOW_MODAL_DIALOG_CLOSED, wxWindowModalDialogEventHandler(MyFrame::MessageBoxWindowModalClosed), NULL, this );
+    dialog->Bind(wxEVT_WINDOW_MODAL_DIALOG_CLOSED,
+                 &MyFrame::MessageBoxWindowModalClosed, this);
     dialog->ShowWindowModal();
 }
 
@@ -1513,12 +1512,9 @@ MyExtraPanel::MyExtraPanel(wxWindow *parent)
     m_btn = new wxButton(this, -1, wxT("Custom Button"));
     m_btn->Enable(false);
     m_cb = new wxCheckBox(this, -1, wxT("Enable Custom Button"));
-    m_cb->Connect(wxEVT_CHECKBOX,
-                  wxCommandEventHandler(MyExtraPanel::OnCheckBox), NULL, this);
+    m_cb->Bind(wxEVT_CHECKBOX, &MyExtraPanel::OnCheckBox, this);
     m_label = new wxStaticText(this, wxID_ANY, "Nothing selected");
-    m_label->Connect(wxEVT_UPDATE_UI,
-                     wxUpdateUIEventHandler(MyExtraPanel::OnUpdateLabelUI),
-                     NULL, this);
+    m_label->Bind(wxEVT_UPDATE_UI, &MyExtraPanel::OnUpdateLabelUI, this);
 
     m_text = new wxTextCtrl(this, -1, m_str,
                             wxDefaultPosition, wxSize(40*GetCharWidth(), -1));
@@ -2416,21 +2412,8 @@ public:
 
 
         // And connect the event handlers.
-        btnShowText->Connect
-                     (
-                        wxEVT_BUTTON,
-                        wxCommandEventHandler(RichTipDialog::OnShowTipForText),
-                        NULL,
-                        this
-                     );
-
-        btnShowBtn->Connect
-                    (
-                        wxEVT_BUTTON,
-                        wxCommandEventHandler(RichTipDialog::OnShowTipForBtn),
-                        NULL,
-                        this
-                    );
+        btnShowText->Bind(wxEVT_BUTTON, &RichTipDialog::OnShowTipForText, this);
+        btnShowBtn->Bind(wxEVT_BUTTON, &RichTipDialog::OnShowTipForBtn, this);
     }
 
 private:
@@ -3624,11 +3607,8 @@ bool TestMessageBoxDialog::Create()
         m_labels[n] = new wxTextCtrl(this, wxID_ANY);
         sizerBtns->Add(m_labels[n], wxSizerFlags().Expand());
 
-        m_labels[n]->Connect(wxEVT_UPDATE_UI,
-                             wxUpdateUIEventHandler(
-                                 TestMessageBoxDialog::OnUpdateLabelUI),
-                             NULL,
-                             this);
+        m_labels[n]->Bind(wxEVT_UPDATE_UI,
+                          &TestMessageBoxDialog::OnUpdateLabelUI, this);
     }
 
     sizerBtnsBox->Add(sizerBtns, wxSizerFlags().Expand());
@@ -3663,11 +3643,8 @@ bool TestMessageBoxDialog::Create()
         sizerFlags = new wxStaticBoxSizer(wxHORIZONTAL, this, "&Other flags");
 
     m_chkNoDefault = new wxCheckBox(this, wxID_ANY, "Make \"No\" &default");
-    m_chkNoDefault->Connect(wxEVT_UPDATE_UI,
-                            wxUpdateUIEventHandler(
-                                TestMessageBoxDialog::OnUpdateNoDefaultUI),
-                            NULL,
-                            this);
+    m_chkNoDefault->Bind(wxEVT_UPDATE_UI,
+                         &TestMessageBoxDialog::OnUpdateNoDefaultUI, this);
     sizerFlags->Add(m_chkNoDefault, wxSizerFlags().Border());
 
     m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent");
diff --git a/samples/dll/my_dll.cpp b/samples/dll/my_dll.cpp
index ba269bc36d..1038acb969 100644
--- a/samples/dll/my_dll.cpp
+++ b/samples/dll/my_dll.cpp
@@ -147,12 +147,8 @@ MyDllApp::MyDllApp()
     // by shutting the thread down when it's no longer needed, though.
     SetExitOnFrameDelete(false);
 
-    Connect(CMD_SHOW_WINDOW,
-            wxEVT_THREAD,
-            wxThreadEventHandler(MyDllApp::OnShowWindow));
-    Connect(CMD_TERMINATE,
-            wxEVT_THREAD,
-            wxThreadEventHandler(MyDllApp::OnTerminate));
+    Bind(wxEVT_THREAD, &MyDllApp::OnShowWindow, this, CMD_SHOW_WINDOW);
+    Bind(wxEVT_THREAD, &MyDllApp::OnTerminate, this, CMD_TERMINATE);
 }
 
 void MyDllApp::OnShowWindow(wxThreadEvent& event)
diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 58d0e23224..2f99e5c622 100644
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -1018,14 +1018,7 @@ DnDFrame::DnDFrame()
     m_ctrlText->SetDropTarget(new DnDText(m_ctrlText));
 
 #if wxUSE_DRAG_AND_DROP
-    m_ctrlDir->Connect
-    (
-        wxID_ANY,
-        wxEVT_TREE_BEGIN_DRAG,
-        wxTreeEventHandler(DnDFrame::OnBeginDrag),
-        NULL,
-        this
-    );
+    m_ctrlDir->Bind(wxEVT_TREE_BEGIN_DRAG, &DnDFrame::OnBeginDrag, this);
 #endif // wxUSE_DRAG_AND_DROP
 
 #if wxUSE_LOG
diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index 4d75fa5c5e..50ab0ba337 100644
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -193,13 +193,7 @@ bool wxTextDocument::OnCreate(const wxString& path, long flags)
 
     // subscribe to changes in the text control to update the document state
     // when it's modified
-    GetTextCtrl()->Connect
-    (
-        wxEVT_TEXT,
-        wxCommandEventHandler(wxTextDocument::OnTextChange),
-        NULL,
-        this
-    );
+    GetTextCtrl()->Bind(wxEVT_TEXT, &wxTextDocument::OnTextChange, this);
 
     return true;
 }
diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index 71b54e1b79..5336bfe155 100644
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -159,8 +159,7 @@ public:
         }
 
         Create (parent, wxID_ANY, pos, size, wxBORDER_NONE);
-        Connect(wxEVT_PAINT,
-                wxPaintEventHandler(ControlWithTransparency::OnPaint));
+        Bind(wxEVT_PAINT, &ControlWithTransparency::OnPaint, this);
 
         if ( !reason.empty() )
         {
diff --git a/samples/event/event.cpp b/samples/event/event.cpp
index 8cc96efd18..2963860050 100644
--- a/samples/event/event.cpp
+++ b/samples/event/event.cpp
@@ -92,8 +92,7 @@ public:
         : wxButton(parent, BUTTON_ID, label)
     {
         // Add a dynamic handler for this button event to button itself
-        Connect(wxEVT_BUTTON,
-                wxCommandEventHandler(MyEvtTestButton::OnClickDynamicHandler));
+        Bind(wxEVT_BUTTON, &MyEvtTestButton::OnClickDynamicHandler, this);
     }
 
 private:
@@ -307,8 +306,8 @@ bool MyApp::OnInit()
     frame->Show(true);
 
     // Add a dynamic handler at the application level for the test button
-    Connect(MyEvtTestButton::BUTTON_ID, wxEVT_BUTTON,
-            wxCommandEventHandler(MyApp::OnClickDynamicHandlerApp));
+    Bind(wxEVT_BUTTON, &MyApp::OnClickDynamicHandlerApp, this,
+         MyEvtTestButton::BUTTON_ID);
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
@@ -427,15 +426,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // event handlers (see class definition);
 
     // Add a dynamic handler for this button event in the parent frame
-    Connect(m_testBtn->GetId(), wxEVT_BUTTON,
-            wxCommandEventHandler(MyFrame::OnClickDynamicHandlerFrame));
+    Bind(wxEVT_BUTTON, &MyFrame::OnClickDynamicHandlerFrame, this,
+         m_testBtn->GetId());
 
     // Bind a method of this frame (notice "this" argument!) to the button
     // itself
-    m_testBtn->Connect(wxEVT_BUTTON,
-                       wxCommandEventHandler(MyFrame::OnClickDynamicHandlerButton),
-                       NULL,
-                       this);
+    m_testBtn->Bind(wxEVT_BUTTON, &MyFrame::OnClickDynamicHandlerButton, this);
 
     mainSizer->Add(m_testBtn);
     panel->SetSizer(mainSizer);
@@ -545,19 +541,13 @@ void MyFrame::OnConnect(wxCommandEvent& event)
 {
     if ( event.IsChecked() )
     {
-        m_btnDynamic->Connect(wxID_ANY, wxEVT_BUTTON,
-                              wxCommandEventHandler(MyFrame::OnDynamic),
-                              NULL, this);
-        Connect(Event_Dynamic, wxEVT_MENU,
-                wxCommandEventHandler(MyFrame::OnDynamic));
+        m_btnDynamic->Bind(wxEVT_BUTTON, &MyFrame::OnDynamic, this);
+        Bind(wxEVT_MENU, &MyFrame::OnDynamic, this, Event_Dynamic);
     }
     else // disconnect
     {
-        m_btnDynamic->Disconnect(wxID_ANY, wxEVT_BUTTON,
-                                 wxCommandEventHandler(MyFrame::OnDynamic),
-                                 NULL, this);
-        Disconnect(Event_Dynamic, wxEVT_MENU,
-                   wxCommandEventHandler(MyFrame::OnDynamic));
+        m_btnDynamic->Unbind(wxEVT_BUTTON, &MyFrame::OnDynamic, this);
+        Unbind(wxEVT_MENU, &MyFrame::OnDynamic, this, Event_Dynamic);
     }
 
     UpdateDynamicStatus(event.IsChecked());
diff --git a/samples/fswatcher/fswatcher.cpp b/samples/fswatcher/fswatcher.cpp
index 0c532a85ea..187345f003 100644
--- a/samples/fswatcher/fswatcher.cpp
+++ b/samples/fswatcher/fswatcher.cpp
@@ -180,8 +180,7 @@ MyFrame::MyFrame(const wxString& title)
                                   _("If checked, dereference symlinks")
                                  );
     it->Check(false);
-    Connect(MENU_ID_DEREFERENCE, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnFollowLinks));
+    Bind(wxEVT_MENU, &MyFrame::OnFollowLinks, this, MENU_ID_DEREFERENCE);
 #endif // __UNIX__
 
     // the "About" item should be in the help menu
@@ -267,28 +266,18 @@ MyFrame::MyFrame(const wxString& title)
     // event handlers & show
 
     // menu
-    Connect(MENU_ID_CLEAR, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnClear));
-    Connect(MENU_ID_QUIT, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnQuit));
-    Connect(MENU_ID_WATCH, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnWatch));
-    Connect(wxID_ABOUT, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnAbout));
+    Bind(wxEVT_MENU, &MyFrame::OnClear, this, MENU_ID_CLEAR);
+    Bind(wxEVT_MENU, &MyFrame::OnQuit, this, MENU_ID_QUIT);
+    Bind(wxEVT_MENU, &MyFrame::OnWatch, this, MENU_ID_WATCH);
+    Bind(wxEVT_MENU, &MyFrame::OnAbout, this, wxID_ABOUT);
 
     // buttons
-    Connect(BTN_ID_ADD, wxEVT_BUTTON,
-            wxCommandEventHandler(MyFrame::OnAdd));
-    Connect(BTN_ID_ADD_TREE, wxEVT_BUTTON,
-            wxCommandEventHandler(MyFrame::OnAddTree));
-    Connect(BTN_ID_REMOVE, wxEVT_BUTTON,
-            wxCommandEventHandler(MyFrame::OnRemove));
-    Connect(BTN_ID_REMOVE, wxEVT_UPDATE_UI,
-            wxUpdateUIEventHandler(MyFrame::OnRemoveUpdateUI));
-    Connect(BTN_ID_REMOVE_ALL, wxEVT_BUTTON,
-            wxCommandEventHandler(MyFrame::OnRemoveAll));
-    Connect(BTN_ID_REMOVE_ALL, wxEVT_UPDATE_UI,
-            wxUpdateUIEventHandler(MyFrame::OnRemoveAllUpdateUI));
+    Bind(wxEVT_BUTTON, &MyFrame::OnAdd, this, BTN_ID_ADD);
+    Bind(wxEVT_BUTTON, &MyFrame::OnAddTree, this, BTN_ID_ADD_TREE);
+    Bind(wxEVT_BUTTON, &MyFrame::OnRemove, this, BTN_ID_REMOVE);
+    Bind(wxEVT_UPDATE_UI, &MyFrame::OnRemoveUpdateUI, this, BTN_ID_REMOVE);
+    Bind(wxEVT_BUTTON, &MyFrame::OnRemoveAll, this, BTN_ID_REMOVE_ALL);
+    Bind(wxEVT_UPDATE_UI, &MyFrame::OnRemoveAllUpdateUI, this, BTN_ID_REMOVE_ALL);
 
     // and show itself (the frames, unlike simple controls, are not shown when
     // created initially)
@@ -306,8 +295,7 @@ bool MyFrame::CreateWatcherIfNecessary()
         return false;
 
     CreateWatcher();
-    Connect(wxEVT_FSWATCHER,
-            wxFileSystemWatcherEventHandler(MyFrame::OnFileSystemEvent));
+    Bind(wxEVT_FSWATCHER, &MyFrame::OnFileSystemEvent, this);
 
     return true;
 }
diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index 974959aea7..774efad4b3 100644
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -719,8 +719,7 @@ void GridFrame::SetTabBehaviour(wxCommandEvent& event)
 {
     // To make any built-in behaviour work, we need to disable the custom TAB
     // handler, otherwise it would be overriding them.
-    grid->Disconnect(wxEVT_GRID_TABBING,
-                     wxGridEventHandler(GridFrame::OnGridCustomTab));
+    grid->Unbind(wxEVT_GRID_TABBING, &GridFrame::OnGridCustomTab, this);
 
     grid->SetTabBehaviour(
             static_cast<wxGrid::TabBehaviour>(event.GetId() - ID_TAB_STOP)
@@ -729,9 +728,7 @@ void GridFrame::SetTabBehaviour(wxCommandEvent& event)
 
 void GridFrame::SetTabCustomHandler(wxCommandEvent&)
 {
-    grid->Connect(wxEVT_GRID_TABBING,
-                  wxGridEventHandler(GridFrame::OnGridCustomTab),
-                  NULL, this);
+    grid->Bind(wxEVT_GRID_TABBING, &GridFrame::OnGridCustomTab, this);
 }
 
 
@@ -2349,10 +2346,7 @@ void GridFrame::OnGridRender( wxCommandEvent& event )
 
     m_gridBitmap = bmp;
 
-    canvas->Connect( wxEVT_PAINT,
-                     wxPaintEventHandler(GridFrame::OnRenderPaint),
-                     NULL,
-                     this );
+    canvas->Bind( wxEVT_PAINT, &GridFrame::OnRenderPaint, this );
 
     frame->Show();
 }
diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index c5cd562c63..d53c506a6a 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -875,7 +875,7 @@ public:
 
         m_bitmap = wxBitmap(m_image);
 
-        Connect(wxEVT_PAINT, wxPaintEventHandler(MyGraphicsFrame::OnPaint));
+        Bind(wxEVT_PAINT, &MyGraphicsFrame::OnPaint, this);
 
         Show();
     }
diff --git a/samples/ipc/baseclient.cpp b/samples/ipc/baseclient.cpp
index b128e032b8..a3f139987e 100644
--- a/samples/ipc/baseclient.cpp
+++ b/samples/ipc/baseclient.cpp
@@ -47,7 +47,7 @@ class MyClient;
 class MyApp : public wxApp
 {
 public:
-    MyApp() { Connect(wxEVT_IDLE, wxIdleEventHandler(MyApp::OnIdle)); }
+    MyApp() { Bind(wxEVT_IDLE, &MyApp::OnIdle, this); }
 
     virtual bool OnInit() wxOVERRIDE;
     virtual int OnExit() wxOVERRIDE;
diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index 5c0417f6ec..800bac943c 100644
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -224,35 +224,19 @@ MyFrame::MyFrame(const wxString& title)
 
     // connect menu event handlers
 
-    Connect(QuitID, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnQuit));
-
-    Connect(wxID_ABOUT, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnAbout));
-
-    Connect(ClearID, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnClear));
-
-    Connect(SkipHook, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnSkipHook));
-    Connect(SkipDown, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnSkipDown));
-
-    Connect(IDInputCustom, IDInputText, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnInputWindowKind));
-
-    Connect(TestAccelA, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnTestAccelA));
-
-    Connect(TestAccelCtrlA, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnTestAccelCtrlA));
-
-    Connect(TestAccelEsc, wxEVT_MENU,
-            wxCommandEventHandler(MyFrame::OnTestAccelEsc));
+    Bind(wxEVT_MENU, &MyFrame::OnQuit, this, QuitID);
+    Bind(wxEVT_MENU, &MyFrame::OnAbout, this, wxID_ABOUT);
+    Bind(wxEVT_MENU, &MyFrame::OnClear, this, ClearID);
+    Bind(wxEVT_MENU, &MyFrame::OnSkipHook, this, SkipHook);
+    Bind(wxEVT_MENU, &MyFrame::OnSkipDown, this, SkipDown);
+    Bind(wxEVT_MENU, &MyFrame::OnInputWindowKind, this, IDInputCustom, IDInputText);
+    Bind(wxEVT_MENU, &MyFrame::OnTestAccelA, this, TestAccelA);
+    Bind(wxEVT_MENU, &MyFrame::OnTestAccelCtrlA, this, TestAccelCtrlA);
+    Bind(wxEVT_MENU, &MyFrame::OnTestAccelEsc, this, TestAccelEsc);
 
     // notice that we don't connect OnCharHook() to the input window, unlike
     // the usual key events this one is propagated upwards
-    Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(MyFrame::OnCharHook));
+    Bind(wxEVT_CHAR_HOOK, &MyFrame::OnCharHook, this);
 
     // status bar is useful for showing the menu items help strings
     CreateStatusBar();
@@ -300,18 +284,13 @@ void MyFrame::DoCreateInputWindow(InputKind inputKind)
     m_inputWin->SetForegroundColour(*wxWHITE);
 
     // connect event handlers for the blue input window
-    m_inputWin->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MyFrame::OnKeyDown),
-                        NULL, this);
-    m_inputWin->Connect(wxEVT_KEY_UP, wxKeyEventHandler(MyFrame::OnKeyUp),
-                        NULL, this);
-    m_inputWin->Connect(wxEVT_CHAR, wxKeyEventHandler(MyFrame::OnChar),
-                        NULL, this);
+    m_inputWin->Bind(wxEVT_KEY_DOWN, &MyFrame::OnKeyDown, this);
+    m_inputWin->Bind(wxEVT_KEY_UP, &MyFrame::OnKeyUp, this);
+    m_inputWin->Bind(wxEVT_CHAR, &MyFrame::OnChar, this);
 
     if ( inputKind == Input_Custom )
     {
-        m_inputWin->Connect(wxEVT_PAINT,
-                            wxPaintEventHandler(MyFrame::OnPaintInputWin),
-                            NULL, this);
+        m_inputWin->Bind(wxEVT_PAINT, &MyFrame::OnPaintInputWin, this);
     }
 
     if ( oldWin )
diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 35c08aed54..e33c6a98cd 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -270,10 +270,8 @@ MyProportionsFrame::MyProportionsFrame(wxFrame *parent)
     SetSizerAndFit(sizerTop);
 
     // and connect the events
-    Connect(wxEVT_TEXT,
-                wxCommandEventHandler(MyProportionsFrame::OnProportionUpdated));
-    Connect(wxEVT_SPINCTRL,
-            wxSpinEventHandler(MyProportionsFrame::OnProportionChanged));
+    Bind(wxEVT_TEXT, &MyProportionsFrame::OnProportionUpdated, this);
+    Bind(wxEVT_SPINCTRL, &MyProportionsFrame::OnProportionChanged, this);
 }
 
 void MyProportionsFrame::UpdateProportions()
diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 657ac0b338..cdafb201ab 100644
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -220,14 +220,14 @@ MyFrame::MyFrame()
 #endif // wxUSE_ACCEL
 
     // connect it only now, after creating m_textWindow
-    Connect(wxEVT_SIZE, wxSizeEventHandler(MyFrame::OnSize));
+    Bind(wxEVT_SIZE, &MyFrame::OnSize, this);
 }
 
 MyFrame::~MyFrame()
 {
     // and disconnect it to prevent accessing already deleted m_textWindow in
     // the size event handler if it's called during destruction
-    Disconnect(wxEVT_SIZE, wxSizeEventHandler(MyFrame::OnSize));
+    Unbind(wxEVT_SIZE, &MyFrame::OnSize, this);
 
     // also prevent its use as log target
     delete wxLog::SetActiveTarget(NULL);
diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index 1708dbb78e..8ffb27b767 100644
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -579,129 +579,48 @@ wxMediaPlayerFrame::wxMediaPlayerFrame(const wxString& title)
     //
     //  Connect events.
     //
-    //  There are two ways in wxWidgets to use events -
-    //  Message Maps and Connections.
-    //
-    //  Message Maps are implemented by putting
-    //  DECLARE_MESSAGE_MAP in your wxEvtHandler-derived
-    //  class you want to use for events, such as wxMediaPlayerFrame.
-    //
-    //  Then after your class declaration you put
-    //  wxBEGIN_EVENT_TABLE(wxMediaPlayerFrame, wxFrame)
-    //  EVT_XXX(XXX)...
-    //  wxEND_EVENT_TABLE()
-    //
-    //  Where wxMediaPlayerFrame is the class with the DECLARE_MESSAGE_MAP
-    //  in it.  EVT_XXX(XXX) are each of your handlers, such
-    //  as EVT_MENU for menu events and the XXX inside
-    //  is the parameters to the event macro - in the case
-    //  of EVT_MENU the menu id and then the function to call.
-    //
-    //  However, with wxEvtHandler::Connect you can avoid a
-    //  global message map for your class and those annoying
-    //  macros.  You can also change the context in which
-    //  the call the handler (more later).
-    //
-    //  The downside is that due to the limitation that
-    //  wxWidgets doesn't use templates in certain areas,
-    //  You have to triple-cast the event function.
-    //
-    //  There are five parameters to wxEvtHandler::Connect -
-    //
-    //  The first is the id of the instance whose events
-    //  you want to handle - i.e. a menu id for menus,
-    //  a control id for controls (wxControl::GetId())
-    //  and so on.
-    //
-    //  The second is the event id.  This is the same
-    //  as the message maps (EVT_MENU) except prefixed
-    //  with "wx" (wxEVT_MENU).
-    //
-    //  The third is the function handler for the event -
-    //  You need to cast it to the specific event handler
-    //  type, then to a wxEventFunction, then to a
-    //  wxObjectEventFunction - I.E.
-    //  (wxObjectEventFunction)(wxEventFunction)
-    //  (wxCommandEventFunction) &wxMediaPlayerFrame::MyHandler
-    //
-    //  Or, you can use the new (2.5.5+) event handler
-    //  conversion macros - for instance the above could
-    //  be done as
-    //  wxCommandEventHandler(wxMediaPlayerFrame::MyHandler)
-    //  pretty simple, eh?
-    //
-    //  The fourth is an optional userdata param -
-    //  this is of historical relevance only and is
-    //  there only for backwards compatibility.
-    //
-    //  The fifth is the context in which to call the
-    //  handler - by default (this param is optional)
-    //  this.  For example in your event handler
-    //  if you were to call "this->MyFunc()"
-    //  it would literally do this->MyFunc.  However,
-    //  if you were to pass myHandler as the fifth
-    //  parameter, for instance, you would _really_
-    //  be calling myHandler->MyFunc, even though
-    //  the compiler doesn't really know it.
-    //
 
     //
     // Menu events
     //
-    this->Connect(wxID_EXIT, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnQuit));
-
-    this->Connect(wxID_ABOUT, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnAbout));
-
-    this->Connect(wxID_LOOP, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnLoop));
-
-    this->Connect(wxID_SHOWINTERFACE, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnShowInterface));
-
-    this->Connect(wxID_OPENFILENEWPAGE, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnOpenFileNewPage));
-
-    this->Connect(wxID_OPENFILESAMEPAGE, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnOpenFileSamePage));
-
-    this->Connect(wxID_OPENURLNEWPAGE, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnOpenURLNewPage));
-
-    this->Connect(wxID_OPENURLSAMEPAGE, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnOpenURLSamePage));
-
-    this->Connect(wxID_CLOSECURRENTPAGE, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnCloseCurrentPage));
-
-    this->Connect(wxID_PLAY, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnPlay));
-
-    this->Connect(wxID_STOP, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnStop));
-
-    this->Connect(wxID_NEXT, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnNext));
-
-    this->Connect(wxID_PREV, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnPrev));
-
-    this->Connect(wxID_SELECTBACKEND, wxEVT_MENU,
-                  wxCommandEventHandler(wxMediaPlayerFrame::OnSelectBackend));
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnQuit, this,
+         wxID_EXIT);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnAbout, this,
+         wxID_ABOUT);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnLoop, this,
+         wxID_LOOP);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnShowInterface, this,
+         wxID_SHOWINTERFACE);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnOpenFileNewPage, this,
+         wxID_OPENFILENEWPAGE);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnOpenFileSamePage, this,
+         wxID_OPENFILESAMEPAGE);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnOpenURLNewPage, this,
+         wxID_OPENURLNEWPAGE);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnOpenURLSamePage, this,
+         wxID_OPENURLSAMEPAGE);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnCloseCurrentPage, this,
+         wxID_CLOSECURRENTPAGE);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnPlay, this,
+         wxID_PLAY);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnStop, this,
+         wxID_STOP);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnNext, this,
+         wxID_NEXT);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnPrev, this,
+         wxID_PREV);
+    Bind(wxEVT_MENU, &wxMediaPlayerFrame::OnSelectBackend, this,
+         wxID_SELECTBACKEND);
 
     //
     // Key events
     //
-    wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN,
-                  wxKeyEventHandler(wxMediaPlayerFrame::OnKeyDown),
-                  (wxObject*)0, this);
+    wxTheApp->Bind(wxEVT_KEY_DOWN, &wxMediaPlayerFrame::OnKeyDown, this);
 
     //
     // Close events
     //
-    this->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW,
-                wxCloseEventHandler(wxMediaPlayerFrame::OnClose));
+    Bind(wxEVT_CLOSE_WINDOW, &wxMediaPlayerFrame::OnClose, this);
 
     //
     // End of Events
@@ -1710,58 +1629,50 @@ wxMediaPlayerNotebookPage::wxMediaPlayerNotebookPage(wxMediaPlayerFrame* parentF
     //
     // ListCtrl events
     //
-    this->Connect( wxID_LISTCTRL, wxEVT_LIST_ITEM_ACTIVATED,
-        wxListEventHandler(wxMediaPlayerFrame::OnChangeSong),
-        (wxObject*)0, parentFrame);
+    Bind(wxEVT_LIST_ITEM_ACTIVATED, &wxMediaPlayerFrame::OnChangeSong, parentFrame,
+         wxID_LISTCTRL);
 
     //
     // Slider events
     //
-    this->Connect(wxID_SLIDER, wxEVT_SCROLL_THUMBTRACK,
-                  wxScrollEventHandler(wxMediaPlayerNotebookPage::OnBeginSeek));
-    this->Connect(wxID_SLIDER, wxEVT_SCROLL_THUMBRELEASE,
-                  wxScrollEventHandler(wxMediaPlayerNotebookPage::OnEndSeek));
-    this->Connect(wxID_PBSLIDER, wxEVT_SCROLL_THUMBRELEASE,
-                    wxScrollEventHandler(wxMediaPlayerNotebookPage::OnPBChange));
-    this->Connect(wxID_VOLSLIDER, wxEVT_SCROLL_THUMBRELEASE,
-                    wxScrollEventHandler(wxMediaPlayerNotebookPage::OnVolChange));
+    Bind(wxEVT_SCROLL_THUMBTRACK, &wxMediaPlayerNotebookPage::OnBeginSeek, this,
+         wxID_SLIDER);
+    Bind(wxEVT_SCROLL_THUMBRELEASE, &wxMediaPlayerNotebookPage::OnEndSeek, this,
+         wxID_SLIDER);
+    Bind(wxEVT_SCROLL_THUMBRELEASE, &wxMediaPlayerNotebookPage::OnPBChange, this,
+         wxID_PBSLIDER);
+    Bind(wxEVT_SCROLL_THUMBRELEASE, &wxMediaPlayerNotebookPage::OnVolChange, this,
+         wxID_VOLSLIDER);
 
     //
     // Media Control events
     //
-    this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_PLAY,
-                  wxMediaEventHandler(wxMediaPlayerNotebookPage::OnMediaPlay));
-    this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_PAUSE,
-                  wxMediaEventHandler(wxMediaPlayerNotebookPage::OnMediaPause));
-    this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_STOP,
-                  wxMediaEventHandler(wxMediaPlayerNotebookPage::OnMediaStop));
-    this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_FINISHED,
-                  wxMediaEventHandler(wxMediaPlayerNotebookPage::OnMediaFinished));
-    this->Connect(wxID_MEDIACTRL, wxEVT_MEDIA_LOADED,
-                  wxMediaEventHandler(wxMediaPlayerFrame::OnMediaLoaded),
-                  (wxObject*)0, parentFrame);
+    Bind(wxEVT_MEDIA_PLAY, &wxMediaPlayerNotebookPage::OnMediaPlay, this,
+         wxID_MEDIACTRL);
+    Bind(wxEVT_MEDIA_PAUSE, &wxMediaPlayerNotebookPage::OnMediaPause, this,
+         wxID_MEDIACTRL);
+    Bind(wxEVT_MEDIA_STOP, &wxMediaPlayerNotebookPage::OnMediaStop, this,
+         wxID_MEDIACTRL);
+    Bind(wxEVT_MEDIA_FINISHED, &wxMediaPlayerNotebookPage::OnMediaFinished, this,
+         wxID_MEDIACTRL);
+    Bind(wxEVT_MEDIA_LOADED, &wxMediaPlayerFrame::OnMediaLoaded, parentFrame,
+         wxID_MEDIACTRL);
 
     //
     // Button events
     //
-    this->Connect( wxID_BUTTONPREV, wxEVT_BUTTON,
-        wxCommandEventHandler(wxMediaPlayerFrame::OnPrev),
-        (wxObject*)0, parentFrame);
-    this->Connect( wxID_BUTTONPLAY, wxEVT_BUTTON,
-        wxCommandEventHandler(wxMediaPlayerFrame::OnPlay),
-        (wxObject*)0, parentFrame);
-    this->Connect( wxID_BUTTONSTOP, wxEVT_BUTTON,
-        wxCommandEventHandler(wxMediaPlayerFrame::OnStop),
-        (wxObject*)0, parentFrame);
-    this->Connect( wxID_BUTTONNEXT, wxEVT_BUTTON,
-        wxCommandEventHandler(wxMediaPlayerFrame::OnNext),
-        (wxObject*)0, parentFrame);
-    this->Connect( wxID_BUTTONVD, wxEVT_BUTTON,
-        wxCommandEventHandler(wxMediaPlayerFrame::OnVolumeDown),
-        (wxObject*)0, parentFrame);
-    this->Connect( wxID_BUTTONVU, wxEVT_BUTTON,
-        wxCommandEventHandler(wxMediaPlayerFrame::OnVolumeUp),
-        (wxObject*)0, parentFrame);
+    Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnPrev, parentFrame,
+         wxID_BUTTONPREV);
+    Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnPlay, parentFrame,
+         wxID_BUTTONPLAY);
+    Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnStop, parentFrame,
+         wxID_BUTTONSTOP);
+    Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnNext, parentFrame,
+         wxID_BUTTONNEXT);
+    Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnVolumeDown, parentFrame,
+         wxID_BUTTONVD);
+    Bind(wxEVT_BUTTON, &wxMediaPlayerFrame::OnVolumeUp, parentFrame,
+         wxID_BUTTONVU);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp
index 9e104ecfe5..46df8a2f5c 100644
--- a/samples/popup/popup.cpp
+++ b/samples/popup/popup.cpp
@@ -116,9 +116,7 @@ SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent, bool scrolled )
     // Keep this code to verify if mouse events work, they're required if
     // you're making a control like a combobox where the items are highlighted
     // under the cursor, the m_panel is set focus in the Popup() function
-    m_panel->Connect(wxEVT_MOTION,
-                     wxMouseEventHandler(SimpleTransientPopup::OnMouse),
-                     NULL, this);
+    m_panel->Bind(wxEVT_MOTION, &SimpleTransientPopup::OnMouse, this);
 
     wxStaticText *text = new wxStaticText( m_panel, wxID_ANY,
                           wxT("wxPopupTransientWindow is a\n")
diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 2496138fac..4638bac948 100644
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -1969,14 +1969,6 @@ void FormMain::CreateGrid( int style, int extraStyle )
     //m_pPropGridManager->SetSplitterLeft(true);
     //m_pPropGridManager->SetSplitterPosition(137);
 
-    /*
-    // This would setup event handling without event table entries
-    Connect(m_pPropGridManager->GetId(), wxEVT_PG_SELECTED,
-            wxPropertyGridEventHandler(FormMain::OnPropertyGridSelect) );
-    Connect(m_pPropGridManager->GetId(), wxEVT_PG_CHANGED,
-            wxPropertyGridEventHandler(FormMain::OnPropertyGridChange) );
-    */
-
     m_topSizer->Add( m_pPropGridManager, wxSizerFlags(1).Expand());
 
     FinalizePanel(wasCreated);
diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 3428ab9317..fcea79627f 100644
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -49,7 +49,7 @@ public:
         SetVirtualSize( WIDTH, HEIGHT );
         SetBackgroundColour( *wxWHITE );
 
-        Connect(wxEVT_PAINT, wxPaintEventHandler(MySimpleCanvas::OnPaint));
+        Bind(wxEVT_PAINT, &MySimpleCanvas::OnPaint, this);
     }
 
 private:
@@ -125,10 +125,8 @@ public:
         mbar->Append(menuFile, "&File");
         SetMenuBar( mbar );
 
-        Connect(wxID_DELETE, wxEVT_MENU,
-                wxCommandEventHandler(MyCanvasFrame::OnDeleteAll));
-        Connect(wxID_NEW, wxEVT_MENU,
-                wxCommandEventHandler(MyCanvasFrame::OnInsertNew));
+        Bind(wxEVT_MENU, &MyCanvasFrame::OnDeleteAll, this, wxID_DELETE);
+        Bind(wxEVT_MENU, &MyCanvasFrame::OnInsertNew, this, wxID_NEW);
 
         Show();
     }
@@ -197,7 +195,7 @@ public:
     {
         m_owner = parent;
 
-        Connect(wxEVT_PAINT, wxPaintEventHandler(MySubColLabels::OnPaint));
+        Bind(wxEVT_PAINT, &MySubColLabels::OnPaint, this);
     }
 
 private:
@@ -232,7 +230,7 @@ public:
     {
         m_owner = parent;
 
-        Connect(wxEVT_PAINT, wxPaintEventHandler(MySubRowLabels::OnPaint));
+        Bind(wxEVT_PAINT, &MySubRowLabels::OnPaint, this);
     }
 
 private:
@@ -289,7 +287,7 @@ public:
 
         SetBackgroundColour("WHEAT");
 
-        Connect(wxEVT_PAINT, wxPaintEventHandler(MySubCanvas::OnPaint));
+        Bind(wxEVT_PAINT, &MySubCanvas::OnPaint, this);
     }
 
     // override the base class function so that when this window is scrolled,
@@ -396,7 +394,7 @@ public:
 
         SetScrollbars(10, 10, 50, 50);
 
-        Connect(wxEVT_SIZE, wxSizeEventHandler(MySubScrolledWindow::OnSize));
+        Bind(wxEVT_SIZE, &MySubScrolledWindow::OnSize, this);
     }
 
 protected:
@@ -808,8 +806,8 @@ MySizerScrolledWindow::MySizerScrolledWindow(wxWindow *parent)
 
     SetSizer( sizer );
 
-    Connect(wxID_RESIZE_FRAME, wxEVT_BUTTON,
-            wxCommandEventHandler(MySizerScrolledWindow::OnResizeClick));
+    Bind(wxEVT_BUTTON, &MySizerScrolledWindow::OnResizeClick, this,
+         wxID_RESIZE_FRAME);
 }
 
 void MySizerScrolledWindow::OnResizeClick(wxCommandEvent &WXUNUSED(event))
diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp
index 3f2087a959..e3d5948040 100644
--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@@ -172,7 +172,7 @@ public:
 
         ShowWithEffect(m_effect, m_timeout);
 
-        Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(EffectFrame::OnClose));
+        Bind(wxEVT_CLOSE_WINDOW, &EffectFrame::OnClose, this);
     }
 
 private:
diff --git a/samples/taborder/taborder.cpp b/samples/taborder/taborder.cpp
index 0efaaa9a1c..17e36b0394 100644
--- a/samples/taborder/taborder.cpp
+++ b/samples/taborder/taborder.cpp
@@ -134,7 +134,7 @@ public:
                      wxDefaultPosition, wxDefaultSize,
                      flags)
     {
-        Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MyTabTextCtrl::OnKeyDown));
+        Bind(wxEVT_KEY_DOWN, &MyTabTextCtrl::OnKeyDown, this);
     }
 
 private:
diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
index 856169e195..1dd4b68487 100644
--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@@ -474,140 +474,80 @@ WebFrame::WebFrame(const wxString& url) :
 
 
     // Connect the toolbar events
-    Connect(m_toolbar_back->GetId(), wxEVT_TOOL,
-            wxCommandEventHandler(WebFrame::OnBack), NULL, this );
-    Connect(m_toolbar_forward->GetId(), wxEVT_TOOL,
-            wxCommandEventHandler(WebFrame::OnForward), NULL, this );
-    Connect(m_toolbar_stop->GetId(), wxEVT_TOOL,
-            wxCommandEventHandler(WebFrame::OnStop), NULL, this );
-    Connect(m_toolbar_reload->GetId(), wxEVT_TOOL,
-            wxCommandEventHandler(WebFrame::OnReload),NULL, this );
-    Connect(m_toolbar_tools->GetId(), wxEVT_TOOL,
-            wxCommandEventHandler(WebFrame::OnToolsClicked), NULL, this );
+    Bind(wxEVT_TOOL, &WebFrame::OnBack, this, m_toolbar_back->GetId());
+    Bind(wxEVT_TOOL, &WebFrame::OnForward, this, m_toolbar_forward->GetId());
+    Bind(wxEVT_TOOL, &WebFrame::OnStop, this, m_toolbar_stop->GetId());
+    Bind(wxEVT_TOOL, &WebFrame::OnReload, this, m_toolbar_reload->GetId());
+    Bind(wxEVT_TOOL, &WebFrame::OnToolsClicked, this, m_toolbar_tools->GetId());
 
-    Connect(m_url->GetId(), wxEVT_TEXT_ENTER,
-            wxCommandEventHandler(WebFrame::OnUrl), NULL, this );
+    Bind(wxEVT_TEXT_ENTER, &WebFrame::OnUrl, this, m_url->GetId());
 
     // Connect find toolbar events.
-    Connect(m_find_toolbar_done->GetId(), wxEVT_TOOL,
-            wxCommandEventHandler(WebFrame::OnFindDone), NULL, this );
-    Connect(m_find_toolbar_next->GetId(), wxEVT_TOOL,
-            wxCommandEventHandler(WebFrame::OnFindText), NULL, this );
-    Connect(m_find_toolbar_previous->GetId(), wxEVT_TOOL,
-            wxCommandEventHandler(WebFrame::OnFindText), NULL, this );
+    Bind(wxEVT_TOOL, &WebFrame::OnFindDone, this, m_find_toolbar_done->GetId());
+    Bind(wxEVT_TOOL, &WebFrame::OnFindText, this, m_find_toolbar_next->GetId());
+    Bind(wxEVT_TOOL, &WebFrame::OnFindText, this, m_find_toolbar_previous->GetId());
 
     // Connect find control events.
-    Connect(m_find_ctrl->GetId(), wxEVT_TEXT,
-            wxCommandEventHandler(WebFrame::OnFindText), NULL, this );
-    Connect(m_find_ctrl->GetId(), wxEVT_TEXT_ENTER,
-            wxCommandEventHandler(WebFrame::OnFindText), NULL, this );
+    Bind(wxEVT_TEXT, &WebFrame::OnFindText, this, m_find_ctrl->GetId());
+    Bind(wxEVT_TEXT_ENTER, &WebFrame::OnFindText, this, m_find_ctrl->GetId());
 
     // Connect the webview events
-    Connect(m_browser->GetId(), wxEVT_WEBVIEW_NAVIGATING,
-            wxWebViewEventHandler(WebFrame::OnNavigationRequest), NULL, this);
-    Connect(m_browser->GetId(), wxEVT_WEBVIEW_NAVIGATED,
-            wxWebViewEventHandler(WebFrame::OnNavigationComplete), NULL, this);
-    Connect(m_browser->GetId(), wxEVT_WEBVIEW_LOADED,
-            wxWebViewEventHandler(WebFrame::OnDocumentLoaded), NULL, this);
-    Connect(m_browser->GetId(), wxEVT_WEBVIEW_ERROR,
-            wxWebViewEventHandler(WebFrame::OnError), NULL, this);
-    Connect(m_browser->GetId(), wxEVT_WEBVIEW_NEWWINDOW,
-            wxWebViewEventHandler(WebFrame::OnNewWindow), NULL, this);
-    Connect(m_browser->GetId(), wxEVT_WEBVIEW_TITLE_CHANGED,
-            wxWebViewEventHandler(WebFrame::OnTitleChanged), NULL, this);
+    Bind(wxEVT_WEBVIEW_NAVIGATING, &WebFrame::OnNavigationRequest, this, m_browser->GetId());
+    Bind(wxEVT_WEBVIEW_NAVIGATED, &WebFrame::OnNavigationComplete, this, m_browser->GetId());
+    Bind(wxEVT_WEBVIEW_LOADED, &WebFrame::OnDocumentLoaded, this, m_browser->GetId());
+    Bind(wxEVT_WEBVIEW_ERROR, &WebFrame::OnError, this, m_browser->GetId());
+    Bind(wxEVT_WEBVIEW_NEWWINDOW, &WebFrame::OnNewWindow, this, m_browser->GetId());
+    Bind(wxEVT_WEBVIEW_TITLE_CHANGED, &WebFrame::OnTitleChanged, this, m_browser->GetId());
 
     // Connect the menu events
-    Connect(setPage->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnSetPage),  NULL, this );
-    Connect(viewSource->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnViewSourceRequest),  NULL, this );
-    Connect(viewText->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnViewTextRequest),  NULL, this );
-    Connect(print->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnPrint),  NULL, this );
-    Connect(m_tools_layout->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnZoomLayout),  NULL, this );
-    Connect(m_tools_tiny->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnSetZoom),  NULL, this );
-    Connect(m_tools_small->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnSetZoom),  NULL, this );
-    Connect(m_tools_medium->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnSetZoom),  NULL, this );
-    Connect(m_tools_large->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnSetZoom),  NULL, this );
-    Connect(m_tools_largest->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnSetZoom),  NULL, this );
-    Connect(clearhist->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnClearHistory),  NULL, this );
-    Connect(m_tools_enable_history->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnEnableHistory),  NULL, this );
-    Connect(m_edit_cut->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnCut),  NULL, this );
-    Connect(m_edit_copy->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnCopy),  NULL, this );
-    Connect(m_edit_paste->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnPaste),  NULL, this );
-    Connect(m_edit_undo->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnUndo),  NULL, this );
-    Connect(m_edit_redo->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRedo),  NULL, this );
-    Connect(m_edit_mode->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnMode),  NULL, this );
-    Connect(m_scroll_line_up->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnScrollLineUp),  NULL, this );
-    Connect(m_scroll_line_down->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnScrollLineDown),  NULL, this );
-    Connect(m_scroll_page_up->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnScrollPageUp),  NULL, this );
-    Connect(m_scroll_page_down->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnScrollPageDown),  NULL, this );
-    Connect(m_script_string->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptString),  NULL, this );
-    Connect(m_script_integer->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptInteger),  NULL, this );
-    Connect(m_script_double->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptDouble),  NULL, this );
-    Connect(m_script_bool->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptBool),  NULL, this );
-    Connect(m_script_object->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptObject),  NULL, this );
-    Connect(m_script_array->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptArray),  NULL, this );
-    Connect(m_script_dom->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptDOM),  NULL, this );
-    Connect(m_script_undefined->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptUndefined),  NULL, this );
-    Connect(m_script_null->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptNull),  NULL, this );
-    Connect(m_script_date->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptDate),  NULL, this );
+    Bind(wxEVT_MENU, &WebFrame::OnSetPage, this, setPage->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnViewSourceRequest, this, viewSource->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnViewTextRequest, this, viewText->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnPrint, this, print->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnZoomLayout, this, m_tools_layout->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_tiny->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_small->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_medium->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_large->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnSetZoom, this, m_tools_largest->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnClearHistory, this, clearhist->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnEnableHistory, this, m_tools_enable_history->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnCut, this, m_edit_cut->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnCopy, this, m_edit_copy->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnPaste, this, m_edit_paste->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnUndo, this, m_edit_undo->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRedo, this, m_edit_redo->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnMode, this, m_edit_mode->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnScrollLineUp, this, m_scroll_line_up->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnScrollLineDown, this, m_scroll_line_down->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnScrollPageUp, this, m_scroll_page_up->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnScrollPageDown, this, m_scroll_page_down->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptString, this, m_script_string->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptInteger, this, m_script_integer->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptDouble, this, m_script_double->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptBool, this, m_script_bool->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptObject, this, m_script_object->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptArray, this, m_script_array->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptDOM, this, m_script_dom->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptUndefined, this, m_script_undefined->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptNull, this, m_script_null->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptDate, this, m_script_date->GetId());
 #if wxUSE_WEBVIEW_IE
-    Connect(m_script_object_el->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptObjectWithEmulationLevel),  NULL, this );
-    Connect(m_script_date_el->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptDateWithEmulationLevel),  NULL, this );
-    Connect(m_script_array_el->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptArrayWithEmulationLevel),  NULL, this );
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptObjectWithEmulationLevel, this, m_script_object_el->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptDateWithEmulationLevel, this, m_script_date_el->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptArrayWithEmulationLevel, this, m_script_array_el->GetId());
 #endif
-    Connect(m_script_custom->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnRunScriptCustom),  NULL, this );
-    Connect(m_selection_clear->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnClearSelection),  NULL, this );
-    Connect(m_selection_delete->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnDeleteSelection),  NULL, this );
-    Connect(selectall->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnSelectAll),  NULL, this );
-    Connect(loadscheme->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnLoadScheme),  NULL, this );
-    Connect(usememoryfs->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnUseMemoryFS),  NULL, this );
-    Connect(m_find->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnFind),  NULL, this );
-    Connect(m_context_menu->GetId(), wxEVT_MENU,
-            wxCommandEventHandler(WebFrame::OnEnableContextMenu), NULL, this );
+    Bind(wxEVT_MENU, &WebFrame::OnRunScriptCustom, this, m_script_custom->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnClearSelection, this, m_selection_clear->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnDeleteSelection, this, m_selection_delete->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnSelectAll, this, selectall->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnLoadScheme, this, loadscheme->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnUseMemoryFS, this, usememoryfs->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnFind, this, m_find->GetId());
+    Bind(wxEVT_MENU, &WebFrame::OnEnableContextMenu, this, m_context_menu->GetId());
 
     //Connect the idle events
-    Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(WebFrame::OnIdle), NULL, this);
+    Bind(wxEVT_IDLE, &WebFrame::OnIdle, this);
 }
 
 WebFrame::~WebFrame()
@@ -1011,8 +951,7 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
     {
         item = m_tools_history_menu->AppendRadioItem(wxID_ANY, back[i]->GetTitle());
         m_histMenuItems[item->GetId()] = back[i];
-        Connect(item->GetId(), wxEVT_MENU,
-                wxCommandEventHandler(WebFrame::OnHistory), NULL, this );
+        Bind(wxEVT_MENU, &WebFrame::OnHistory, this, item->GetId());
     }
 
     wxString title = m_browser->GetCurrentTitle();
@@ -1028,8 +967,7 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
     {
         item = m_tools_history_menu->AppendRadioItem(wxID_ANY, forward[i]->GetTitle());
         m_histMenuItems[item->GetId()] = forward[i];
-        Connect(item->GetId(), wxEVT_TOOL,
-                wxCommandEventHandler(WebFrame::OnHistory), NULL, this );
+        Bind(wxEVT_TOOL, &WebFrame::OnHistory, this, item->GetId());
     }
 
     wxPoint position = ScreenToClient( wxGetMousePosition() );
diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 28bfbde471..623d2b92e3 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -205,12 +205,6 @@ wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
         wxString tipText = wxString::Format(wxT("tip %i"),i);
         menu->Append(ID_SEARCHMENU+i, itemText, tipText, wxITEM_NORMAL);
     }
-//     target->Connect(
-//         ID_SEARCHMENU,
-//         ID_SEARCHMENU+SEARCH_MENU_SIZE,
-//         wxEVT_MENU,
-//         wxCommandEventHandler(MySearchCtrl::OnSearchMenu)
-//         );
     return menu;
 }
 
diff --git a/samples/widgets/statbmp.cpp b/samples/widgets/statbmp.cpp
index 08a69c6952..b31b3a0370 100644
--- a/samples/widgets/statbmp.cpp
+++ b/samples/widgets/statbmp.cpp
@@ -115,10 +115,8 @@ void StatBmpWidgetsPage::CreateContent()
 
     wxInitAllImageHandlers();
 
-    Connect(wxEVT_FILEPICKER_CHANGED,
-            wxFileDirPickerEventHandler(StatBmpWidgetsPage::OnFileChange));
-    Connect(wxEVT_RADIOBOX,
-            wxCommandEventHandler(StatBmpWidgetsPage::OnRadioChange));
+    Bind(wxEVT_FILEPICKER_CHANGED, &StatBmpWidgetsPage::OnFileChange, this);
+    Bind(wxEVT_RADIOBOX, &StatBmpWidgetsPage::OnRadioChange, this);
 
     m_statbmp = NULL;
     RecreateWidget();
@@ -171,9 +169,8 @@ void StatBmpWidgetsPage::RecreateWidget()
     }
     m_sbsizer->Add(m_statbmp, wxSizerFlags(1).Expand());
     GetSizer()->Layout();
-    m_statbmp->Connect(wxEVT_LEFT_DOWN,
-                       wxMouseEventHandler(StatBmpWidgetsPage::OnMouseEvent),
-                       NULL, this);
+    m_statbmp->Bind(wxEVT_LEFT_DOWN, &StatBmpWidgetsPage::OnMouseEvent, this);
+
     // When switching from generic to native control on wxMSW under Wine,
     // the explicit Refresh() is necessary
     m_statbmp->Refresh();
diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index ed5fc8d04b..143205238d 100644
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -310,9 +310,7 @@ void StaticWidgetsPage::CreateContent()
 
     m_textBox = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
     wxButton *b1 = new wxButton(this, wxID_ANY, "Change &box label");
-    b1->Connect(wxEVT_BUTTON,
-                wxCommandEventHandler(StaticWidgetsPage::OnButtonBoxText),
-                NULL, this);
+    b1->Bind(wxEVT_BUTTON, &StaticWidgetsPage::OnButtonBoxText, this);
     sizerMiddle->Add(m_textBox, 0, wxEXPAND|wxALL, 5);
     sizerMiddle->Add(b1, 0, wxLEFT|wxBOTTOM, 5);
 
@@ -320,9 +318,7 @@ void StaticWidgetsPage::CreateContent()
                                  wxDefaultPosition, wxDefaultSize,
                                  wxTE_MULTILINE|wxHSCROLL);
     wxButton *b2 = new wxButton(this, wxID_ANY, "Change &text label");
-    b2->Connect(wxEVT_BUTTON,
-                wxCommandEventHandler(StaticWidgetsPage::OnButtonLabelText),
-                NULL, this);
+    b2->Bind(wxEVT_BUTTON, &StaticWidgetsPage::OnButtonLabelText, this);
     sizerMiddle->Add(m_textLabel, 0, wxEXPAND|wxALL, 5);
     sizerMiddle->Add(b2, 0, wxLEFT|wxBOTTOM, 5);
 
@@ -332,9 +328,7 @@ void StaticWidgetsPage::CreateContent()
                                            wxTE_MULTILINE|wxHSCROLL);
 
     wxButton *b3 = new wxButton(this, wxID_ANY, "Change decorated text label");
-    b3->Connect(wxEVT_BUTTON,
-                wxCommandEventHandler(StaticWidgetsPage::OnButtonLabelWithMarkupText),
-                NULL, this);
+    b3->Bind(wxEVT_BUTTON, &StaticWidgetsPage::OnButtonLabelWithMarkupText, this);
     sizerMiddle->Add(m_textLabelWithMarkup, 0, wxEXPAND|wxALL, 5);
     sizerMiddle->Add(b3, 0, wxLEFT|wxBOTTOM, 5);
 
@@ -562,12 +556,8 @@ void StaticWidgetsPage::CreateStatic()
 
     m_sizerStatic->Layout();
 
-    m_statText->Connect(wxEVT_LEFT_UP,
-                        wxMouseEventHandler(StaticWidgetsPage::OnMouseEvent),
-                        NULL, this);
-    staticBox->Connect(wxEVT_LEFT_UP,
-                       wxMouseEventHandler(StaticWidgetsPage::OnMouseEvent),
-                       NULL, this);
+    m_statText->Bind(wxEVT_LEFT_UP, &StaticWidgetsPage::OnMouseEvent, this);
+    staticBox->Bind(wxEVT_LEFT_UP, &StaticWidgetsPage::OnMouseEvent, this);
 
     SetUpWidget();
 }
diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index cb42f7d16e..3cd4f6c6a3 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -628,9 +628,7 @@ void WidgetsFrame::InitBook()
         }
     }
 
-    Connect( wxID_ANY,
-             wxEVT_COMMAND_WIDGETS_PAGE_CHANGED,
-             wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) );
+    Bind(wxEVT_COMMAND_WIDGETS_PAGE_CHANGED, &WidgetsFrame::OnPageChanged, this);
 
     const bool pageSet = wxPersistentRegisterAndRestore(m_book);
 
diff --git a/samples/wrapsizer/wrapsizer.cpp b/samples/wrapsizer/wrapsizer.cpp
index 6a13f310c6..8da72f27fc 100644
--- a/samples/wrapsizer/wrapsizer.cpp
+++ b/samples/wrapsizer/wrapsizer.cpp
@@ -144,8 +144,7 @@ WrapSizerFrame::WrapSizerFrame()
     // OK Button
     sizerRoot->Add(new wxButton(m_panel, wxID_OK),
                     wxSizerFlags().Centre().DoubleBorder());
-    Connect(wxID_OK, wxEVT_BUTTON,
-                wxCommandEventHandler(WrapSizerFrame::OnButton));
+    Bind(wxEVT_BUTTON, &WrapSizerFrame::OnButton, this, wxID_OK);
 
     // Set sizer for the panel
     m_panel->SetSizer(sizerRoot);
diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 90a40d482c..0acee89c5e 100644
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -261,8 +261,8 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_ANIMATIONCTRL
     // dynamically connect our event handler for the "clicked" event of the "play" button
     // in the animation ctrl page of our dialog
-    dlg.Connect(XRCID("controls_animation_button_play"), wxEVT_BUTTON,
-                wxCommandEventHandler(MyFrame::OnAnimationCtrlPlay));
+    dlg.Bind(wxEVT_BUTTON, &MyFrame::OnAnimationCtrlPlay, this,
+             XRCID("controls_animation_button_play"));
 #endif
 
     // All done. Show the dialog.
diff --git a/samples/xrc/objrefdlg.cpp b/samples/xrc/objrefdlg.cpp
index 086641feeb..89ff6ec264 100644
--- a/samples/xrc/objrefdlg.cpp
+++ b/samples/xrc/objrefdlg.cpp
@@ -48,38 +48,26 @@ ObjrefDialog::ObjrefDialog(wxWindow* parent)
     wxCHECK_RET(nb, "failed to find objref_notebook");
 
     // Connect different event handlers.
-    nb->Connect(wxEVT_NOTEBOOK_PAGE_CHANGED,
-                wxNotebookEventHandler(ObjrefDialog::OnNotebookPageChanged),
-                NULL, this);
+    nb->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, &ObjrefDialog::OnNotebookPageChanged, this);
 
     // We want to direct UpdateUI events for the ID range 'first_row' to
     // OnUpdateUIFirst(). We could achieve this using first_row[0] and
     // first_row[2], but what if a fourth column were added? It's safer to use
     // the 'typedefs' for the two ends of the range:
     wxNotebookPage *page = nb->GetPage(icons_page);
-    page->Connect(XRCID("first_row[start]"), XRCID("first_row[end]"),
-                  wxEVT_UPDATE_UI,
-                  wxUpdateUIEventHandler(ObjrefDialog::OnUpdateUIFirst),
-                  NULL, this);
-    page->Connect(XRCID("second_row[start]"), XRCID("second_row[end]"),
-                  wxEVT_UPDATE_UI,
-                  wxUpdateUIEventHandler(ObjrefDialog::OnUpdateUISecond),
-                  NULL, this);
-    page->Connect(XRCID("third_row[start]"), XRCID("third_row[end]"),
-                  wxEVT_UPDATE_UI,
-                  wxUpdateUIEventHandler(ObjrefDialog::OnUpdateUIThird),
-                  NULL, this);
+    page->Bind(wxEVT_UPDATE_UI, &ObjrefDialog::OnUpdateUIFirst, this,
+               XRCID("first_row[start]"), XRCID("first_row[end]"));
+    page->Bind(wxEVT_UPDATE_UI, &ObjrefDialog::OnUpdateUISecond, this,
+               XRCID("second_row[start]"), XRCID("second_row[end]"));
+    page->Bind(wxEVT_UPDATE_UI, &ObjrefDialog::OnUpdateUIThird, this,
+               XRCID("third_row[start]"), XRCID("third_row[end]"));
 
     // Connect the id ranges, using the [start] and [end] 'typedefs'
     page = nb->GetPage(calc_page);
-    page->Connect(XRCID("digits[start]"), XRCID("digits[end]"),
-                  wxEVT_BUTTON,
-                  wxCommandEventHandler(ObjrefDialog::OnNumeralClick),
-                  NULL, this);
-    page->Connect(XRCID("operators[start]"), XRCID("operators[end]"),
-                  wxEVT_BUTTON,
-                  wxCommandEventHandler(ObjrefDialog::OnOperatorClick),
-                  NULL, this);
+    page->Bind(wxEVT_BUTTON, &ObjrefDialog::OnNumeralClick, this,
+               XRCID("digits[start]"), XRCID("digits[end]"));
+    page->Bind(wxEVT_BUTTON, &ObjrefDialog::OnOperatorClick, this,
+               XRCID("operators[start]"), XRCID("operators[end]"));
 
 }
 
diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp
index bf700ec508..a38235c47a 100644
--- a/tests/menu/menu.cpp
+++ b/tests/menu/menu.cpp
@@ -488,6 +488,55 @@ void MenuTestCase::ChangeBitmap()
     wxDELETE(menu);
 }
 
+#if wxUSE_UIACTIONSIMULATOR
+
+// In C++98 this class can't be defined inside Events() method, unfortunately,
+// as its OnMenu() method wouldn't be usable with template Bind() then.
+class MenuEventHandler : public wxEvtHandler
+{
+public:
+    MenuEventHandler(wxWindow* win)
+        : m_win(win)
+    {
+        m_win->Bind(wxEVT_MENU, &MenuEventHandler::OnMenu, this);
+
+        m_gotEvent = false;
+        m_event = NULL;
+    }
+
+    virtual ~MenuEventHandler()
+    {
+        m_win->Unbind(wxEVT_MENU, &MenuEventHandler::OnMenu, this);
+
+        delete m_event;
+    }
+
+    const wxCommandEvent& GetEvent()
+    {
+        CPPUNIT_ASSERT( m_gotEvent );
+
+        m_gotEvent = false;
+
+        return *m_event;
+    }
+
+private:
+    void OnMenu(wxCommandEvent& event)
+    {
+        CPPUNIT_ASSERT( !m_gotEvent );
+
+        delete m_event;
+        m_event = static_cast<wxCommandEvent*>(event.Clone());
+        m_gotEvent = true;
+    }
+
+    wxWindow* const m_win;
+    wxCommandEvent* m_event;
+    bool m_gotEvent;
+};
+
+#endif // wxUSE_UIACTIONSIMULATOR
+
 void MenuTestCase::Events()
 {
 #ifdef __WXGTK__
@@ -502,55 +551,6 @@ void MenuTestCase::Events()
 #endif // __WXGTK__
 
 #if wxUSE_UIACTIONSIMULATOR
-    class MenuEventHandler : public wxEvtHandler
-    {
-    public:
-        MenuEventHandler(wxWindow* win)
-            : m_win(win)
-        {
-            m_win->Connect(wxEVT_MENU,
-                           wxCommandEventHandler(MenuEventHandler::OnMenu),
-                           NULL,
-                           this);
-
-            m_gotEvent = false;
-            m_event = NULL;
-        }
-
-        virtual ~MenuEventHandler()
-        {
-            m_win->Disconnect(wxEVT_MENU,
-                              wxCommandEventHandler(MenuEventHandler::OnMenu),
-                              NULL,
-                              this);
-
-            delete m_event;
-        }
-
-        const wxCommandEvent& GetEvent()
-        {
-            CPPUNIT_ASSERT( m_gotEvent );
-
-            m_gotEvent = false;
-
-            return *m_event;
-        }
-
-    private:
-        void OnMenu(wxCommandEvent& event)
-        {
-            CPPUNIT_ASSERT( !m_gotEvent );
-
-            delete m_event;
-            m_event = static_cast<wxCommandEvent*>(event.Clone());
-            m_gotEvent = true;
-        }
-
-        wxWindow* const m_win;
-        wxCommandEvent* m_event;
-        bool m_gotEvent;
-    };
-
     MenuEventHandler handler(m_frame);
 
     // Invoke the accelerator.
diff --git a/utils/screenshotgen/src/guiframe.cpp b/utils/screenshotgen/src/guiframe.cpp
index 5e928c2ea5..050902b0c9 100644
--- a/utils/screenshotgen/src/guiframe.cpp
+++ b/utils/screenshotgen/src/guiframe.cpp
@@ -56,7 +56,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
     statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
 
     // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GUIFrame::OnClose ) );
+    Bind(wxEVT_CLOSE_WINDOW, &GUIFrame::OnClose, this);
 }
 
 void GUIFrame::AddMenuBar()
@@ -102,11 +102,11 @@ void GUIFrame::AddMenuBar()
     this->SetMenuBar( mbar );
 
     // Connect Events
-    this->Connect( m_menuSeeScr->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnSeeScreenshots ) );
-    this->Connect( m_menuFileQuit->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnQuit ) );
-    this->Connect( m_menuCapFullScreen->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnCaptureFullScreen ) );
-    this->Connect( m_menuCapAll->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnCaptureAllControls ) );
-    this->Connect( m_menuHelpAbout->GetId(), wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnAbout ) );
+    Bind(wxEVT_MENU, &GUIFrame::OnSeeScreenshots, this, m_menuSeeScr->GetId());
+    Bind(wxEVT_MENU, &GUIFrame::OnQuit, this, m_menuFileQuit->GetId());
+    Bind(wxEVT_MENU, &GUIFrame::OnCaptureFullScreen, this, m_menuCapFullScreen->GetId());
+    Bind(wxEVT_MENU, &GUIFrame::OnCaptureAllControls, this, m_menuCapAll->GetId());
+    Bind(wxEVT_MENU, &GUIFrame::OnAbout, this, m_menuHelpAbout->GetId());
 }
 
 void GUIFrame::AddPanel_1()
@@ -493,10 +493,10 @@ void GUIFrame::AddPanel_5()
 GUIFrame::~GUIFrame()
 {
     // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GUIFrame::OnClose ) );
-    this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnSeeScreenshots ) );
-    this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnQuit ) );
-    this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnCaptureFullScreen ) );
-    this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnCaptureAllControls ) );
-    this->Disconnect( wxID_ANY, wxEVT_MENU, wxCommandEventHandler( GUIFrame::OnAbout ) );
+    Unbind(wxEVT_CLOSE_WINDOW, &GUIFrame::OnClose, this);
+    Unbind(wxEVT_MENU, &GUIFrame::OnSeeScreenshots, this);
+    Unbind(wxEVT_MENU, &GUIFrame::OnQuit, this);
+    Unbind(wxEVT_MENU, &GUIFrame::OnCaptureFullScreen, this);
+    Unbind(wxEVT_MENU, &GUIFrame::OnCaptureAllControls, this);
+    Unbind(wxEVT_MENU, &GUIFrame::OnAbout, this);
 }

From 900752b1523bb4bcb5cff48f7d2e6c69d4cb7ac8 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 31 May 2018 10:08:20 -0700
Subject: [PATCH 593/916] Implement wxSYS_VSCROLL_X/wxSYS_HSCROLL_Y metric for
 wxGTK

---
 src/gtk/settings.cpp | 70 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 5 deletions(-)

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index d65178723b..25f69d3733 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -21,6 +21,7 @@
 #include "wx/fontenum.h"
 
 #include "wx/gtk/private/wrapgtk.h"
+#include "wx/gtk/private/gtk3-compat.h"
 #include "wx/gtk/private/win_gtk.h"
 
 bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);
@@ -30,8 +31,7 @@ bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int*
 // ----------------------------------------------------------------------------
 
 static wxFont gs_fontSystem;
-
-#ifndef __WXGTK3__
+static int gs_scrollWidth;
 static GtkWidget* gs_tlw_parent;
 
 static GtkContainer* ContainerWidget()
@@ -47,10 +47,28 @@ static GtkContainer* ContainerWidget()
     return s_widget;
 }
 
+static GtkWidget* ScrollBarWidget()
+{
+    static GtkWidget* s_widget;
+    if (s_widget == NULL)
+    {
+        s_widget = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL);
+        g_object_add_weak_pointer(G_OBJECT(s_widget), (void**)&s_widget);
+        gtk_container_add(ContainerWidget(), s_widget);
+#ifndef __WXGTK3__
+        gtk_widget_ensure_style(s_widget);
+#endif
+    }
+    return s_widget;
+}
+
+#ifndef __WXGTK3__
+
 extern "C" {
 static void style_set(GtkWidget*, GtkStyle*, void*)
 {
     gs_fontSystem = wxNullFont;
+    gs_scrollWidth = 0;
 }
 }
 
@@ -152,6 +170,7 @@ extern "C" {
 static void notify_gtk_theme_name(GObject*, GParamSpec*, void*)
 {
     gs_fontSystem.UnRef();
+    gs_scrollWidth = 0;
     for (int i = wxSYS_COLOUR_MAX; i--;)
         gs_systemColorCache[i].UnRef();
 }
@@ -851,6 +870,46 @@ static GdkRectangle GetMonitorGeom(GdkWindow* window)
 }
 #endif
 
+static int GetScrollbarWidth()
+{
+    int width;
+#ifdef __WXGTK3__
+    if (wx_is_at_least_gtk3(20))
+    {
+        GtkBorder border;
+        GtkWidgetPath* path = gtk_widget_path_new();
+        GtkStyleContext* sc;
+        sc = StyleContext(path, GTK_TYPE_SCROLLBAR, "scrollbar", "right");
+
+        gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border);
+
+        sc = StyleContext(sc, path, G_TYPE_NONE, "contents");
+        sc = StyleContext(sc, path, G_TYPE_NONE, "trough");
+        sc = StyleContext(sc, path, G_TYPE_NONE, "slider");
+
+        gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, "min-width", &width, NULL);
+        width += border.left + border.right;
+
+        gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border);
+        width += border.left + border.right;
+        gtk_style_context_get_padding(sc, GTK_STATE_FLAG_NORMAL, &border);
+        width += border.left + border.right;
+        gtk_style_context_get_margin(sc, GTK_STATE_FLAG_NORMAL, &border);
+        width += border.left + border.right;
+
+        StyleContextFree(sc);
+    }
+    else
+#endif
+    {
+        int slider_width, trough_border;
+        gtk_widget_style_get(ScrollBarWidget(),
+            "slider-width", &slider_width, "trough-border", &trough_border, NULL);
+        width = slider_width + (2 * trough_border);
+    }
+    return width;
+}
+
 int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 {
     GdkWindow *window = NULL;
@@ -1007,7 +1066,9 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, wxWindow* win )
 
         case wxSYS_HSCROLL_Y:
         case wxSYS_VSCROLL_X:
-            return 15;
+            if (gs_scrollWidth == 0)
+                gs_scrollWidth = GetScrollbarWidth();
+            return gs_scrollWidth;
 
         case wxSYS_CAPTION_Y:
             if (!window)
@@ -1079,11 +1140,10 @@ void wxSystemSettingsModule::OnExit()
         g_signal_handlers_disconnect_by_func(settings,
             (void*)notify_gtk_font_name, NULL);
     }
-#else
+#endif
     if (gs_tlw_parent)
     {
         gtk_widget_destroy(gs_tlw_parent);
         gs_tlw_parent = NULL;
     }
-#endif
 }

From 724409a10cc261a2a25e44f72ee8f13c60b131de Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 31 May 2018 19:33:24 +0200
Subject: [PATCH 594/916] Simplify wxSortedArray_SortFunction used in STL build

There is no need to pass the function type as the template parameter as
it's determined by the type of the objects being compared anyhow.
---
 include/wx/dynarray.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index a15936c394..1b5f86e1f9 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -95,11 +95,11 @@ private:
     CMPFUNC m_f;
 };
 
-template<class T, typename F>
+template<class T>
 class wxSortedArray_SortFunction
 {
 public:
-    typedef F CMPFUNC;
+    typedef int (wxCMPFUNC_CONV *CMPFUNC)(T, T);
 
     wxSortedArray_SortFunction(CMPFUNC f) : m_f(f) { }
     bool operator()(const T& i1, const T& i2)
@@ -109,9 +109,7 @@ private:
 };
 
 #define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \
-   typedef int (wxCMPFUNC_CONV *CMPFUN##name)(T pItem1, T pItem2);  \
-   typedef wxSortedArray_SortFunction<T, CMPFUN##name> name##_Predicate; \
-   _WX_DECLARE_BASEARRAY_2(T, name, name##_Predicate, classexp)
+   _WX_DECLARE_BASEARRAY_2(T, name, wxSortedArray_SortFunction<T>, classexp)
 
 #define  _WX_DECLARE_BASEARRAY_2(T, name, predicate, classexp)      \
 class name : public std::vector<T>                                  \

From 74904281e48dcfe5020725198591656dc60d790f Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 31 May 2018 11:11:21 -0700
Subject: [PATCH 595/916] Free widget path, should have been part of 900752b152

---
 src/gtk/settings.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 25f69d3733..3178897be1 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -897,6 +897,7 @@ static int GetScrollbarWidth()
         gtk_style_context_get_margin(sc, GTK_STATE_FLAG_NORMAL, &border);
         width += border.left + border.right;
 
+        gtk_widget_path_unref(path);
         StyleContextFree(sc);
     }
     else

From f9721266ae19055d2ab0d76b8c45c7477c110c33 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 31 May 2018 22:25:57 +0200
Subject: [PATCH 596/916] Replace 90% of _WX_DECLARE_BASEARRAY_2 with a
 template class

Use template class instead of a macro to make it easier to read and
modify this code.

No real changes.
---
 include/wx/dynarray.h | 232 ++++++++++++++++++++++++++----------------
 1 file changed, 142 insertions(+), 90 deletions(-)

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 1b5f86e1f9..d3e1a2bb04 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -111,96 +111,148 @@ private:
 #define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \
    _WX_DECLARE_BASEARRAY_2(T, name, wxSortedArray_SortFunction<T>, classexp)
 
-#define  _WX_DECLARE_BASEARRAY_2(T, name, predicate, classexp)      \
-class name : public std::vector<T>                                  \
-{                                                                   \
-  typedef predicate Predicate;                                      \
-  typedef predicate::CMPFUNC SCMPFUNC;                              \
-public:                                                             \
-  typedef wxArray_SortFunction<T>::CMPFUNC CMPFUNC;                 \
-                                                                    \
-public:                                                             \
-  typedef T base_type;                                              \
-                                                                    \
-  name() : std::vector<T>() { }                                     \
-  name(size_type n) : std::vector<T>(n) { }                         \
-  name(size_type n, const_reference v) : std::vector<T>(n, v) { }   \
-  template <class InputIterator>                                    \
-  name(InputIterator first, InputIterator last) : std::vector<T>(first, last) { } \
-                                                                    \
-  void Empty() { clear(); }                                         \
-  void Clear() { clear(); }                                         \
-  void Alloc(size_t uiSize) { reserve(uiSize); }                    \
-  void Shrink() { name tmp(*this); swap(tmp); }                     \
-                                                                    \
-  size_t GetCount() const { return size(); }                        \
-  void SetCount(size_t n, T v = T()) { resize(n, v); }              \
-  bool IsEmpty() const { return empty(); }                          \
-  size_t Count() const { return size(); }                           \
-                                                                    \
-  T& Item(size_t uiIndex) const                                     \
-    { wxASSERT( uiIndex < size() ); return (T&)operator[](uiIndex); }   \
-  T& Last() const { return Item(size() - 1); }                      \
-                                                                    \
-  int Index(T item, bool bFromEnd = false) const                    \
-  {                                                                 \
-      if ( bFromEnd )                                               \
-      {                                                             \
-          const const_reverse_iterator b = rbegin(),                \
-                                       e = rend();                  \
-          for ( const_reverse_iterator i = b; i != e; ++i )         \
-              if ( *i == item )                                     \
-                  return (int)(e - i - 1);                          \
-      }                                                             \
-      else                                                          \
-      {                                                             \
-          const const_iterator b = begin(),                         \
-                               e = end();                           \
-          for ( const_iterator i = b; i != e; ++i )                 \
-              if ( *i == item )                                     \
-                  return (int)(i - b);                              \
-      }                                                             \
-                                                                    \
-      return wxNOT_FOUND;                                           \
-  }                                                                 \
-  int Index(T lItem, CMPFUNC fnCompare) const                       \
-  {                                                                 \
-      Predicate p((SCMPFUNC)fnCompare);                             \
-      const_iterator i = std::lower_bound(begin(), end(), lItem, p);\
-      return i != end() && !p(lItem, *i) ? (int)(i - begin())       \
-                                         : wxNOT_FOUND;             \
-  }                                                                 \
-  size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const           \
-  {                                                                 \
-      Predicate p((SCMPFUNC)fnCompare);                             \
-      const_iterator i = std::lower_bound(begin(), end(), lItem, p);\
-      return i - begin();                                           \
-  }                                                                 \
-  void Add(T lItem, size_t nInsert = 1)                             \
-    { insert(end(), nInsert, lItem); }                              \
-  size_t Add(T lItem, CMPFUNC fnCompare)                            \
-  {                                                                 \
-      size_t n = IndexForInsert(lItem, fnCompare);                  \
-      Insert(lItem, n);                                             \
-      return n;                                                     \
-  }                                                                 \
-  void Insert(T lItem, size_t uiIndex, size_t nInsert = 1)          \
-    { insert(begin() + uiIndex, nInsert, lItem); }                  \
-  void Remove(T lItem)                                              \
-  {                                                                 \
-    int n = Index(lItem);                                           \
-    wxCHECK_RET( n != wxNOT_FOUND, _WX_ERROR_REMOVE );              \
-    RemoveAt((size_t)n);                                            \
-  }                                                                 \
-  void RemoveAt(size_t uiIndex, size_t nRemove = 1)                 \
-    { erase(begin() + uiIndex, begin() + uiIndex + nRemove); }      \
-                                                                    \
-  void Sort(CMPFUNC fCmp)                                           \
-  {                                                                 \
-    wxArray_SortFunction<T> p(fCmp);                                \
-    std::sort(begin(), end(), p);                                   \
-  }                                                                 \
-}
+// Note that "name" must be a class and not just a typedef because it can be
+// (and is) forward declared in the existing code.
+#define  _WX_DECLARE_BASEARRAY_2(T, name, predicate, classexp)                \
+    class name : public wxBaseArray<T, predicate>                             \
+    {                                                                         \
+        typedef wxBaseArray<T, predicate> base;                               \
+                                                                              \
+    public:                                                                   \
+        name() : base() { }                                                   \
+        explicit name(size_t n) : base(n) { }                                 \
+        name(size_t n,                                                        \
+             typename std::vector<T>::const_reference v) : base(n, v) { }     \
+        template <class InputIterator>                                        \
+        name(InputIterator first, InputIterator last) : base(first, last) { } \
+    }
+
+template <typename T, typename predicate>
+class wxBaseArray : public std::vector<T>
+{
+    typedef predicate Predicate;
+    typedef typename predicate::CMPFUNC SCMPFUNC;
+
+public:
+    typedef typename wxArray_SortFunction<T>::CMPFUNC CMPFUNC;
+
+    typedef std::vector<T> base_vec;
+
+    typedef typename base_vec::value_type value_type;
+    typedef typename base_vec::reference reference;
+    typedef typename base_vec::const_reference const_reference;
+    typedef typename base_vec::iterator iterator;
+    typedef typename base_vec::const_iterator const_iterator;
+    typedef typename base_vec::const_reverse_iterator const_reverse_iterator;
+    typedef typename base_vec::difference_type difference_type;
+    typedef typename base_vec::size_type size_type;
+
+public:
+    typedef T base_type;
+
+    wxBaseArray() : std::vector<T>() { }
+    explicit wxBaseArray(size_t n) : std::vector<T>(n) { }
+    wxBaseArray(size_t n, const_reference v) : std::vector<T>(n, v) { }
+
+    template <class InputIterator>
+    wxBaseArray(InputIterator first, InputIterator last)
+        : std::vector<T>(first, last)
+    { }
+
+    void Empty() { this->clear(); }
+    void Clear() { this->clear(); }
+    void Alloc(size_t uiSize) { this->reserve(uiSize); }
+    void Shrink()
+    {
+        std::vector<T> tmp(*this);
+        this->swap(tmp);
+    }
+
+    size_t GetCount() const { return this->size(); }
+    void SetCount(size_t n, T v = T()) { this->resize(n, v); }
+    bool IsEmpty() const { return this->empty(); }
+    size_t Count() const { return this->size(); }
+
+    T& Item(size_t uiIndex) const
+    {
+        wxASSERT( uiIndex < this->size() );
+        return const_cast<T&>((*this)[uiIndex]);
+    }
+
+    T& Last() const { return Item(this->size() - 1); }
+
+    int Index(T item, bool bFromEnd = false) const
+    {
+        if ( bFromEnd )
+        {
+            const const_reverse_iterator b = this->rbegin(),
+                  e = this->rend();
+            for ( const_reverse_iterator i = b; i != e; ++i )
+                if ( *i == item )
+                    return (int)(e - i - 1);
+        }
+        else
+        {
+            const const_iterator b = this->begin(),
+                  e = this->end();
+            for ( const_iterator i = b; i != e; ++i )
+                if ( *i == item )
+                    return (int)(i - b);
+        }
+
+        return wxNOT_FOUND;
+    }
+
+    int Index(T lItem, CMPFUNC fnCompare) const
+    {
+        Predicate p((SCMPFUNC)fnCompare);
+        const_iterator i = std::lower_bound(this->begin(), this->end(), lItem, p);
+        return i != this->end() && !p(lItem, *i) ? (int)(i - this->begin())
+                                                 : wxNOT_FOUND;
+    }
+
+    size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const
+    {
+        Predicate p((SCMPFUNC)fnCompare);
+        const_iterator i = std::lower_bound(this->begin(), this->end(), lItem, p);
+        return i - this->begin();
+    }
+
+    void Add(T lItem, size_t nInsert = 1)
+    {
+        this->insert(this->end(), nInsert, lItem);
+    }
+
+    size_t Add(T lItem, CMPFUNC fnCompare)
+    {
+        size_t n = IndexForInsert(lItem, fnCompare);
+        Insert(lItem, n);
+        return n;
+    }
+
+    void Insert(T lItem, size_t uiIndex, size_t nInsert = 1)
+    {
+        this->insert(this->begin() + uiIndex, nInsert, lItem);
+    }
+
+    void Remove(T lItem)
+    {
+        int n = Index(lItem);
+        wxCHECK_RET( n != wxNOT_FOUND, _WX_ERROR_REMOVE );
+        RemoveAt((size_t)n);
+    }
+
+    void RemoveAt(size_t uiIndex, size_t nRemove = 1)
+    {
+        this->erase(this->begin() + uiIndex, this->begin() + uiIndex + nRemove);
+    }
+
+    void Sort(CMPFUNC fCmp)
+    {
+        wxArray_SortFunction<T> p(fCmp);
+        std::sort(this->begin(), this->end(), p);
+    }
+};
 
 #else // if !wxUSE_STD_CONTAINERS
 

From cce9fc7f1538076055fa0452686c9af7fa7165ba Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Thu, 31 May 2018 13:42:00 -0400
Subject: [PATCH 597/916] Update wxGTK defines to match code

---
 docs/doxygen/mainpages/const_cpp.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h
index 6114326616..d02a4732e2 100644
--- a/docs/doxygen/mainpages/const_cpp.h
+++ b/docs/doxygen/mainpages/const_cpp.h
@@ -26,10 +26,11 @@ using @ifdef_ and not @if_.
 @itemdef{__WXBASE__, Only wxBase, no GUI features (same as @c wxUSE_GUI == 0)}
 @itemdef{__WXDFB__, wxUniversal using DirectFB}
 @itemdef{__WXGTK__, GTK+}
-@itemdef{__WXGTK12__, GTK+ 1.2 or higher}
+@itemdef{__WXGTK127__, GTK+ 1.2.7 or higher}
 @itemdef{__WXGTK20__, GTK+ 2.0 or higher}
-@itemdef{__WXGTK24__, GTK+ 2.4 or higher}
 @itemdef{__WXGTK210__, GTK+ 2.10 or higher}
+@itemdef{__WXGTK218__, GTK+ 2.18 or higher}
+@itemdef{__WXGTK220__, GTK+ 2.20 or higher}
 @itemdef{__WXMAC__, old define, same as <tt>__WXOSX__</tt>}
 @itemdef{__WXMOTIF__, Motif}
 @itemdef{__WXMOTIF20__, Motif 2.0 or higher}

From e3a9643d2a84833ffeb178e399417ffdee3ce388 Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Thu, 31 May 2018 13:48:37 -0400
Subject: [PATCH 598/916] Replace use of __WXGTK24__ with __WXGTK__

---
 samples/widgets/clrpicker.cpp  | 2 +-
 samples/widgets/dirpicker.cpp  | 2 +-
 samples/widgets/filepicker.cpp | 2 +-
 samples/widgets/fontpicker.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp
index eff222e606..adcb4b268f 100644
--- a/samples/widgets/clrpicker.cpp
+++ b/samples/widgets/clrpicker.cpp
@@ -119,7 +119,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK24__)
+#if defined(__WXGTK__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS
diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp
index ab4a9b5cd1..238b97caa1 100644
--- a/samples/widgets/dirpicker.cpp
+++ b/samples/widgets/dirpicker.cpp
@@ -127,7 +127,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK24__)
+#if defined(__WXGTK__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS
diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp
index bfb0b4fca9..db99b77e5b 100644
--- a/samples/widgets/filepicker.cpp
+++ b/samples/widgets/filepicker.cpp
@@ -144,7 +144,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK24__)
+#if defined(__WXGTK__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS
diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp
index 6afb19ba04..106fa02038 100644
--- a/samples/widgets/fontpicker.cpp
+++ b/samples/widgets/fontpicker.cpp
@@ -119,7 +119,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK24__)
+#if defined(__WXGTK__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS

From 9042a3fb16cb0a000a1fd84ef123f8bbb8e284e2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 31 May 2018 22:29:20 +0200
Subject: [PATCH 599/916] Use shrink_to_fit() to implement Shrink() in C++11
 build

If std::vector<> has shrink_to_fit() method, just use it instead of
using the swap-with-a-temporary hack.
---
 include/wx/dynarray.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index d3e1a2bb04..e6d9b8113b 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -164,8 +164,12 @@ public:
     void Alloc(size_t uiSize) { this->reserve(uiSize); }
     void Shrink()
     {
+#if !wxUSE_STD_CONTAINERS || __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10)
+        this->shrink_to_fit();
+#else
         std::vector<T> tmp(*this);
         this->swap(tmp);
+#endif
     }
 
     size_t GetCount() const { return this->size(); }

From dcac98d7e8ad73edb485b9ca75fa2d574c003501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Mon, 28 May 2018 15:41:32 +0200
Subject: [PATCH 600/916] Fix cursor flicker after popup menu in rich
 wxTextCtrl

After bd650ec and cad2b9c, showing a popup menu in wxTextCtrl with
wxTE_RICH2 and then dismissing it without choosing a command would
result in the cursor flickering between arrow and beam cursors until
another context menu was shown.

See https://github.com/vslavik/poedit/issues/483

Fixed by checking if the popup menu is still valid (and so shown) in
the cursor handling code.
---
 src/msw/textctrl.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 686435b620..19bf91424b 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2262,9 +2262,14 @@ wxTextCtrl::MSWHandleMessage(WXLRESULT *rc,
             // for plain EDIT controls though), so explicitly work around this
             if ( IsRich() )
             {
+                // wxCurrentPopupMenu stores the popup menu that will receive
+                // WM_COMMAND, but it may be non-NULL even when the underlying
+                // native menu is no longer shown. Use ::IsMenu() to check whether
+                // the menu still exists.
                 extern wxMenu *wxCurrentPopupMenu;
                 if ( wxCurrentPopupMenu &&
-                        wxCurrentPopupMenu->GetInvokingWindow() == this )
+                        wxCurrentPopupMenu->GetInvokingWindow() == this &&
+                        ::IsMenu(GetHmenuOf(wxCurrentPopupMenu)) )
                     ::SetCursor(GetHcursorOf(*wxSTANDARD_CURSOR));
             }
 #endif // wxUSE_MENUS

From 60b7bc037fcb6222c0a134f440045536374692a5 Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Fri, 1 Jun 2018 08:49:48 -0400
Subject: [PATCH 601/916] Replace use of __WXGTK24__ with __WXGTK20__

Corrected the change to WXGTK by using WXGTK20 instead
---
 samples/widgets/clrpicker.cpp  | 2 +-
 samples/widgets/dirpicker.cpp  | 2 +-
 samples/widgets/filepicker.cpp | 2 +-
 samples/widgets/fontpicker.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/widgets/clrpicker.cpp b/samples/widgets/clrpicker.cpp
index adcb4b268f..1c428a0db4 100644
--- a/samples/widgets/clrpicker.cpp
+++ b/samples/widgets/clrpicker.cpp
@@ -119,7 +119,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK__)
+#if defined(__WXGTK20__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS
diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp
index 238b97caa1..003f3b51ad 100644
--- a/samples/widgets/dirpicker.cpp
+++ b/samples/widgets/dirpicker.cpp
@@ -127,7 +127,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK__)
+#if defined(__WXGTK20__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS
diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp
index db99b77e5b..14236781ad 100644
--- a/samples/widgets/filepicker.cpp
+++ b/samples/widgets/filepicker.cpp
@@ -144,7 +144,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK__)
+#if defined(__WXGTK20__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS
diff --git a/samples/widgets/fontpicker.cpp b/samples/widgets/fontpicker.cpp
index 106fa02038..d753592796 100644
--- a/samples/widgets/fontpicker.cpp
+++ b/samples/widgets/fontpicker.cpp
@@ -119,7 +119,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK__)
+#if defined(__WXGTK20__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS

From f295dfdd0c618b919357f0b6a3c9454836f4cc1d Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Fri, 1 Jun 2018 09:03:39 -0400
Subject: [PATCH 602/916] Add (2.6) to "GTK+ 2.0 or higher"

---
 docs/doxygen/mainpages/const_cpp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h
index d02a4732e2..98f0105a79 100644
--- a/docs/doxygen/mainpages/const_cpp.h
+++ b/docs/doxygen/mainpages/const_cpp.h
@@ -27,7 +27,7 @@ using @ifdef_ and not @if_.
 @itemdef{__WXDFB__, wxUniversal using DirectFB}
 @itemdef{__WXGTK__, GTK+}
 @itemdef{__WXGTK127__, GTK+ 1.2.7 or higher}
-@itemdef{__WXGTK20__, GTK+ 2.0 or higher}
+@itemdef{__WXGTK20__, GTK+ 2.0 (2.6) or higher}
 @itemdef{__WXGTK210__, GTK+ 2.10 or higher}
 @itemdef{__WXGTK218__, GTK+ 2.18 or higher}
 @itemdef{__WXGTK220__, GTK+ 2.20 or higher}

From b0d6b11ebebef7c01a4ec5cec2a12907dc29fd70 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 1 Jun 2018 01:38:49 +0200
Subject: [PATCH 603/916] Always use wxVector<> for dynamic arrays
 implementation

Dramatically simplify dynamic array macros by keeping only the
implementation previously used in wxUSE_STD_CONTAINERS case and dropping
the other one, as we can use the std::vector-based implementation on top
of our own wxVector<>, which is available whether wxUSE_STD_CONTAINERS
is 0 or 1.

This allows to get rid of tons of ugly macro-based code without breaking
compatibility.
---
 include/wx/arrstr.h     |  11 +-
 include/wx/dynarray.h   | 450 +++++-----------------------------------
 src/common/dynarray.cpp | 365 +-------------------------------
 3 files changed, 61 insertions(+), 765 deletions(-)

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 42fa401ca9..89dbf5316d 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -13,6 +13,7 @@
 
 #include "wx/defs.h"
 #include "wx/string.h"
+#include "wx/dynarray.h"
 
 #if wxUSE_STD_CONTAINERS_COMPATIBLY
     #include <vector>
@@ -49,15 +50,9 @@ wxDictionaryStringSortDescending(const wxString& s1, const wxString& s2)
 
 #if wxUSE_STD_CONTAINERS
 
-#include "wx/dynarray.h"
-
 typedef int (wxCMPFUNC_CONV *CMPFUNCwxString)(wxString*, wxString*);
-typedef wxString _wxArraywxBaseArrayStringBase;
-_WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,
-                        wxArray_SortFunction<wxString>,
-                        class WXDLLIMPEXP_BASE);
 WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase,
-                                  wxBaseArrayStringBase, WXDLLIMPEXP_BASE);
+                                  wxARRAY_DUMMY_BASE, WXDLLIMPEXP_BASE);
 
 class WXDLLIMPEXP_BASE wxArrayString : public wxArrayStringBase
 {
@@ -86,7 +81,7 @@ public:
 };
 
 _WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase,
-                              wxBaseArrayStringBase, = wxStringSortAscending,
+                              wxArrayStringBase, = wxStringSortAscending,
                               class WXDLLIMPEXP_BASE, wxArrayString::CompareFunction);
 
 class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase
diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index e6d9b8113b..8edfefb937 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -13,46 +13,16 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_STD_CONTAINERS
-    #include "wx/beforestd.h"
-    #include <vector>
-    #include <algorithm>
-    #include "wx/afterstd.h"
-#endif
+#include "wx/vector.h"
 
 /*
-  This header defines the dynamic arrays and object arrays (i.e. arrays which
-  own their elements). Dynamic means that the arrays grow automatically as
-  needed.
+  This header defines legacy dynamic arrays and object arrays (i.e. arrays
+  which own their elements) classes.
 
-  These macros are ugly (especially if you look in the sources ;-), but they
-  allow us to define "template" classes without actually using templates and so
-  this works with all compilers (and may be also much faster to compile even
-  with a compiler which does support templates). The arrays defined with these
-  macros are type-safe.
-
-  Range checking is performed in debug build for both arrays and objarrays but
-  not in release build - so using an invalid index will just lead to a crash
-  then.
-
-  Note about memory usage: arrays never shrink automatically (although you may
-  use Shrink() function explicitly), they only grow, so loading 10 millions in
-  an array only to delete them 2 lines below might be a bad idea if the array
-  object is not going to be destroyed soon. However, as it does free memory
-  when destroyed, it is ok if the array is a local variable.
+  Do *NOT* use them in the new code, these classes exist for compatibility
+  only. Simply use standard container, e.g. std::vector<>, in your own code.
  */
 
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-/*
-   The initial size by which an array grows when an element is added default
-   value avoids allocate one or two bytes when the array is created which is
-   rather inefficient
-*/
-#define WX_ARRAY_DEFAULT_INITIAL_SIZE    (16)
-
 #define _WX_ERROR_REMOVE "removing inexistent element in wxArray::Remove"
 
 // ----------------------------------------------------------------------------
@@ -71,17 +41,9 @@ typedef int (wxCMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2);
 }
 
 // ----------------------------------------------------------------------------
-// Base class managing data having size of type 'long' (not used directly)
-//
-// NB: for efficiency this often used class has no virtual functions (hence no
-//     virtual table), even dtor is *not* virtual. If used as expected it
-//     won't create any problems because ARRAYs from DEFINE_ARRAY have no dtor
-//     at all, so it's not too important if it's not called (this happens when
-//     you cast "SomeArray *" as "BaseArray *" and then delete it)
+// Array class providing legacy dynamic arrays API on top of wxVector<>
 // ----------------------------------------------------------------------------
 
-#if wxUSE_STD_CONTAINERS
-
 template<class T>
 class wxArray_SortFunction
 {
@@ -108,35 +70,16 @@ private:
     CMPFUNC m_f;
 };
 
-#define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \
-   _WX_DECLARE_BASEARRAY_2(T, name, wxSortedArray_SortFunction<T>, classexp)
-
-// Note that "name" must be a class and not just a typedef because it can be
-// (and is) forward declared in the existing code.
-#define  _WX_DECLARE_BASEARRAY_2(T, name, predicate, classexp)                \
-    class name : public wxBaseArray<T, predicate>                             \
-    {                                                                         \
-        typedef wxBaseArray<T, predicate> base;                               \
-                                                                              \
-    public:                                                                   \
-        name() : base() { }                                                   \
-        explicit name(size_t n) : base(n) { }                                 \
-        name(size_t n,                                                        \
-             typename std::vector<T>::const_reference v) : base(n, v) { }     \
-        template <class InputIterator>                                        \
-        name(InputIterator first, InputIterator last) : base(first, last) { } \
-    }
-
-template <typename T, typename predicate>
-class wxBaseArray : public std::vector<T>
+template <typename T>
+class wxBaseArray : public wxVector<T>
 {
-    typedef predicate Predicate;
-    typedef typename predicate::CMPFUNC SCMPFUNC;
+    typedef wxSortedArray_SortFunction<T> Predicate;
+    typedef int (wxCMPFUNC_CONV *SCMPFUNC)(T, T);
 
 public:
     typedef typename wxArray_SortFunction<T>::CMPFUNC CMPFUNC;
 
-    typedef std::vector<T> base_vec;
+    typedef wxVector<T> base_vec;
 
     typedef typename base_vec::value_type value_type;
     typedef typename base_vec::reference reference;
@@ -150,24 +93,25 @@ public:
 public:
     typedef T base_type;
 
-    wxBaseArray() : std::vector<T>() { }
-    explicit wxBaseArray(size_t n) : std::vector<T>(n) { }
-    wxBaseArray(size_t n, const_reference v) : std::vector<T>(n, v) { }
+    wxBaseArray() : base_vec() { }
+    explicit wxBaseArray(size_t n) : base_vec(n) { }
+    wxBaseArray(size_t n, const_reference v) : base_vec(n, v) { }
 
     template <class InputIterator>
     wxBaseArray(InputIterator first, InputIterator last)
-        : std::vector<T>(first, last)
+        : base_vec(first, last)
     { }
 
     void Empty() { this->clear(); }
     void Clear() { this->clear(); }
     void Alloc(size_t uiSize) { this->reserve(uiSize); }
+
     void Shrink()
     {
 #if !wxUSE_STD_CONTAINERS || __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10)
         this->shrink_to_fit();
 #else
-        std::vector<T> tmp(*this);
+        base_vec tmp(*this);
         this->swap(tmp);
 #endif
     }
@@ -258,315 +202,10 @@ public:
     }
 };
 
-#else // if !wxUSE_STD_CONTAINERS
-
-#define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \
-classexp name                                                       \
-{                                                                   \
-  typedef CMPFUNC SCMPFUNC; /* for compatibility wuth wxUSE_STD_CONTAINERS */  \
-public:                                                             \
-  name();                                                           \
-  name(const name& array);                                          \
-  name& operator=(const name& src);                                 \
-  ~name();                                                          \
-                                                                    \
-  void Empty() { m_nCount = 0; }                                    \
-  void Clear();                                                     \
-  void Alloc(size_t n) { if ( n > m_nSize ) Realloc(n); }           \
-  void Shrink();                                                    \
-                                                                    \
-  size_t GetCount() const { return m_nCount; }                      \
-  void SetCount(size_t n, T defval = T());                          \
-  bool IsEmpty() const { return m_nCount == 0; }                    \
-  size_t Count() const { return m_nCount; }                         \
-                                                                    \
-  typedef T base_type;                                              \
-                                                                    \
-protected:                                                          \
-  T& Item(size_t uiIndex) const                                     \
-    { wxASSERT( uiIndex < m_nCount ); return m_pItems[uiIndex]; }   \
-  T& operator[](size_t uiIndex) const { return Item(uiIndex); }     \
-                                                                    \
-  int Index(T lItem, bool bFromEnd = false) const;                  \
-  int Index(T lItem, CMPFUNC fnCompare) const;                      \
-  size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const;          \
-  void Add(T lItem, size_t nInsert = 1);                            \
-  size_t Add(T lItem, CMPFUNC fnCompare);                           \
-  void Insert(T lItem, size_t uiIndex, size_t nInsert = 1);         \
-  void Remove(T lItem);                                             \
-  void RemoveAt(size_t uiIndex, size_t nRemove = 1);                \
-                                                                    \
-  void Sort(CMPFUNC fnCompare);                                     \
-                                                                    \
-  /* *minimal* STL-ish interface, for derived classes */            \
-  typedef T value_type;                                             \
-  typedef value_type* iterator;                                     \
-  typedef const value_type* const_iterator;                         \
-  typedef value_type& reference;                                    \
-  typedef const value_type& const_reference;                        \
-  typedef ptrdiff_t difference_type;                                \
-  typedef size_t size_type;                                         \
-                                                                    \
-  void assign(const_iterator first, const_iterator last);           \
-  void assign(size_type n, const_reference v);                      \
-  size_type capacity() const { return m_nSize; }                    \
-  iterator erase(iterator first, iterator last)                     \
-  {                                                                 \
-    size_type idx = first - begin();                                \
-    RemoveAt(idx, last - first);                                    \
-    return begin() + idx;                                           \
-  }                                                                 \
-  iterator erase(iterator it) { return erase(it, it + 1); }         \
-  void insert(iterator it, size_type n, const value_type& v)        \
-    { Insert(v, it - begin(), n); }                                 \
-  iterator insert(iterator it, const value_type& v = value_type())  \
-  {                                                                 \
-    size_type idx = it - begin();                                   \
-    Insert(v, idx);                                                 \
-    return begin() + idx;                                           \
-  }                                                                 \
-  void insert(iterator it, const_iterator first, const_iterator last);\
-  void pop_back() { RemoveAt(size() - 1); }                         \
-  void push_back(const value_type& v) { Add(v); }                   \
-  void reserve(size_type n) { Alloc(n); }                           \
-  void resize(size_type count, value_type defval = value_type())    \
-  {                                                                 \
-    if ( count < m_nCount )                                         \
-      m_nCount = count;                                             \
-    else                                                            \
-      SetCount(count, defval);                                      \
-  }                                                                 \
-                                                                    \
-  iterator begin() { return m_pItems; }                             \
-  iterator end() { return m_pItems + m_nCount; }                    \
-  const_iterator begin() const { return m_pItems; }                 \
-  const_iterator end() const { return m_pItems + m_nCount; }        \
-                                                                    \
-  void swap(name& other)                                            \
-  {                                                                 \
-    wxSwap(m_nSize, other.m_nSize);                                 \
-    wxSwap(m_nCount, other.m_nCount);                               \
-    wxSwap(m_pItems, other.m_pItems);                               \
-  }                                                                 \
-                                                                    \
-  /* the following functions may be made directly public because */ \
-  /* they don't use the type of the elements at all */              \
-public:                                                             \
-  void clear() { Clear(); }                                         \
-  bool empty() const { return IsEmpty(); }                          \
-  size_type max_size() const { return INT_MAX; }                    \
-  size_type size() const { return GetCount(); }                     \
-                                                                    \
-private:                                                            \
-  void Grow(size_t nIncrement = 0);                                 \
-  bool Realloc(size_t nSize);                                       \
-                                                                    \
-  size_t  m_nSize,                                                  \
-          m_nCount;                                                 \
-                                                                    \
-  T      *m_pItems;                                                 \
-}
-
-#endif // !wxUSE_STD_CONTAINERS
-
 // ============================================================================
 // The private helper macros containing the core of the array classes
 // ============================================================================
 
-// Implementation notes:
-//
-// JACS: Salford C++ doesn't like 'var->operator=' syntax, as in:
-//          { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src);
-//       so using a temporary variable instead.
-//
-// The classes need a (even trivial) ~name() to link under Mac X
-
-// ----------------------------------------------------------------------------
-// _WX_DEFINE_TYPEARRAY: array for simple types
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STD_CONTAINERS
-
-// in STL case we don't need the entire base arrays hack as standard container
-// don't suffer from alignment/storage problems as our home-grown do
-#define  _WX_DEFINE_TYPEARRAY(T, name, base, classexp)                \
-    _WX_DECLARE_BASEARRAY(T, name, classexp)
-
-#define  _WX_DEFINE_TYPEARRAY_PTR(T, name, base, classexp)         \
-         _WX_DEFINE_TYPEARRAY(T, name, base, classexp)
-
-#else // if !wxUSE_STD_CONTAINERS
-
-// common declaration used by both _WX_DEFINE_TYPEARRAY and
-// _WX_DEFINE_TYPEARRAY_PTR
-#define  _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop)  \
-wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type),          \
-                       TypeTooBigToBeStoredIn##base,                  \
-                       name);                                         \
-typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);         \
-classexp name : public base                                           \
-{                                                                     \
-public:                                                               \
-  name() { }                                                          \
-  ~name() { }                                                         \
-                                                                      \
-  T& operator[](size_t uiIndex) const                                 \
-    { return (T&)(base::operator[](uiIndex)); }                       \
-  T& Item(size_t uiIndex) const                                       \
-    { return (T&)(base::operator[](uiIndex)); }                       \
-  T& Last() const                                                     \
-    { return (T&)(base::operator[](GetCount() - 1)); }                \
-                                                                      \
-  int Index(T lItem, bool bFromEnd = false) const                     \
-    { return base::Index((base_type)lItem, bFromEnd); }               \
-                                                                      \
-  void Add(T lItem, size_t nInsert = 1)                               \
-    { base::Add((base_type)lItem, nInsert); }                         \
-  void Insert(T lItem, size_t uiIndex, size_t nInsert = 1)            \
-    { base::Insert((base_type)lItem, uiIndex, nInsert) ; }            \
-                                                                      \
-  void RemoveAt(size_t uiIndex, size_t nRemove = 1)                   \
-    { base::RemoveAt(uiIndex, nRemove); }                             \
-  void Remove(T lItem)                                                \
-    { int iIndex = Index(lItem);                                      \
-      wxCHECK_RET( iIndex != wxNOT_FOUND, _WX_ERROR_REMOVE);          \
-      base::RemoveAt((size_t)iIndex); }                               \
-                                                                      \
-  void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC)fCmp); }           \
-                                                                      \
-  /* STL-like interface */                                            \
-private:                                                              \
-  typedef base::iterator biterator;                                   \
-  typedef base::const_iterator bconst_iterator;                       \
-  typedef base::value_type bvalue_type;                               \
-  typedef base::const_reference bconst_reference;                     \
-public:                                                               \
-  typedef T value_type;                                               \
-  typedef value_type* pointer;                                        \
-  typedef const value_type* const_pointer;                            \
-  typedef value_type* iterator;                                       \
-  typedef const value_type* const_iterator;                           \
-  typedef value_type& reference;                                      \
-  typedef const value_type& const_reference;                          \
-  typedef base::difference_type difference_type;                      \
-  typedef base::size_type size_type;                                  \
-                                                                      \
-  class reverse_iterator                                              \
-  {                                                                   \
-    typedef T value_type;                                             \
-    typedef value_type& reference;                                    \
-    typedef value_type* pointer;                                      \
-    typedef reverse_iterator itor;                                    \
-    friend inline itor operator+(int o, const itor& it)               \
-        { return it.m_ptr - o; }                                      \
-    friend inline itor operator+(const itor& it, int o)               \
-        { return it.m_ptr - o; }                                      \
-    friend inline itor operator-(const itor& it, int o)               \
-        { return it.m_ptr + o; }                                      \
-    friend inline difference_type operator-(const itor& i1,           \
-                                            const itor& i2)           \
-        { return i1.m_ptr - i2.m_ptr; }                               \
-                                                                      \
-  public:                                                             \
-    pointer m_ptr;                                                    \
-    reverse_iterator() : m_ptr(NULL) { }                              \
-    reverse_iterator(pointer ptr) : m_ptr(ptr) { }                    \
-    reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }            \
-    reference operator*() const { return *m_ptr; }                    \
-    ptrop                                                             \
-    itor& operator++() { --m_ptr; return *this; }                     \
-    const itor operator++(int)                                        \
-      { reverse_iterator tmp = *this; --m_ptr; return tmp; }          \
-    itor& operator--() { ++m_ptr; return *this; }                     \
-    const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }\
-    bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; }\
-    bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }\
-  };                                                                  \
-                                                                      \
-  class const_reverse_iterator                                        \
-  {                                                                   \
-    typedef T value_type;                                             \
-    typedef const value_type& reference;                              \
-    typedef const value_type* pointer;                                \
-    typedef const_reverse_iterator itor;                              \
-    friend inline itor operator+(int o, const itor& it)               \
-        { return it.m_ptr - o; }                                      \
-    friend inline itor operator+(const itor& it, int o)               \
-        { return it.m_ptr - o; }                                      \
-    friend inline itor operator-(const itor& it, int o)               \
-        { return it.m_ptr + o; }                                      \
-    friend inline difference_type operator-(const itor& i1,           \
-                                            const itor& i2)           \
-        { return i1.m_ptr - i2.m_ptr; }                               \
-                                                                      \
-  public:                                                             \
-    pointer m_ptr;                                                    \
-    const_reverse_iterator() : m_ptr(NULL) { }                        \
-    const_reverse_iterator(pointer ptr) : m_ptr(ptr) { }              \
-    const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }      \
-    const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }\
-    reference operator*() const { return *m_ptr; }                    \
-    ptrop                                                             \
-    itor& operator++() { --m_ptr; return *this; }                     \
-    const itor operator++(int)                                        \
-      { itor tmp = *this; --m_ptr; return tmp; }                      \
-    itor& operator--() { ++m_ptr; return *this; }                     \
-    const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }\
-    bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; }\
-    bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }\
-  };                                                                  \
-                                                                      \
-  name(size_type n) { assign(n, value_type()); }                      \
-  name(size_type n, const_reference v) { assign(n, v); }              \
-  name(const_iterator first, const_iterator last)                     \
-    { assign(first, last); }                                          \
-  void assign(const_iterator first, const_iterator last)              \
-    { base::assign((bconst_iterator)first, (bconst_iterator)last); }  \
-  void assign(size_type n, const_reference v)                         \
-    { base::assign(n, (bconst_reference)v); }                         \
-  reference back() { return *(end() - 1); }                           \
-  const_reference back() const { return *(end() - 1); }               \
-  iterator begin() { return (iterator)base::begin(); }                \
-  const_iterator begin() const { return (const_iterator)base::begin(); }\
-  size_type capacity() const { return base::capacity(); }             \
-  iterator end() { return (iterator)base::end(); }                    \
-  const_iterator end() const { return (const_iterator)base::end(); }  \
-  iterator erase(iterator first, iterator last)                       \
-    { return (iterator)base::erase((biterator)first, (biterator)last); }\
-  iterator erase(iterator it)                                         \
-    { return (iterator)base::erase((biterator)it); }                  \
-  reference front() { return *begin(); }                              \
-  const_reference front() const { return *begin(); }                  \
-  void insert(iterator it, size_type n, const_reference v)            \
-    { base::insert((biterator)it, n, (bconst_reference)v); }          \
-  iterator insert(iterator it, const_reference v = value_type())      \
-    { return (iterator)base::insert((biterator)it, (bconst_reference)v); }\
-  void insert(iterator it, const_iterator first, const_iterator last) \
-    { base::insert((biterator)it, (bconst_iterator)first,             \
-                   (bconst_iterator)last); }                          \
-  void pop_back() { base::pop_back(); }                               \
-  void push_back(const_reference v)                                   \
-    { base::push_back((bconst_reference)v); }                         \
-  reverse_iterator rbegin() { return reverse_iterator(end() - 1); }   \
-  const_reverse_iterator rbegin() const;                              \
-  reverse_iterator rend() { return reverse_iterator(begin() - 1); }   \
-  const_reverse_iterator rend() const;                                \
-  void reserve(size_type n) { base::reserve(n); }                     \
-  void resize(size_type n, value_type v = value_type())               \
-    { base::resize(n, v); }                                           \
-  void swap(name& other) { base::swap(other); }                       \
-}
-
-#define _WX_PTROP pointer operator->() const { return m_ptr; }
-#define _WX_PTROP_NONE
-
-#define _WX_DEFINE_TYPEARRAY(T, name, base, classexp)                 \
-    _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP)
-#define _WX_DEFINE_TYPEARRAY_PTR(T, name, base, classexp)          \
-    _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP_NONE)
-
-#endif // !wxUSE_STD_CONTAINERS
-
 // ----------------------------------------------------------------------------
 // _WX_DEFINE_SORTED_TYPEARRAY: sorted array for simple data types
 //    cannot handle types with size greater than pointer because of sorting
@@ -702,26 +341,27 @@ private:                                                                 \
 #define wxARRAY_DEFAULT_EXPORT
 
 // ----------------------------------------------------------------------------
-// WX_DECLARE_BASEARRAY(T, name) declare an array class named "name" containing
-// the elements of type T
+// WX_DECLARE_BASEARRAY(T, name): now is the same as WX_DEFINE_TYPEARRAY()
+// below, only preserved for compatibility.
 // ----------------------------------------------------------------------------
 
+#define wxARRAY_DUMMY_BASE
+
 #define WX_DECLARE_BASEARRAY(T, name)                             \
-    WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, wxARRAY_DEFAULT_EXPORT)
+    WX_DEFINE_TYPEARRAY(T, name)
 
 #define WX_DECLARE_EXPORTED_BASEARRAY(T, name)                    \
-    WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, WXDLLIMPEXP_CORE)
+    WX_DEFINE_EXPORTED_TYPEARRAY(T, name, WXDLLIMPEXP_CORE)
 
 #define WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, expmode)      \
-    typedef T _wxArray##name;                                     \
-    _WX_DECLARE_BASEARRAY(_wxArray##name, name, class expmode)
+    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxARRAY_DUMMY_BASE, class expmode)
 
 // ----------------------------------------------------------------------------
-// WX_DEFINE_TYPEARRAY(T, name, base) define an array class named "name" deriving
-// from class "base" containing the elements of type T
-//
-// Note that the class defined has only inline function and doesn't take any
-// space at all so there is no size penalty for defining multiple array classes
+// WX_DEFINE_TYPEARRAY(T, name, base) define an array class named "name"
+// containing the elements of type T. Note that the argument "base" is unused
+// and is preserved for compatibility only. Also, macros with and without
+// "_PTR" suffix are identical, and the latter ones are also kept only for
+// compatibility.
 // ----------------------------------------------------------------------------
 
 #define WX_DEFINE_TYPEARRAY(T, name, base)                        \
@@ -742,13 +382,35 @@ private:                                                                 \
 #define WX_DEFINE_USER_EXPORTED_TYPEARRAY_PTR(T, name, base, expdecl) \
     WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class expdecl)
 
-#define WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, classdecl) \
-    typedef T _wxArray##name;                                   \
-    _WX_DEFINE_TYPEARRAY(_wxArray##name, name, base, classdecl)
+// This is the only non-trivial macro, which actually defines the array class
+// with the given name containing the elements of the specified type.
+//
+// Note that "name" must be a class and not just a typedef because it can be
+// (and is) forward declared in the existing code.
+//
+// As mentioned above, "base" is unused and so is "classdecl" as this class has
+// only inline methods and so never needs to be exported from MSW DLLs.
+//
+// Note about apparently redundant wxBaseArray##name typedef: this is needed to
+// avoid clashes between T and symbols defined in wxBaseArray<> scope, e.g. if
+// we didn't do this, we would have compilation problems with arrays of type
+// "Item" (which is also the name of a method in wxBaseArray<>).
+#define WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, classdecl)               \
+    typedef wxBaseArray<T> wxBaseArrayFor##name;                              \
+    class name : public wxBaseArrayFor##name                                  \
+    {                                                                         \
+        typedef wxBaseArrayFor##name Base;                                    \
+    public:                                                                   \
+        name() : Base() { }                                                   \
+        explicit name(size_t n) : Base(n) { }                                 \
+        name(size_t n, Base::const_reference v) : Base(n, v) { }              \
+        template <class InputIterator>                                        \
+        name(InputIterator first, InputIterator last) : Base(first, last) { } \
+    }
+
 
 #define WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, classdecl) \
-    typedef T _wxArray##name;                                          \
-    _WX_DEFINE_TYPEARRAY_PTR(_wxArray##name, name, base, classdecl)
+    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, classdecl)
 
 // ----------------------------------------------------------------------------
 // WX_DEFINE_SORTED_TYPEARRAY: this is the same as the previous macro, but it
diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index be01a4b840..241c55450e 100644
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -24,368 +24,7 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
-#include <stdlib.h>
-#include <string.h> // for memmove
-
-#if !wxUSE_STD_CONTAINERS
-
-// we cast the value to long from which we cast it to void * in IndexForInsert:
-// this can't work if the pointers are not big enough
-wxCOMPILE_TIME_ASSERT( sizeof(wxUIntPtr) <= sizeof(void *),
-                       wxArraySizeOfPtrLessSizeOfLong ); // < 32 symbols
-
-// ============================================================================
-// constants
-// ============================================================================
-
-// size increment = max(50% of current size, ARRAY_MAXSIZE_INCREMENT)
-#define   ARRAY_MAXSIZE_INCREMENT    4096
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxBaseArray - dynamic array of 'T's
-// ----------------------------------------------------------------------------
-
-#define _WX_DEFINE_BASEARRAY(T, name)                                       \
-/* searches the array for an item (forward or backwards) */                 \
-int name::Index(T lItem, bool bFromEnd) const                               \
-{                                                                           \
-  if ( bFromEnd ) {                                                         \
-    if ( size() > 0 ) {                                                     \
-      size_t n = size();                                                    \
-      do {                                                                  \
-        if ( (*this)[--n] == lItem )                                        \
-          return n;                                                         \
-      }                                                                     \
-      while ( n != 0 );                                                     \
-    }                                                                       \
-  }                                                                         \
-  else {                                                                    \
-    for( size_t n = 0; n < size(); n++ ) {                                  \
-      if( (*this)[n] == lItem )                                             \
-        return n;                                                           \
-    }                                                                       \
-  }                                                                         \
-                                                                            \
-  return wxNOT_FOUND;                                                       \
-}                                                                           \
-                                                                            \
-/* add item assuming the array is sorted with fnCompare function */         \
-size_t name::Add(T lItem, CMPFUNC fnCompare)                                \
-{                                                                           \
-  size_t idx = IndexForInsert(lItem, fnCompare);                            \
-  Insert(lItem, idx);                                                       \
-  return idx;                                                               \
-}                                                                           \
-                                                                            \
-/* ctor */                                                                  \
-name::name()                                                                \
-{                                                                           \
-  m_nSize  =                                                                \
-  m_nCount = 0;                                                             \
-  m_pItems = NULL;                                                     \
-}                                                                           \
-                                                                            \
-/* copy ctor */                                                             \
-name::name(const name& src)                                                 \
-{                                                                           \
-  m_nSize  = /* not src.m_nSize to save memory */                           \
-  m_nCount = src.m_nCount;                                                  \
-                                                                            \
-  if ( m_nSize != 0 ) {                                                     \
-      m_pItems = new T[m_nSize];                                            \
-      /* only copy if allocation succeeded */                               \
-      if ( m_pItems ) {                                                     \
-          memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(T));               \
-      }                                                                     \
-      else {                                                                \
-          m_nSize = 0;                                                      \
-      }                                                                     \
-  }                                                                         \
-  else                                                                      \
-    m_pItems = NULL;                                                  \
-}                                                                           \
-                                                                            \
-/* assignment operator */                                                   \
-name& name::operator=(const name& src)                                      \
-{                                                                           \
-  wxDELETEA(m_pItems);                                                      \
-                                                                            \
-  m_nSize  = /* not src.m_nSize to save memory */                           \
-  m_nCount = src.m_nCount;                                                  \
-                                                                            \
-  if ( m_nSize != 0 ){                                                      \
-      m_pItems = new T[m_nSize];                                            \
-      /* only copy if allocation succeeded */                               \
-      if ( m_pItems ) {                                                     \
-          memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(T));               \
-      }                                                                     \
-      else {                                                                \
-          m_nSize = 0;                                                      \
-      }                                                                     \
-  }                                                                         \
-  else                                                                      \
-    m_pItems = NULL;                                                  \
-                                                                            \
-  return *this;                                                             \
-}                                                                           \
-                                                                            \
-/* allocate new buffer of the given size and move our data to it */         \
-bool name::Realloc(size_t nSize)                                            \
-{                                                                           \
-  T *pNew = new T[nSize];                                                   \
-  /* only grow if allocation succeeded */                                   \
-  if ( !pNew )                                                              \
-      return false;                                                         \
-                                                                            \
-  m_nSize = nSize;                                                          \
-  /* copy data to new location */                                           \
-  memcpy(pNew, m_pItems, m_nCount*sizeof(T));                               \
-  delete [] m_pItems;                                                       \
-  m_pItems = pNew;                                                          \
-                                                                            \
-  return true;                                                              \
-}                                                                           \
-                                                                            \
-/* grow the array */                                                        \
-void name::Grow(size_t nIncrement)                                          \
-{                                                                           \
-  /* only do it if no more place */                                         \
-  if( (m_nCount == m_nSize) || ((m_nSize - m_nCount) < nIncrement) ) {      \
-    if( m_nSize == 0 ) {                                                    \
-      /* was empty, determine initial size */                               \
-      size_t sz = WX_ARRAY_DEFAULT_INITIAL_SIZE;                            \
-      if (sz < nIncrement) sz = nIncrement;                                 \
-      /* allocate some memory */                                            \
-      m_pItems = new T[sz];                                                 \
-      /* only grow if allocation succeeded */                               \
-      if ( m_pItems ) {                                                     \
-          m_nSize = sz;                                                     \
-      }                                                                     \
-    }                                                                       \
-    else                                                                    \
-    {                                                                       \
-      /* add at least 50% but not too much */                               \
-      size_t ndefIncrement = m_nSize < WX_ARRAY_DEFAULT_INITIAL_SIZE        \
-                            ? WX_ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1; \
-      if ( ndefIncrement > ARRAY_MAXSIZE_INCREMENT )                        \
-        ndefIncrement = ARRAY_MAXSIZE_INCREMENT;                            \
-      if ( nIncrement < ndefIncrement )                                     \
-        nIncrement = ndefIncrement;                                         \
-      Realloc(m_nSize + nIncrement);                                        \
-    }                                                                       \
-  }                                                                         \
-}                                                                           \
-                                                                            \
-/* make sure that the array has at least count elements */                  \
-void name::SetCount(size_t count, T defval)                                 \
-{                                                                           \
-    if ( m_nSize < count )                                                  \
-    {                                                                       \
-        /* need to realloc memory: don't overallocate it here as if */      \
-        /* SetCount() is called, it probably means that the caller  */      \
-        /* knows in advance how many elements there will be in the  */      \
-        /* array and so it won't be necessary to realloc it later   */      \
-        if ( !Realloc(count) )                                              \
-        {                                                                   \
-            /* out of memory -- what can we do? */                          \
-            return;                                                         \
-        }                                                                   \
-    }                                                                       \
-                                                                            \
-    /* add new elements if we extend the array */                           \
-    while ( m_nCount < count )                                              \
-    {                                                                       \
-        m_pItems[m_nCount++] = defval;                                      \
-    }                                                                       \
-}                                                                           \
-                                                                            \
-/* dtor */                                                                  \
-name::~name()                                                               \
-{                                                                           \
-  wxDELETEA(m_pItems);                                                      \
-}                                                                           \
-                                                                            \
-/* clears the list */                                                       \
-void name::Clear()                                                          \
-{                                                                           \
-  m_nSize  =                                                                \
-  m_nCount = 0;                                                             \
-                                                                            \
-  wxDELETEA(m_pItems);                                                      \
-}                                                                           \
-                                                                            \
-/* minimizes the memory usage by freeing unused memory */                   \
-void name::Shrink()                                                         \
-{                                                                           \
-  /* only do it if we have some memory to free */                           \
-  if( m_nCount < m_nSize ) {                                                \
-    /* allocates exactly as much memory as we need */                       \
-    T *pNew = new T[m_nCount];                                              \
-    /* only shrink if allocation succeeded */                               \
-    if ( pNew ) {                                                           \
-        /* copy data to new location */                                     \
-        memcpy(pNew, m_pItems, m_nCount*sizeof(T));                         \
-        delete [] m_pItems;                                                 \
-        m_pItems = pNew;                                                    \
-                                                                            \
-        /* update the size of the new block */                              \
-        m_nSize = m_nCount;                                                 \
-    }                                                                       \
-    /* else: don't do anything, better keep old memory block! */            \
-  }                                                                         \
-}                                                                           \
-                                                                            \
-/* add item at the end */                                                   \
-void name::Add(T lItem, size_t nInsert)                                     \
-{                                                                           \
-  if (nInsert == 0)                                                         \
-      return;                                                               \
-  Grow(nInsert);                                                            \
-  for (size_t i = 0; i < nInsert; i++)                                      \
-      m_pItems[m_nCount++] = lItem;                                         \
-}                                                                           \
-                                                                            \
-/* add item at the given position */                                        \
-void name::Insert(T lItem, size_t nIndex, size_t nInsert)                   \
-{                                                                           \
-  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Insert") );   \
-  wxCHECK_RET( m_nCount <= m_nCount + nInsert,                              \
-               wxT("array size overflow in wxArray::Insert") );             \
-                                                                            \
-  if (nInsert == 0)                                                         \
-      return;                                                               \
-  Grow(nInsert);                                                            \
-                                                                            \
-  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],                   \
-          (m_nCount - nIndex)*sizeof(T));                                   \
-  for (size_t i = 0; i < nInsert; i++)                                      \
-      m_pItems[nIndex + i] = lItem;                                         \
-  m_nCount += nInsert;                                                      \
-}                                                                           \
-                                                                            \
-/* search for a place to insert item into sorted array (binary search) */   \
-size_t name::IndexForInsert(T lItem, CMPFUNC fnCompare) const               \
-{                                                                           \
-  size_t i,                                                                 \
-       lo = 0,                                                              \
-       hi = m_nCount;                                                       \
-  int res;                                                                  \
-                                                                            \
-  while ( lo < hi ) {                                                       \
-    i = (lo + hi)/2;                                                        \
-                                                                            \
-    res = (*fnCompare)((const void *)(wxUIntPtr)lItem,                      \
-                       (const void *)(wxUIntPtr)(m_pItems[i]));             \
-    if ( res < 0 )                                                          \
-      hi = i;                                                               \
-    else if ( res > 0 )                                                     \
-      lo = i + 1;                                                           \
-    else {                                                                  \
-      lo = i;                                                               \
-      break;                                                                \
-    }                                                                       \
-  }                                                                         \
-                                                                            \
-  return lo;                                                                \
-}                                                                           \
-                                                                            \
-/* search for an item in a sorted array (binary search) */                  \
-int name::Index(T lItem, CMPFUNC fnCompare) const                           \
-{                                                                           \
-    size_t n = IndexForInsert(lItem, fnCompare);                            \
-                                                                            \
-    return (n >= m_nCount ||                                                \
-           (*fnCompare)((const void *)(wxUIntPtr)lItem,                     \
-                        ((const void *)(wxUIntPtr)m_pItems[n])))            \
-                        ? wxNOT_FOUND                                       \
-                        : (int)n;                                           \
-}                                                                           \
-                                                                            \
-/* removes item from array (by index) */                                    \
-void name::RemoveAt(size_t nIndex, size_t nRemove)                          \
-{                                                                           \
-  wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArray::RemoveAt") );  \
-  wxCHECK_RET( nIndex + nRemove <= m_nCount,                                \
-               wxT("removing too many elements in wxArray::RemoveAt") );    \
-                                                                            \
-  memmove(&m_pItems[nIndex], &m_pItems[nIndex + nRemove],                   \
-          (m_nCount - nIndex - nRemove)*sizeof(T));                         \
-  m_nCount -= nRemove;                                                      \
-}                                                                           \
-                                                                            \
-/* removes item from array (by value) */                                    \
-void name::Remove(T lItem)                                                  \
-{                                                                           \
-  int iIndex = Index(lItem);                                                \
-                                                                            \
-  wxCHECK_RET( iIndex != wxNOT_FOUND,                                       \
-               wxT("removing inexistent item in wxArray::Remove") );        \
-                                                                            \
-  RemoveAt((size_t)iIndex);                                                 \
-}                                                                           \
-                                                                            \
-/* sort array elements using passed comparaison function */                 \
-void name::Sort(CMPFUNC fCmp)                                               \
-{                                                                           \
-  qsort(m_pItems, m_nCount, sizeof(T), fCmp);                               \
-}                                                                           \
-                                                                            \
-void name::assign(const_iterator first, const_iterator last)                \
-{                                                                           \
-  clear();                                                                  \
-  reserve(last - first);                                                    \
-  for(; first != last; ++first)                                             \
-    push_back(*first);                                                      \
-}                                                                           \
-                                                                            \
-void name::assign(size_type n, const_reference v)                           \
-{                                                                           \
-  clear();                                                                  \
-  reserve(n);                                                               \
-  for( size_type i = 0; i < n; ++i )                                        \
-    push_back(v);                                                           \
-}                                                                           \
-                                                                            \
-void name::insert(iterator it, const_iterator first, const_iterator last)   \
-{                                                                           \
-  size_t nInsert = last - first, nIndex = it - begin();                     \
-  if (nInsert == 0)                                                         \
-      return;                                                               \
-  Grow(nInsert);                                                            \
-                                                                            \
-  /* old iterator could have been invalidated by Grow(). */                 \
-  it = begin() + nIndex;                                                    \
-                                                                            \
-  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],                   \
-          (m_nCount - nIndex)*sizeof(T));                                   \
-  for (size_t i = 0; i < nInsert; ++i, ++it, ++first)                       \
-      *it = *first;                                                         \
-  m_nCount += nInsert;                                                      \
-}
-
-#ifdef __INTELC__
-    #pragma warning(push)
-    #pragma warning(disable: 1684)
-    #pragma warning(disable: 1572)
-#endif
-
-_WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid)
-_WX_DEFINE_BASEARRAY(char,         wxBaseArrayChar)
-_WX_DEFINE_BASEARRAY(short,        wxBaseArrayShort)
-_WX_DEFINE_BASEARRAY(int,          wxBaseArrayInt)
-_WX_DEFINE_BASEARRAY(long,         wxBaseArrayLong)
-_WX_DEFINE_BASEARRAY(size_t,       wxBaseArraySizeT)
-_WX_DEFINE_BASEARRAY(double,       wxBaseArrayDouble)
-
-#ifdef __INTELC__
-    #pragma warning(pop)
-#endif
-
-#else // wxUSE_STD_CONTAINERS
+#if wxUSE_STD_CONTAINERS
 
 #include "wx/arrstr.h"
 
@@ -493,4 +132,4 @@ int wxSortedArrayString::Index(const wxString& str,
     return it - begin();
 }
 
-#endif // !wxUSE_STD_CONTAINERS/wxUSE_STD_CONTAINERS
+#endif // wxUSE_STD_CONTAINERS

From 085e4c354aa82994cd15bb8f8a30394b7462df25 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Jun 2018 16:32:00 +0200
Subject: [PATCH 604/916] Show HitTest() result on left click in "Text" widgets
 sample page

Right clicking didn't work under wxGTK where it just showed the context
menu, so use left click handler instead and check whether "Alt" is
pressed.

Also add a note to make this test more discoverable.
---
 samples/widgets/textctrl.cpp | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index c89ba6ca93..96e5074954 100644
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -276,11 +276,17 @@ public:
                     int flags)
         : wxTextCtrl(parent, id, value, wxDefaultPosition, wxDefaultSize, flags)
     {
+        Bind(wxEVT_LEFT_DOWN, &WidgetsTextCtrl::OnLeftClick, this);
     }
 
-protected:
-    void OnRightClick(wxMouseEvent& event)
+private:
+    // Show the result of HitTest() at the mouse position if Alt is pressed.
+    void OnLeftClick(wxMouseEvent& event)
     {
+        event.Skip();
+        if ( !event.AltDown() )
+            return;
+
         wxString where;
         wxTextCoord x, y;
         switch ( HitTest(event.GetPosition(), &x, &y) )
@@ -312,12 +318,7 @@ protected:
         }
 
         wxLogMessage(wxT("Mouse is %s (%ld, %ld)"), where.c_str(), x, y);
-
-        event.Skip();
     }
-
-private:
-    wxDECLARE_EVENT_TABLE();
 };
 
 // ----------------------------------------------------------------------------
@@ -353,10 +354,6 @@ wxBEGIN_EVENT_TABLE(TextWidgetsPage, WidgetsPage)
     EVT_RADIOBOX(wxID_ANY, TextWidgetsPage::OnCheckOrRadioBox)
 wxEND_EVENT_TABLE()
 
-wxBEGIN_EVENT_TABLE(WidgetsTextCtrl, wxTextCtrl)
-    EVT_RIGHT_UP(WidgetsTextCtrl::OnRightClick)
-wxEND_EVENT_TABLE()
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -593,6 +590,17 @@ void TextWidgetsPage::CreateContent()
                         0, wxALL, 5
                      );
 
+    sizerMiddleDown->Add
+                     (
+                          new wxStaticText
+                          (
+                            this,
+                            wxID_ANY,
+                            "Alt-click in the text to see HitTest() result"
+                          ),
+                          wxSizerFlags().Border()
+                     );
+
     wxSizer *sizerMiddle = new wxBoxSizer(wxVERTICAL);
     sizerMiddle->Add(sizerMiddleUp, 0, wxGROW);
     sizerMiddle->Add(sizerMiddleDown, 1, wxGROW | wxTOP, 5);

From 690b95646bc68f3d2ca6502c618a065ed8955b79 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Jun 2018 17:04:06 +0200
Subject: [PATCH 605/916] Implement wxTextCtrl::HitTest() for single line
 controls in wxGTK

Use Pango API to find the character at the given position.

Closes #18144.
---
 docs/changes.txt        |  1 +
 interface/wx/textctrl.h |  4 ++--
 src/gtk/textctrl.cpp    | 49 +++++++++++++++++++++++++++++++++++++++--
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 41ecaf1d11..63ba58a58f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -84,6 +84,7 @@ All (GUI):
 
 wxGTK:
 
+- Implement wxTextCtrl::HitTest() for single line controls.
 - Fix the build with glib < 2.32 (e.g. CentOS 6).
 
 wxMSW:
diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h
index 70b296c5b0..1bb50d9e90 100644
--- a/interface/wx/textctrl.h
+++ b/interface/wx/textctrl.h
@@ -1337,7 +1337,7 @@ public:
         parameter is not modified.
 
         Please note that this function is currently only implemented in wxUniv,
-        wxMSW and wxGTK2 ports and always returns @c wxTE_HT_UNKNOWN in the
+        wxMSW and wxGTK ports and always returns @c wxTE_HT_UNKNOWN in the
         other ports.
 
         @beginWxPerlOnly
@@ -1363,7 +1363,7 @@ public:
         parameters are not modified.
 
         Please note that this function is currently only implemented in wxUniv,
-        wxMSW and wxGTK2 ports and always returns @c wxTE_HT_UNKNOWN in the
+        wxMSW and wxGTK ports and always returns @c wxTE_HT_UNKNOWN in the
         other ports.
 
         @beginWxPerlOnly
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 281099dce9..b8551d37c7 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1465,8 +1465,53 @@ wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const
 {
     if ( !IsMultiLine() )
     {
-        // not supported
-        return wxTE_HT_UNKNOWN;
+        // These variables will contain the position inside PangoLayout.
+        int x = pt.x,
+            y = pt.y;
+
+        // Get the offsets of PangoLayout inside the control.
+        //
+        // Note that contrary to what GTK+ documentation implies, the
+        // horizontal offset already accounts for scrolling, i.e. it will be
+        // negative if text is scrolled.
+        gint ofsX = 0,
+             ofsY = 0;
+        gtk_entry_get_layout_offsets(GTK_ENTRY(m_text), &ofsX, &ofsY);
+
+        x -= ofsX;
+        y -= ofsY;
+
+        // And scale the coordinates for Pango.
+        x *= PANGO_SCALE;
+        y *= PANGO_SCALE;
+
+        PangoLayout* const layout = gtk_entry_get_layout(GTK_ENTRY(m_text));
+
+        int idx = -1,
+            ofs = 0;
+        if ( !pango_layout_xy_to_index(layout, x, y, &idx, &ofs) )
+        {
+            // Try to guess why did it fail.
+            if ( x < 0 || y < 0 )
+            {
+                if ( pos )
+                    *pos = 0;
+
+                return wxTE_HT_BEFORE;
+            }
+            else
+            {
+                if ( pos )
+                    *pos = wxTextEntry::GetLastPosition();
+
+                return wxTE_HT_BEYOND;
+            }
+        }
+
+        if ( pos )
+            *pos = idx;
+
+        return wxTE_HT_ON_TEXT;
     }
 
     int x, y;

From 06f554775cdb37a4a0477564653c87198b806903 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Jun 2018 16:58:38 +0200
Subject: [PATCH 606/916] Add unit test for wxTextCtrl::HitTest() for single
 line controls

Note that the control needs to be created with a reasonable size for
HitTest() to work correctly (at least under MSW, but probably not only),
so change the test set up function to use some fixed size for all kinds
of controls instead of doing it only for the multi-line ones.
---
 tests/controls/textctrltest.cpp | 53 +++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp
index 7264bc5d82..eceaee7e47 100644
--- a/tests/controls/textctrltest.cpp
+++ b/tests/controls/textctrltest.cpp
@@ -59,6 +59,7 @@ private:
         WXUISIM_TEST( MaxLength );
         CPPUNIT_TEST( PositionToXYSingleLine );
         CPPUNIT_TEST( XYToPositionSingleLine );
+        CPPUNIT_TEST( HitTestSingleLine );
         SINGLE_AND_MULTI_TESTS();
 
         // Now switch to the multi-line text controls.
@@ -112,6 +113,7 @@ private:
     void MaxLength();
     void StreamInput();
     void Redirector();
+    void HitTestSingleLine();
     //void ProcessEnter();
     void Url();
     void Style();
@@ -164,12 +166,8 @@ long TextCtrlTestCase::ms_style = 0;
 
 void TextCtrlTestCase::CreateText(long extraStyles)
 {
-    wxSize size;
-    if ( ms_style == wxTE_MULTILINE )
-        size = wxSize(400, TEXT_HEIGHT);
-
     m_text = new wxTextCtrl(wxTheApp->GetTopWindow(), wxID_ANY, "",
-                            wxDefaultPosition, size,
+                            wxDefaultPosition, wxSize(400, TEXT_HEIGHT),
                             ms_style | extraStyles);
 }
 
@@ -342,6 +340,51 @@ void TextCtrlTestCase::Redirector()
 #endif
 }
 
+void TextCtrlTestCase::HitTestSingleLine()
+{
+    m_text->ChangeValue("Hit me");
+
+    // We don't know the size of the text borders, so we can't really do any
+    // exact tests, just try to verify that the results are roughly as
+    // expected.
+    const wxSize sizeChar = m_text->GetTextExtent("X");
+    const int yMid = sizeChar.y / 2;
+
+    long pos = -1;
+
+    // Hitting a point near the left side of the control should find one of the
+    // first few characters under it.
+    SECTION("Normal")
+    {
+        REQUIRE( m_text->HitTest(wxPoint(2*sizeChar.x, yMid), &pos) == wxTE_HT_ON_TEXT );
+        CHECK( pos >= 0 );
+        CHECK( pos < 3 );
+    }
+
+    // Hitting a point well beyond the end of the text shouldn't find any valid
+    // character.
+    SECTION("Beyond")
+    {
+        REQUIRE( m_text->HitTest(wxPoint(20*sizeChar.x, yMid), &pos) == wxTE_HT_BEYOND );
+        CHECK( pos == m_text->GetLastPosition() );
+    }
+
+    // Making the control scroll, by ensuring that its contents is too long to
+    // show inside its window, should change the hit test result for the same
+    // position as used above.
+    SECTION("Scrolled")
+    {
+        m_text->ChangeValue(wxString(200, 'X'));
+        m_text->SetInsertionPointEnd();
+
+        // wxGTK must be given an opportunity to lay the text out.
+        wxYield();
+
+        REQUIRE( m_text->HitTest(wxPoint(2*sizeChar.x, yMid), &pos) == wxTE_HT_ON_TEXT );
+        CHECK( pos > 3 );
+    }
+}
+
 #if 0
 void TextCtrlTestCase::ProcessEnter()
 {

From aaa9c80d66a9d6de2759ac7f3466e3fca28033a4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 1 Jun 2018 16:24:23 +0200
Subject: [PATCH 607/916] Replace most of _WX_DEFINE_SORTED_TYPEARRAY_2 with
 template too

Add wxBaseSortedArray<> template instead of putting all the code inside
_WX_DEFINE_SORTED_TYPEARRAY_2 macro.

There should be no changes, but the code is now easier to read and
modify.
---
 include/wx/dynarray.h | 92 +++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 8edfefb937..2ac99bf43c 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -212,52 +212,52 @@ public:
 // ----------------------------------------------------------------------------
 
 #define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\
-wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type),          \
-                       TypeTooBigToBeStoredInSorted##base,            \
-                       name);                                         \
-classexp name : public base                                           \
-{                                                                     \
-  typedef comptype SCMPFUNC;                                          \
-public:                                                               \
-  name(comptype fn defcomp) { m_fnCompare = fn; }                     \
-                                                                      \
-  name& operator=(const name& src)                                    \
-    { base* temp = (base*) this;                                      \
-      (*temp) = ((const base&)src);                                   \
-      m_fnCompare = src.m_fnCompare;                                  \
-      return *this; }                                                 \
-                                                                      \
-  T& operator[](size_t uiIndex) const                                 \
-    { return (T&)(base::operator[](uiIndex)); }                       \
-  T& Item(size_t uiIndex) const                                       \
-    { return (T&)(base::operator[](uiIndex)); }                       \
-  T& Last() const                                                     \
-    { return (T&)(base::operator[](size() - 1)); }                    \
-                                                                      \
-  int Index(T lItem) const                                            \
-    { return base::Index(lItem, (CMPFUNC)m_fnCompare); }              \
-                                                                      \
-  size_t IndexForInsert(T lItem) const                                \
-    { return base::IndexForInsert(lItem, (CMPFUNC)m_fnCompare); }     \
-                                                                      \
-  void AddAt(T item, size_t index)                                    \
-    { base::insert(begin() + index, item); }                          \
-                                                                      \
-  size_t Add(T lItem)                                                 \
-    { return base::Add(lItem, (CMPFUNC)m_fnCompare); }                \
-  void push_back(T lItem)                                             \
-    { Add(lItem); }                                                   \
-                                                                      \
-  void RemoveAt(size_t uiIndex, size_t nRemove = 1)                   \
-    { base::erase(begin() + uiIndex, begin() + uiIndex + nRemove); }  \
-  void Remove(T lItem)                                                \
-    { int iIndex = Index(lItem);                                      \
-      wxCHECK_RET( iIndex != wxNOT_FOUND, _WX_ERROR_REMOVE );         \
-      base::erase(begin() + iIndex); }                                \
-                                                                      \
-private:                                                              \
-  comptype m_fnCompare;                                               \
-}
+    typedef wxBaseSortedArray<T, comptype> wxBaseSortedArrayFor##name;        \
+    classexp name : public wxBaseSortedArrayFor##name                         \
+    {                                                                         \
+    public:                                                                   \
+        name(comptype fn defcomp) : wxBaseSortedArrayFor##name(fn) { }        \
+    }
+
+
+template <typename T, typename Cmp>
+class wxBaseSortedArray : public wxBaseArray<T>
+{
+    typedef typename wxBaseArray<T>::CMPFUNC CMPFUNC;
+
+public:
+    explicit wxBaseSortedArray(Cmp fn) : m_fnCompare(fn) { }
+
+    wxBaseSortedArray& operator=(const wxBaseSortedArray& src)
+    {
+        wxBaseArray<T>::operator=(src);
+        m_fnCompare = src.m_fnCompare;
+        return *this;
+    }
+
+    size_t IndexForInsert(T item) const
+    {
+        return this->IndexForInsert(item, (CMPFUNC)m_fnCompare);
+    }
+
+    void AddAt(T item, size_t index)
+    {
+        this->insert(this->begin() + index, item);
+    }
+
+    size_t Add(T item)
+    {
+        return this->wxBaseArray<T>::Add(item, (CMPFUNC)m_fnCompare);
+    }
+
+    void push_back(T item)
+    {
+        Add(item);
+    }
+
+private:
+    Cmp m_fnCompare;
+};
 
 
 // ----------------------------------------------------------------------------

From 97684a9267ff49d55d00151b06e89b7891e731b3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 1 Jun 2018 18:08:55 +0200
Subject: [PATCH 608/916] Replace object array macros with template class too

Put the code implementing object arrays, i.e. arrays owning pointers to
the objects, into wxBaseObjectArray<> instead of _WX_DECLARE_OBJARRAY
macro.

Also simplify WX_DEFINE_OBJARRAY() by leaving only the definitions of
functions creating and destroying the objects in it (they have to be
there and not in the template itself to allow using template with
incomplete classes).
---
 include/wx/arrimpl.cpp | 102 ++---------------
 include/wx/dynarray.h  | 245 +++++++++++++++++++++++++++++++----------
 2 files changed, 192 insertions(+), 155 deletions(-)

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index 0ef9e74890..020280ea38 100644
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 /*****************************************************************************
- * Purpose: implements methods of "template" class declared in               *
+ * Purpose: implements helper functions used by the template class used by   *
  *          DECLARE_OBJARRAY macro and which couldn't be implemented inline  *
  *          (because they need the full definition of type T in scope)       *
  *                                                                           *
@@ -19,101 +19,15 @@
  *          4) WX_DEFINE_OBJARRAY                                            *
  *****************************************************************************/
 
-// needed to resolve the conflict between global T and macro parameter T
-
-#define _WX_ERROR_REMOVE2(x)     wxT("bad index in ") wxT(#x) wxT("::RemoveAt()")
-
-// macro implements remaining (not inline) methods of template list
-// (it's private to this file)
-#undef  _DEFINE_OBJARRAY
-#define _DEFINE_OBJARRAY(T, name)                                             \
-name::~name()                                                                 \
+#undef WX_DEFINE_OBJARRAY
+#define WX_DEFINE_OBJARRAY(name)                                              \
+name::value_type*                                                             \
+wxObjectArrayTraitsFor##name::Clone(const name::value_type& item)             \
 {                                                                             \
-  Empty();                                                                    \
+    return new name::value_type(item);                                        \
 }                                                                             \
                                                                               \
-void name::DoCopy(const name& src)                                            \
+void wxObjectArrayTraitsFor##name::Free(name::value_type* p)                  \
 {                                                                             \
-  for ( size_t ui = 0; ui < src.size(); ui++ )                                \
-    Add(src[ui]);                                                             \
-}                                                                             \
-                                                                              \
-name& name::operator=(const name& src)                                        \
-{                                                                             \
-  Empty();                                                                    \
-  DoCopy(src);                                                                \
-                                                                              \
-  return *this;                                                               \
-}                                                                             \
-                                                                              \
-name::name(const name& src) : wxArrayPtrVoid()                                \
-{                                                                             \
-  DoCopy(src);                                                                \
-}                                                                             \
-                                                                              \
-void name::DoEmpty()                                                          \
-{                                                                             \
-  for ( size_t ui = 0; ui < size(); ui++ )                                    \
-    delete (T*)base_array::operator[](ui);                                    \
-}                                                                             \
-                                                                              \
-void name::RemoveAt(size_t uiIndex, size_t nRemove)                           \
-{                                                                             \
-  wxCHECK_RET( uiIndex < size(), _WX_ERROR_REMOVE2(name) );                   \
-                                                                              \
-  for (size_t i = 0; i < nRemove; i++ )                                       \
-    delete (T*)base_array::operator[](uiIndex + i);                           \
-                                                                              \
-  base_array::erase(begin() + uiIndex, begin() + uiIndex + nRemove);          \
-}                                                                             \
-                                                                              \
-void name::Add(const T& item, size_t nInsert)                                 \
-{                                                                             \
-  if (nInsert == 0)                                                           \
-    return;                                                                   \
-  T* pItem = new T(item);                                                     \
-  size_t nOldSize = size();                                                   \
-  if ( pItem != NULL )                                                        \
-    base_array::insert(end(), nInsert, pItem);                                \
-  for (size_t i = 1; i < nInsert; i++)                                        \
-    base_array::operator[](nOldSize + i) = new T(item);                       \
-}                                                                             \
-                                                                              \
-void name::Insert(const T& item, size_t uiIndex, size_t nInsert)              \
-{                                                                             \
-  if (nInsert == 0)                                                           \
-    return;                                                                   \
-  T* pItem = new T(item);                                                     \
-  if ( pItem != NULL )                                                        \
-    base_array::insert(begin() + uiIndex, nInsert, pItem);                    \
-  for (size_t i = 1; i < nInsert; i++)                                        \
-    base_array::operator[](uiIndex + i) = new T(item);                        \
-}                                                                             \
-                                                                              \
-int name::Index(const T& item, bool bFromEnd) const                           \
-{                                                                             \
-  if ( bFromEnd ) {                                                           \
-    if ( size() > 0 ) {                                                       \
-      size_t ui = size() - 1;                                                 \
-      do {                                                                    \
-        if ( (T*)base_array::operator[](ui) == &item )                        \
-          return static_cast<int>(ui);                                     \
-        ui--;                                                                 \
-      }                                                                       \
-      while ( ui != 0 );                                                      \
-    }                                                                         \
-  }                                                                           \
-  else {                                                                      \
-    for( size_t ui = 0; ui < size(); ui++ ) {                                 \
-      if( (T*)base_array::operator[](ui) == &item )                           \
-        return static_cast<int>(ui);                                       \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  return wxNOT_FOUND;                                                         \
+    delete p;                                                                 \
 }
-
-// redefine the macro so that now it will generate the class implementation
-// old value would provoke a compile-time error if this file is not included
-#undef  WX_DEFINE_OBJARRAY
-#define WX_DEFINE_OBJARRAY(name) _DEFINE_OBJARRAY(_wxObjArray##name, name)
diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 2ac99bf43c..94cd430ef4 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -237,7 +237,7 @@ public:
 
     size_t IndexForInsert(T item) const
     {
-        return this->IndexForInsert(item, (CMPFUNC)m_fnCompare);
+        return this->wxBaseArray<T>::IndexForInsert(item, (CMPFUNC)m_fnCompare);
     }
 
     void AddAt(T item, size_t index)
@@ -264,63 +264,173 @@ private:
 // _WX_DECLARE_OBJARRAY: an array for pointers to type T with owning semantics
 // ----------------------------------------------------------------------------
 
-#define _WX_DECLARE_OBJARRAY(T, name, base, classexp)                    \
-typedef int (CMPFUNC_CONV *CMPFUNC##T)(T **pItem1, T **pItem2);          \
-classexp name : protected base                                           \
-{                                                                        \
-typedef int (CMPFUNC_CONV *CMPFUNC##base)(void **pItem1, void **pItem2); \
-typedef base base_array;                                                 \
-public:                                                                  \
-  name() { }                                                             \
-  name(const name& src);                                                 \
-  name& operator=(const name& src);                                      \
-                                                                         \
-  ~name();                                                               \
-                                                                         \
-  void Alloc(size_t count) { base::reserve(count); }                     \
-  void reserve(size_t count) { base::reserve(count); }                   \
-  size_t GetCount() const { return base_array::size(); }                 \
-  size_t size() const { return base_array::size(); }                     \
-  bool IsEmpty() const { return base_array::empty(); }                   \
-  bool empty() const { return base_array::empty(); }                     \
-  size_t Count() const { return base_array::size(); }                    \
-  void Shrink() { base::Shrink(); }                                      \
-                                                                         \
-  T& operator[](size_t uiIndex) const                                    \
-    { return *(T*)base::operator[](uiIndex); }                           \
-  T& Item(size_t uiIndex) const                                          \
-    { return *(T*)base::operator[](uiIndex); }                           \
-  T& Last() const                                                        \
-    { return *(T*)(base::operator[](size() - 1)); }                      \
-                                                                         \
-  int Index(const T& lItem, bool bFromEnd = false) const;                \
-                                                                         \
-  void Add(const T& lItem, size_t nInsert = 1);                          \
-  void Add(const T* pItem)                                               \
-    { base::push_back((T*)pItem); }                                      \
-  void push_back(const T* pItem)                                         \
-    { base::push_back((T*)pItem); }                                      \
-  void push_back(const T& lItem)                                         \
-    { Add(lItem); }                                                      \
-                                                                         \
-  void Insert(const T& lItem,  size_t uiIndex, size_t nInsert = 1);      \
-  void Insert(const T* pItem, size_t uiIndex)                            \
-    { base::insert(begin() + uiIndex, (T*)pItem); }                      \
-                                                                         \
-  void Empty() { DoEmpty(); base::clear(); }                             \
-  void Clear() { DoEmpty(); base::clear(); }                             \
-                                                                         \
-  T* Detach(size_t uiIndex)                                              \
-    { T* p = (T*)base::operator[](uiIndex);                              \
-      base::erase(begin() + uiIndex); return p; }                        \
-  void RemoveAt(size_t uiIndex, size_t nRemove = 1);                     \
-                                                                         \
-  void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC##base)fCmp); }        \
-                                                                         \
-private:                                                                 \
-  void DoEmpty();                                                        \
-  void DoCopy(const name& src);                                          \
-}
+// This class must be able to be declared with incomplete types, so it doesn't
+// actually use type T in its definition, and relies on a helper template
+// parameter, which is declared by WX_DECLARE_OBJARRAY() and defined by
+// WX_DEFINE_OBJARRAY(), for providing a way to create and destroy objects of
+// type T
+template <typename T, typename Traits>
+class wxBaseObjectArray : private wxBaseArray<T*>
+{
+    typedef wxBaseArray<T*> base;
+
+public:
+    typedef T value_type;
+
+    typedef int (wxCMPFUNC_CONV *CMPFUNC)(T **pItem1, T **pItem2);
+
+    wxBaseObjectArray()
+    {
+    }
+
+    wxBaseObjectArray(const wxBaseObjectArray& src) : base()
+    {
+        DoCopy(src);
+    }
+
+    wxBaseObjectArray& operator=(const wxBaseObjectArray& src)
+    {
+        Empty();
+        DoCopy(src);
+
+        return *this;
+    }
+
+    ~wxBaseObjectArray()
+    {
+        Empty();
+    }
+
+    void Alloc(size_t count) { base::reserve(count); }
+    void reserve(size_t count) { base::reserve(count); }
+    size_t GetCount() const { return base::size(); }
+    size_t size() const { return base::size(); }
+    bool IsEmpty() const { return base::empty(); }
+    bool empty() const { return base::empty(); }
+    size_t Count() const { return base::size(); }
+    void Shrink() { base::Shrink(); }
+
+    T& operator[](size_t uiIndex) const
+    {
+        return *base::operator[](uiIndex);
+    }
+
+    T& Item(size_t uiIndex) const
+    {
+        return *base::operator[](uiIndex);
+    }
+
+    T& Last() const
+    {
+        return *(base::operator[](size() - 1));
+    }
+
+    int Index(const T& item, bool bFromEnd = false) const
+    {
+        if ( bFromEnd )
+        {
+            if ( size() > 0 )
+            {
+                size_t ui = size() - 1;
+                do
+                {
+                    if ( base::operator[](ui) == &item )
+                        return static_cast<int>(ui);
+                    ui--;
+                }
+                while ( ui != 0 );
+            }
+        }
+        else
+        {
+            for ( size_t ui = 0; ui < size(); ++ui )
+            {
+                if( base::operator[](ui) == &item )
+                    return static_cast<int>(ui);
+            }
+        }
+
+        return wxNOT_FOUND;
+    }
+
+    void Add(const T& item, size_t nInsert = 1)
+    {
+        if ( nInsert == 0 )
+            return;
+
+        T* const pItem = Traits::Clone(item);
+
+        const size_t nOldSize = size();
+        if ( pItem != NULL )
+            base::insert(this->end(), nInsert, pItem);
+
+        for ( size_t i = 1; i < nInsert; i++ )
+            base::operator[](nOldSize + i) = Traits::Clone(item);
+    }
+
+    void Add(const T* pItem)
+    {
+        base::push_back(const_cast<T*>(pItem));
+    }
+
+    void push_back(const T* pItem) { Add(pItem); }
+    void push_back(const T& item) { Add(item); }
+
+    void Insert(const T& item,  size_t uiIndex, size_t nInsert = 1)
+    {
+        if ( nInsert == 0 )
+            return;
+
+        T* const pItem = Traits::Clone(item);
+        if ( pItem != NULL )
+            base::insert(this->begin() + uiIndex, nInsert, pItem);
+
+        for ( size_t i = 1; i < nInsert; ++i )
+            base::operator[](uiIndex + i) = Traits::Clone(item);
+    }
+
+    void Insert(const T* pItem, size_t uiIndex)
+    {
+        base::insert(this->begin() + uiIndex, (T*)pItem);
+    }
+
+    void Empty() { DoEmpty(); base::clear(); }
+    void Clear() { DoEmpty(); base::clear(); }
+
+    T* Detach(size_t uiIndex)
+    {
+        T* const p = base::operator[](uiIndex);
+
+        base::erase(this->begin() + uiIndex);
+        return p;
+    }
+
+    void RemoveAt(size_t uiIndex, size_t nRemove = 1)
+    {
+        wxCHECK_RET( uiIndex < size(), "bad index in RemoveAt()" );
+
+        for ( size_t i = 0; i < nRemove; ++i )
+            Traits::Free(base::operator[](uiIndex + i));
+
+        base::erase(this->begin() + uiIndex, this->begin() + uiIndex + nRemove);
+    }
+
+    void Sort(CMPFUNC fCmp) { base::Sort(fCmp); }
+
+private:
+    void DoEmpty()
+    {
+        for ( size_t n = 0; n < size(); ++n )
+            Traits::Free(base::operator[](n));
+    }
+
+    void DoCopy(const wxBaseObjectArray& src)
+    {
+        reserve(src.size());
+        for ( size_t n = 0; n < src.size(); ++n )
+            Add(src[n]);
+    }
+};
 
 // ============================================================================
 // The public macros for declaration and definition of the dynamic arrays
@@ -530,9 +640,22 @@ private:                                                                 \
 #define WX_DECLARE_EXPORTED_OBJARRAY(T, name)               \
     WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLIMPEXP_CORE)
 
-#define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, decl) \
-    typedef T _wxObjArray##name;                            \
-    _WX_DECLARE_OBJARRAY(_wxObjArray##name, name, wxArrayPtrVoid, decl)
+#define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, classdecl)                     \
+    classdecl wxObjectArrayTraitsFor##name                                    \
+    {                                                                         \
+    public:                                                                   \
+        static T* Clone(const T& item);                                       \
+        static void Free(T* p);                                               \
+    };                                                                        \
+    typedef wxBaseObjectArray<T, wxObjectArrayTraitsFor##name>                \
+        wxBaseObjectArrayFor##name;                                           \
+    typedef int (wxCMPFUNC_CONV *CMPFUNC##T)(T **pItem1, T **pItem2);         \
+    classdecl name : public wxBaseObjectArrayFor##name                        \
+    {                                                                         \
+    public:                                                                   \
+        name() : wxBaseObjectArrayFor##name() { }                             \
+        name(const name& src) : wxBaseObjectArrayFor##name(src) { }           \
+    }
 
 #define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, expmode) \
     WX_DECLARE_OBJARRAY_WITH_DECL(T, name, class expmode)

From 0e99ab2c495f3e5492d50bd21b6a96c634b7aa0e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 1 Jun 2018 18:13:35 +0200
Subject: [PATCH 609/916] Use template functions instead of WX_XXX_ARRAY()
 macros

Trivially rewrite macros as functions.

No real changes.
---
 include/wx/dynarray.h | 55 +++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 94cd430ef4..fa52765dd3 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -864,32 +864,34 @@ WX_DEFINE_USER_EXPORTED_ARRAY_LONG(long, wxArrayLong, class WXDLLIMPEXP_BASE);
 WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE);
 
 // -----------------------------------------------------------------------------
-// convenience macros
+// convenience functions: they used to be macros, hence the naming convention
 // -----------------------------------------------------------------------------
 
 // prepend all element of one array to another one; e.g. if first array contains
 // elements X,Y,Z and the second contains A,B,C (in those orders), then the
 // first array will be result as A,B,C,X,Y,Z
-#define WX_PREPEND_ARRAY(array, other)                                        \
-    {                                                                         \
-        size_t wxAAcnt = (other).size();                                      \
-        (array).reserve(wxAAcnt);                                             \
-        for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
-        {                                                                     \
-            (array).Insert((other)[wxAAn], wxAAn);                            \
-        }                                                                     \
+template <typename A1, typename A2>
+inline void WX_PREPEND_ARRAY(A1& array, const A2& other)
+{
+    const size_t size = other.size();
+    array.reserve(size);
+    for ( size_t n = 0; n < size; n++ )
+    {
+        array.Insert(other[n], n);
     }
+}
 
 // append all element of one array to another one
-#define WX_APPEND_ARRAY(array, other)                                         \
-    {                                                                         \
-        size_t wxAAcnt = (other).size();                                      \
-        (array).reserve(wxAAcnt);                                             \
-        for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
-        {                                                                     \
-            (array).push_back((other)[wxAAn]);                                \
-        }                                                                     \
+template <typename A1, typename A2>
+inline void WX_APPEND_ARRAY(A1& array, const A2& other)
+{
+    size_t size = other.size();
+    array.reserve(size);
+    for ( size_t n = 0; n < size; n++ )
+    {
+        array.push_back(other[n]);
     }
+}
 
 // delete all array elements
 //
@@ -897,15 +899,16 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE
 //     place where you use this macro, otherwise the proper destructor may not
 //     be called (a decent compiler should give a warning about it, but don't
 //     count on it)!
-#define WX_CLEAR_ARRAY(array)                                                 \
-    {                                                                         \
-        size_t wxAAcnt = (array).size();                                      \
-        for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
-        {                                                                     \
-            delete (array)[wxAAn];                                            \
-        }                                                                     \
-                                                                              \
-        (array).clear();                                                      \
+template <typename A>
+inline void WX_CLEAR_ARRAY(A& array)
+{
+    size_t size = array.size();
+    for ( size_t n = 0; n < size; n++ )
+    {
+        delete array[n];
     }
 
+    array.clear();
+}
+
 #endif // _DYNARRAY_H

From 0cda7c2f13bf12d4040b375eb51f592bea0cf802 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 1 Jun 2018 18:17:53 +0200
Subject: [PATCH 610/916] Mention that dynamic array classes are obsolete more
 clearly

Update the documentation of the classes themselves and the containers
overview.
---
 docs/doxygen/mainpages/cat_classes.h | 4 ++--
 interface/wx/dynarray.h              | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/doxygen/mainpages/cat_classes.h b/docs/doxygen/mainpages/cat_classes.h
index f48a4b032a..81c1dc06e3 100644
--- a/docs/doxygen/mainpages/cat_classes.h
+++ b/docs/doxygen/mainpages/cat_classes.h
@@ -632,13 +632,13 @@ these classes provide a subset or almost complete STL API.
 
 Related Overviews: @ref overview_container
 
-@li wxArray<T>: A type-safe dynamic array implementation (macro based)
+@li wxArray<T>: Legacy dynamic array, use srd::vector or wxVector instead.
 @li wxArrayString: An efficient container for storing wxString objects
 @li wxHashMap<T>: A type-safe hash map implementation (macro based)
 @li wxHashSet<T>: A type-safe hash set implementation(macro based)
 @li wxHashTable: A simple hash table implementation (deprecated, use wxHashMap)
 @li wxList<T>: A type-safe linked list implementation (macro based)
-@li wxVector<T>: Template base vector implementation identical to std::vector
+@li wxVector<T>: Template base vector implementation identical to std::vector.
 
 
 
diff --git a/interface/wx/dynarray.h b/interface/wx/dynarray.h
index 876cbb139c..548a5c8b6a 100644
--- a/interface/wx/dynarray.h
+++ b/interface/wx/dynarray.h
@@ -6,6 +6,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /**
+    The legacy dynamic array class, existing for compatibility only and @e NOT
+    to be used in the new code.
 
     This section describes the so called @e "dynamic arrays". This is a C
     array-like type safe data structure i.e. the member access time is constant

From 004af0b963f80212a7d3a4f81e5f21d20d8d1841 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 May 2018 23:25:15 +0200
Subject: [PATCH 611/916] Use correct DDE callback signature in Win64 build

Don't use the deprecated since Win16 (!) and doing nothing
MakeProcInstance() and fix the signature of DDECallback() which was
actually wrong in Win64 build but the problem was hidden due to the
casts done inside and outside MakeProcInstance() before.

Remove this macro and fix the signature to actually conform to the real
callback one.

This also fixes another gcc8 -Wcast-function-type warning.
---
 src/msw/dde.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index ad8b5d4a63..ccea317306 100644
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -66,14 +66,14 @@ static void DDEDeleteConnection(HCONV hConv);
 static wxDDEServer *DDEFindServer(const wxString& s);
 
 extern "C" HDDEDATA EXPENTRY
-_DDECallback(WORD wType,
-             WORD wFmt,
+_DDECallback(UINT wType,
+             UINT wFmt,
              HCONV hConv,
              HSZ hsz1,
              HSZ hsz2,
              HDDEDATA hData,
-             DWORD lData1,
-             DWORD lData2);
+             ULONG_PTR lData1,
+             ULONG_PTR lData2);
 
 // Add topic name to atom table before using in conversations
 static HSZ DDEAddAtom(const wxString& string);
@@ -149,9 +149,7 @@ extern void wxDDEInitialize()
     if ( !DDEInitialized )
     {
         // Should insert filter flags
-        PFNCALLBACK callback = (PFNCALLBACK)
-            MakeProcInstance((FARPROC)_DDECallback, wxGetInstance());
-        UINT rc = DdeInitialize(&DDEIdInst, callback, APPCLASS_STANDARD, 0L);
+        UINT rc = DdeInitialize(&DDEIdInst, _DDECallback, APPCLASS_STANDARD, 0L);
         if ( rc != DMLERR_NO_ERROR )
         {
             DDELogError(wxT("Failed to initialize DDE"), rc);
@@ -773,14 +771,14 @@ bool wxDDEConnection::DoAdvise(const wxString& item,
 #define DDERETURN HDDEDATA
 
 HDDEDATA EXPENTRY
-_DDECallback(WORD wType,
-             WORD wFmt,
+_DDECallback(UINT wType,
+             UINT wFmt,
              HCONV hConv,
              HSZ hsz1,
              HSZ hsz2,
              HDDEDATA hData,
-             DWORD WXUNUSED(lData1),
-             DWORD WXUNUSED(lData2))
+             ULONG_PTR WXUNUSED(lData1),
+             ULONG_PTR WXUNUSED(lData2))
 {
     switch (wType)
     {

From 7624e31a950a1ef584d1d9a61442f28cbf10d9e4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 28 May 2018 22:43:12 +0200
Subject: [PATCH 612/916] Stop passing WNDPROC argument to
 wxCheckWindowWndProc()

This parameter wasn't used anyhow and casting wxWndProc or m_oldWndProc
to WXFARPROC just resulted in gcc8 -Wcast-function-type warnings.

Get rid of them by not passing the window proc to this function at all.
---
 include/wx/msw/private.h | 5 ++++-
 src/msw/window.cpp       | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 1e4d0f8fcd..40f6bcf6e6 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -936,7 +936,10 @@ extern WXDLLIMPEXP_CORE int wxGetWindowId(WXHWND hWnd);
 
 // check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are
 // different
-extern WXDLLIMPEXP_CORE bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc);
+//
+// wndProc parameter is unused and only kept for compatibility
+extern WXDLLIMPEXP_CORE
+bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc = NULL);
 
 // Does this window style specify any border?
 inline bool wxStyleHasBorder(long style)
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index f55b8be586..db5e757c7f 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1252,7 +1252,7 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
 
     // we don't need to subclass the window of our own class (in the Windows
     // sense of the word)
-    if ( !wxCheckWindowWndProc(hWnd, (WXFARPROC)wxWndProc) )
+    if ( !wxCheckWindowWndProc(hWnd) )
     {
         wxSetWindowProc(hwnd, wxWndProc);
 
@@ -1289,7 +1289,7 @@ void wxWindowMSW::UnsubclassWin()
 
         if ( m_oldWndProc )
         {
-            if ( !wxCheckWindowWndProc((WXHWND)hwnd, m_oldWndProc) )
+            if ( !wxCheckWindowWndProc((WXHWND)hwnd) )
             {
                 wxSetWindowProc(hwnd, (WNDPROC)m_oldWndProc);
             }

From 4230cb24de770f36281efbfcdd6a93f39342a222 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 28 May 2018 23:10:13 +0200
Subject: [PATCH 613/916] Add WXWNDPROC typedef and use it in wxMSW instead of
 WXFARPROC

WNDPROC and FARPROC are not the same thing in MSW and it's wrong to use
WXFARPROC as the type of different window procedures we use.

Introduce WXWNDPROC which is more clear and correct and use it instead.

Also get rid of a few casts which are not necessary any longer.
---
 include/wx/defs.h         | 7 +++++++
 include/wx/msw/private.h  | 2 +-
 include/wx/msw/spinctrl.h | 4 ++--
 include/wx/msw/window.h   | 6 +++---
 src/msw/notebook.cpp      | 9 ++++-----
 src/msw/radiobox.cpp      | 4 ++--
 src/msw/spinctrl.cpp      | 3 +--
 src/msw/window.cpp        | 9 ++++-----
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1cb8ad1794..d483bf87dd 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2845,11 +2845,18 @@ typedef wxW64 long         WXLPARAM;
 typedef wxW64 long         WXLRESULT;
 #endif
 
+/*
+   This is defined for compatibility only, it's not really the same thing as
+   FARPROC.
+ */
 #if defined(__GNUWIN32__)
 typedef int             (*WXFARPROC)();
 #else
 typedef int             (__stdcall *WXFARPROC)();
 #endif
+
+typedef WXLRESULT (wxSTDCALL *WXWNDPROC)(WXHWND, WXUINT, WXWPARAM, WXLPARAM);
+
 #endif /*  __WIN32__ */
 
 
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 40f6bcf6e6..4cb366ee3e 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -939,7 +939,7 @@ extern WXDLLIMPEXP_CORE int wxGetWindowId(WXHWND hWnd);
 //
 // wndProc parameter is unused and only kept for compatibility
 extern WXDLLIMPEXP_CORE
-bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc = NULL);
+bool wxCheckWindowWndProc(WXHWND hWnd, WXWNDPROC wndProc = NULL);
 
 // Does this window style specify any border?
 inline bool wxStyleHasBorder(long style)
diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 85363bf57d..612ca4bba2 100644
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -100,7 +100,7 @@ public:
     // for internal use only
 
     // get the subclassed window proc of the buddy text
-    WXFARPROC GetBuddyWndProc() const { return m_wndProcBuddy; }
+    WXWNDPROC GetBuddyWndProc() const { return m_wndProcBuddy; }
 
     // return the spinctrl object whose buddy is the given window or NULL
     static wxSpinCtrl *GetSpinForTextCtrl(WXHWND hwndBuddy);
@@ -145,7 +145,7 @@ protected:
 
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;
-    WXFARPROC  m_wndProcBuddy;
+    WXWNDPROC  m_wndProcBuddy;
 
     // Block text update event after SetValue()
     bool m_blockEvent;
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 8ea5f8725d..dd8741dcd7 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -206,8 +206,8 @@ public:
     void SubclassWin(WXHWND hWnd);
     void UnsubclassWin();
 
-    WXFARPROC MSWGetOldWndProc() const { return m_oldWndProc; }
-    void MSWSetOldWndProc(WXFARPROC proc) { m_oldWndProc = proc; }
+    WXWNDPROC MSWGetOldWndProc() const { return m_oldWndProc; }
+    void MSWSetOldWndProc(WXWNDPROC proc) { m_oldWndProc = proc; }
 
     // return true if the window is of a standard (i.e. not wxWidgets') class
     //
@@ -597,7 +597,7 @@ protected:
     WXHWND                m_hWnd;
 
     // the old window proc (we subclass all windows)
-    WXFARPROC             m_oldWndProc;
+    WXWNDPROC             m_oldWndProc;
 
     // additional (MSW specific) flags
     bool                  m_mouseInWindow:1;
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 62fa2d61b3..21d3f7ab69 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -81,10 +81,10 @@
 #if USE_NOTEBOOK_ANTIFLICKER
 
 // the pointer to standard spin button wnd proc
-static WXFARPROC gs_wndprocNotebookSpinBtn = (WXFARPROC)NULL;
+static WXWNDPROC gs_wndprocNotebookSpinBtn = NULL;
 
 // the pointer to standard tab control wnd proc
-static WXFARPROC gs_wndprocNotebook = (WXFARPROC)NULL;
+static WXWNDPROC gs_wndprocNotebook = NULL;
 
 LRESULT APIENTRY
 wxNotebookWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
@@ -202,8 +202,7 @@ bool wxNotebook::Create(wxWindow *parent,
 
             if ( ::GetClassInfo(NULL, WC_TABCONTROL, &wc) )
             {
-                gs_wndprocNotebook =
-                    reinterpret_cast<WXFARPROC>(wc.lpfnWndProc);
+                gs_wndprocNotebook = wc.lpfnWndProc;
                 wc.lpszClassName = wxT("_wx_SysTabCtl32");
                 wc.style &= ~(CS_HREDRAW | CS_VREDRAW);
                 wc.hInstance = wxGetInstance();
@@ -996,7 +995,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
             {
                 // subclass the spin button to override WM_ERASEBKGND
                 if ( !gs_wndprocNotebookSpinBtn )
-                    gs_wndprocNotebookSpinBtn = (WXFARPROC)wxGetWindowProc(child);
+                    gs_wndprocNotebookSpinBtn = wxGetWindowProc(child);
 
                 wxSetWindowProc(child, wxNotebookSpinBtnWndProc);
                 m_hasSubclassedUpdown = true;
diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 7ed9d135ee..43a69bbc3e 100644
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -113,7 +113,7 @@ namespace
 {
 
 // the pointer to standard radio button wnd proc
-WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
+WXWNDPROC s_wndprocRadioBtn = NULL;
 
 // Hash allowing to find wxRadioBox containing the given radio button by its
 // HWND. This is used by (subclassed) radio button window proc to find the
@@ -298,7 +298,7 @@ void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
     HWND hwndBtn = (HWND)hWndBtn;
 
     if ( !s_wndprocRadioBtn )
-        s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);
+        s_wndprocRadioBtn = wxGetWindowProc(hwndBtn);
 
     wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
 
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index adc534b01a..1e4e09cd46 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -329,8 +329,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // subclass the text ctrl to be able to intercept some events
     gs_spinForTextCtrl[GetBuddyHwnd()] = this;
 
-    m_wndProcBuddy = (WXFARPROC)wxSetWindowProc(GetBuddyHwnd(),
-                                                wxBuddyTextWndProc);
+    m_wndProcBuddy = wxSetWindowProc(GetBuddyHwnd(), wxBuddyTextWndProc);
 
     // associate the text window with the spin button
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index db5e757c7f..2da6726752 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1248,7 +1248,7 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
 
     wxAssociateWinWithHandle(hwnd, this);
 
-    m_oldWndProc = (WXFARPROC)wxGetWindowProc((HWND)hWnd);
+    m_oldWndProc = wxGetWindowProc((HWND)hWnd);
 
     // we don't need to subclass the window of our own class (in the Windows
     // sense of the word)
@@ -1291,7 +1291,7 @@ void wxWindowMSW::UnsubclassWin()
         {
             if ( !wxCheckWindowWndProc((WXHWND)hwnd) )
             {
-                wxSetWindowProc(hwnd, (WNDPROC)m_oldWndProc);
+                wxSetWindowProc(hwnd, m_oldWndProc);
             }
 
             m_oldWndProc = NULL;
@@ -1322,8 +1322,7 @@ void wxWindowMSW::DissociateHandle()
 }
 
 
-bool wxCheckWindowWndProc(WXHWND hWnd,
-                          WXFARPROC WXUNUSED(wndProc))
+bool wxCheckWindowWndProc(WXHWND hWnd, WXWNDPROC WXUNUSED(wndProc))
 {
     const wxString str(wxGetWindowClass(hWnd));
 
@@ -2408,7 +2407,7 @@ WXLRESULT wxWindowMSW::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM l
 {
     WXLRESULT rc;
     if ( m_oldWndProc )
-        rc = ::CallWindowProc(CASTWNDPROC m_oldWndProc, GetHwnd(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+        rc = ::CallWindowProc(m_oldWndProc, GetHwnd(), nMsg, wParam, lParam);
     else
         rc = ::DefWindowProc(GetHwnd(), nMsg, wParam, lParam);
 

From 4d1145787b9c860f3eaa8b647ccde86bbcab1819 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 May 2018 23:25:15 +0200
Subject: [PATCH 614/916] Fix wxKeyboardHook() callback signature in Win64
 build

The callback must return LRESULT, which is 64 bits under Win64, not
int, which is still 32 bits.

This fixes a gcc8 -Wcast-function-type warning and might fix a real bug
in Win64 build too.
---
 src/msw/window.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 2da6726752..cd7e253ebe 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -6866,8 +6866,8 @@ extern wxWindow *wxGetWindowFromHWND(WXHWND hWnd)
 // in active frames and dialogs, regardless of where the focus is.
 static HHOOK wxTheKeyboardHook = 0;
 
-int APIENTRY
-wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
+LRESULT APIENTRY
+wxKeyboardHook(int nCode, WXWPARAM wParam, WXLPARAM lParam)
 {
     DWORD hiWord = HIWORD(lParam);
     if ( nCode != HC_NOREMOVE && ((hiWord & KF_UP) == 0) )
@@ -6934,7 +6934,7 @@ void wxSetKeyboardHook(bool doIt)
         wxTheKeyboardHook = ::SetWindowsHookEx
                               (
                                 WH_KEYBOARD,
-                                (HOOKPROC)wxKeyboardHook,
+                                wxKeyboardHook,
                                 NULL,   // must be NULL for process hook
                                 ::GetCurrentThreadId()
                               );

From ef26c969cb7594cf8d01b237eb3466780201d2dc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 May 2018 23:25:15 +0200
Subject: [PATCH 615/916] Use correct DLGPROC callback signature in Win64 build

The callback used with CreateDialogIndirect() must return INT_PTR, which
is 64 bits under Win64, not LONG, which is still 32 bits.

This fixes a gcc8 -Wcast-function-type warning and might fix a real bug
in Win64 build too.
---
 src/msw/nativdlg.cpp | 2 +-
 src/msw/toplevel.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index d11a4dd2b9..cdd058fe5f 100644
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -36,7 +36,7 @@
 // global functions
 // ---------------------------------------------------------------------------
 
-extern LONG APIENTRY
+extern INT_PTR APIENTRY
 wxDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
 // ===========================================================================
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 1d525d50f1..2d24bf92a5 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -51,7 +51,7 @@
 
 // NB: wxDlgProc must be defined here and not in dialog.cpp because the latter
 //     is not included by wxUniv build which does need wxDlgProc
-LONG APIENTRY
+INT_PTR APIENTRY
 wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 // ----------------------------------------------------------------------------
@@ -1242,7 +1242,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
 }
 
 // the DialogProc for all wxWidgets dialogs
-LONG APIENTRY
+INT_PTR APIENTRY
 wxDlgProc(HWND WXUNUSED(hDlg),
           UINT message,
           WPARAM WXUNUSED(wParam),

From f75bee21ec1409606f3a2c94b199b19217a717c6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 29 May 2018 13:34:57 +0200
Subject: [PATCH 616/916] Use correct function type pointers in
 wxQTMediaBackend code

This avoids gcc 8 -Wcast-function-type warnings while not being
obviously less (nor more...) correct than the old version.
---
 src/msw/mediactrl_qt.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp
index 5bc3e37c4a..906a23a439 100644
--- a/src/msw/mediactrl_qt.cpp
+++ b/src/msw/mediactrl_qt.cpp
@@ -160,6 +160,11 @@ enum
     mcWithFrame                 = 16
 };
 
+typedef void (*PPRMProcType)(Movie theMovie, OSErr theErr, void* theRefCon);
+typedef Boolean (*MCFilterProcType)(MovieController theController,
+                                    short action, void *params,
+                                    LONG_PTR refCon);
+
 //---------------------------------------------------------------------------
 //  QT Library
 //---------------------------------------------------------------------------
@@ -246,7 +251,7 @@ public:
     wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci))
     wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0)
 
-    wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) )
+    wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, PPRMProcType p1, void* p2), (m,t,r,p1,p2) )
     wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) )
     wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0)
     wxDL_METHOD_DEFINE(long, GetMovieLoadState, (Movie m), (m), 0)
@@ -263,7 +268,7 @@ public:
     wxDL_VOIDMETHOD_DEFINE(MCPositionController,
         (ComponentInstance ci, Rect* r, void* junk, void* morejunk), (ci,r,junk,morejunk))
     wxDL_VOIDMETHOD_DEFINE(MCSetActionFilterWithRefCon,
-        (ComponentInstance ci, WXFARPROC cb, void* ref), (ci,cb,ref))
+        (ComponentInstance ci, MCFilterProcType cb, void* ref), (ci,cb,ref))
     wxDL_VOIDMETHOD_DEFINE(MCGetControllerInfo, (MovieController mc, long* flags), (mc,flags))
     wxDL_VOIDMETHOD_DEFINE(BeginUpdate, (CGrafPtr port), (port))
     wxDL_VOIDMETHOD_DEFINE(UpdateMovie, (Movie m), (m))
@@ -805,8 +810,8 @@ bool wxQTMediaBackend::Load(const wxURI& location)
         // which we don't by default.
         //
         m_lib.PrePrerollMovie(m_movie, timeNow, playRate,
-                              (WXFARPROC)wxQTMediaBackend::PPRMProc,
-                              (void*)this);
+                              wxQTMediaBackend::PPRMProc,
+                              this);
 
         return true;
     }
@@ -1120,7 +1125,7 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
                                                         mcWithFrame);
             m_lib.MCDoAction(m_pMC, 32, (void*)true); // mcActionSetKeysEnabled
             m_lib.MCSetActionFilterWithRefCon(m_pMC,
-                (WXFARPROC)wxQTMediaBackend::MCFilterProc, (void*)this);
+                wxQTMediaBackend::MCFilterProc, this);
             m_bestSize.y += 16; // movie controller height
 
             // By default the movie controller uses its own colour palette

From 89b7c500fff052631002843c4408bc552267c184 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 28 May 2018 23:05:41 +0200
Subject: [PATCH 617/916] Use the same definitions of wx{Get,Set}WindowXXX() in
 Win{32,64}

By now all compilers/SDKs should hopefully have {Get,Set}WindowLongPtr()
and GWLP_XXX constants, so there is no reason to keep separate, and
differing by return type in wxGetWindowProc() case (oversight?),
versions of these functions for Win32 and Win64 builds.

Combine them in a single version appropriate for both cases.
---
 include/wx/msw/private.h | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 4cb366ee3e..8e10ccd170 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -1058,54 +1058,28 @@ inline void wxFillRect(HWND hwnd, HDC hdc, HBRUSH hbr)
 // 32/64 bit helpers
 // ----------------------------------------------------------------------------
 
-#ifdef __WIN64__
-
-inline void *wxGetWindowProc(HWND hwnd)
-{
-    return (void *)::GetWindowLongPtr(hwnd, GWLP_WNDPROC);
-}
-
-inline void *wxGetWindowUserData(HWND hwnd)
-{
-    return (void *)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
-}
-
-inline WNDPROC wxSetWindowProc(HWND hwnd, WNDPROC func)
-{
-    return (WNDPROC)::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)func);
-}
-
-inline void *wxSetWindowUserData(HWND hwnd, void *data)
-{
-    return (void *)::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
-}
-
-#else // __WIN32__
-
 // note that the casts to LONG_PTR here are required even on 32-bit machines
 // for the 64-bit warning mode of later versions of MSVC (C4311/4312)
 inline WNDPROC wxGetWindowProc(HWND hwnd)
 {
-    return (WNDPROC)(LONG_PTR)::GetWindowLong(hwnd, GWL_WNDPROC);
+    return (WNDPROC)(LONG_PTR)::GetWindowLongPtr(hwnd, GWLP_WNDPROC);
 }
 
 inline void *wxGetWindowUserData(HWND hwnd)
 {
-    return (void *)(LONG_PTR)::GetWindowLong(hwnd, GWL_USERDATA);
+    return (void *)(LONG_PTR)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
 }
 
 inline WNDPROC wxSetWindowProc(HWND hwnd, WNDPROC func)
 {
-    return (WNDPROC)(LONG_PTR)::SetWindowLong(hwnd, GWL_WNDPROC, (LONG_PTR)func);
+    return (WNDPROC)(LONG_PTR)::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)func);
 }
 
 inline void *wxSetWindowUserData(HWND hwnd, void *data)
 {
-    return (void *)(LONG_PTR)::SetWindowLong(hwnd, GWL_USERDATA, (LONG_PTR)data);
+    return (void *)(LONG_PTR)::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
 }
 
-#endif // __WIN64__/__WIN32__
-
 #endif // wxUSE_GUI && __WXMSW__
 
 #endif // _WX_PRIVATE_H_

From 2ec97b7bc6d562c0fb99b62a68bf3e12564c4de1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 29 May 2018 13:24:09 +0200
Subject: [PATCH 618/916] Remove useless border style check from
 wxVListBox::Create()

The comparison could never be true as wxDEFAULT is not one of
wxBORDER_XXX values and so is not included in wxBORDER_MASK and so was
useless -- and just results in -Wtautological-compare from gcc 8.

Simply remove this check, a047aff270905b377a81657a90f92eb3297157d0 added
it apparently to use themed border by default for wxVListBox, but this
was done in a better way in 28319afe559ccc061d15e5a5cb7208959f5c771e.
---
 src/generic/vlbox.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index 9efeccdaf7..4aabd378ad 100644
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -79,11 +79,6 @@ bool wxVListBox::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
-#ifdef __WXMSW__
-    if ( (style & wxBORDER_MASK) == wxDEFAULT )
-        style |= wxBORDER_THEME;
-#endif
-
     style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;
     if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) )
         return false;

From a17a8f667fc04099d9b9760efe97413a06aa70b8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 29 May 2018 13:28:59 +0200
Subject: [PATCH 619/916] Use wxZeroMemory() rather than memset() for clearing
 struct fields

This does the same thing but avoids gcc 8 -Wclass-memaccess warning
(harmless in this case, but potentially useful elsewhere, so it seems
better to work around rather than disable it).
---
 src/msw/taskbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 22583439bf..976f5e9197 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -92,7 +92,7 @@ struct NotifyIconData : public NOTIFYICONDATA
 {
     NotifyIconData(WXHWND hwnd)
     {
-        memset(this, 0, sizeof(NOTIFYICONDATA));
+        wxZeroMemory(*this);
 
         // Since Vista there is a new member hBalloonIcon which will be used
         // if a user specified icon is specified in ShowBalloon(). For XP 

From cc56eed564f3135a21aa0e429998fe45826fbf5c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 27 May 2018 23:21:36 +0200
Subject: [PATCH 620/916] Avoid gcc8 -Wcast-function-type in hash map macros in
 Win64 build

BucketFromNode typedef must be defined as a function returning size_t,
as GetBucketForNode() method in the classes generated by hash map macros
does, to avoid warnings about bad function pointer casts in Win64 build,
where size_t is not the same thing as "unsigned long".
---
 include/wx/hashmap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 371407e5a9..6289331e32 100644
--- a/include/wx/hashmap.h
+++ b/include/wx/hashmap.h
@@ -81,7 +81,7 @@ class WXDLLIMPEXP_BASE _wxHashTableBase2
 {
 public:
     typedef void (*NodeDtor)(_wxHashTable_NodeBase*);
-    typedef unsigned long (*BucketFromNode)(_wxHashTableBase2*,_wxHashTable_NodeBase*);
+    typedef size_t (*BucketFromNode)(_wxHashTableBase2*,_wxHashTable_NodeBase*);
     typedef _wxHashTable_NodeBase* (*ProcessNode)(_wxHashTable_NodeBase*);
 protected:
     static _wxHashTable_NodeBase* DummyProcessNode(_wxHashTable_NodeBase* node);

From ed01fede2e1d3b809d60275518dcb2f869aaa36c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 29 May 2018 13:57:30 +0200
Subject: [PATCH 621/916] Add helper macros for suppressing gcc 8
 -Wcast-function-type

These warnings are unavoidable in a few places, and testing for gcc
version and suppressing them is too verbose, so define helper macros
making it a bit less painful.
---
 include/wx/defs.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index d483bf87dd..909aade4d5 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -667,6 +667,17 @@ typedef short int WXTYPE;
 #   define wxGCC_WARNING_RESTORE(x)
 #endif
 
+/* Specific macros for -Wcast-function-type warning new in gcc 8. */
+#if wxCHECK_GCC_VERSION(8, 0)
+    #define wxGCC_WARNING_SUPPRESS_CAST_FUNCTION_TYPE() \
+        wxGCC_WARNING_SUPPRESS(cast-function-type)
+    #define wxGCC_WARNING_RESTORE_CAST_FUNCTION_TYPE() \
+        wxGCC_WARNING_RESTORE(cast-function-type)
+#else
+    #define wxGCC_WARNING_SUPPRESS_CAST_FUNCTION_TYPE()
+    #define wxGCC_WARNING_RESTORE_CAST_FUNCTION_TYPE()
+#endif
+
 /*
    Macros to suppress and restore clang warning only when it is valid.
 

From 1abdac656623776d6821ab8a1dcaa59793898069 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 29 May 2018 13:48:14 +0200
Subject: [PATCH 622/916] Work around gcc 8 -Wcast-function-type in wxMSW
 wxGLContext

Casts between incompatible function types seem to be unavoidable here,
as wglGetProcAddress() always returns generic PROC type, so just
suppress the warnings temporarily.
---
 src/msw/glcanvas.cpp | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index a942585bff..b5fd506d77 100644
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -147,8 +147,24 @@ wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 #define WGL_CONTEXT_ES_PROFILE_BIT_EXT            0x00000004
 #endif
 
-typedef HGLRC(WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC)
-    (HDC hDC, HGLRC hShareContext, const int *attribList);
+// This helper function only exists to suppress unavoidable gcc 8 warnings
+// about incompatible function casts.
+template <typename T>
+inline T wxWGLProcCast(PROC proc)
+{
+    wxGCC_WARNING_SUPPRESS_CAST_FUNCTION_TYPE()
+
+    return reinterpret_cast<T>(proc);
+
+    wxGCC_WARNING_RESTORE_CAST_FUNCTION_TYPE()
+}
+
+// this macro defines a variable of type "name_t" called "name" and initializes
+// it with the pointer to WGL function "name" (which may be NULL)
+//
+// NB: type name_t must be defined by the code using the macro
+#define wxDEFINE_WGL_FUNC(name) \
+    name##_t name = wxWGLProcCast<name##_t>(wglGetProcAddress(#name))
 
 // ----------------------------------------------------------------------------
 // libraries
@@ -580,9 +596,11 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
     wxCHECK_RET( tempContext, "wglCreateContext failed!" );
 
     wglMakeCurrent(win->GetHDC(), tempContext);
-    PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB
-            = (PFNWGLCREATECONTEXTATTRIBSARBPROC)
-            wglGetProcAddress("wglCreateContextAttribsARB");
+
+    typedef HGLRC(WINAPI * wglCreateContextAttribsARB_t)
+        (HDC hDC, HGLRC hShareContext, const int *attribList);
+
+    wxDEFINE_WGL_FUNC(wglCreateContextAttribsARB);
     wglMakeCurrent(win->GetHDC(), NULL);
     wglDeleteContext(tempContext);
 
@@ -810,11 +828,6 @@ bool wxGLCanvas::SwapBuffers()
 }
 
 
-// this macro defines a variable of type "name_t" called "name" and initializes
-// it with the pointer to WGL function "name" (which may be NULL)
-#define wxDEFINE_WGL_FUNC(name) \
-    name##_t name = (name##_t)wglGetProcAddress(#name)
-
 /* static */
 bool wxGLCanvasBase::IsExtensionSupported(const char *extension)
 {

From bec3cf6387c6c2eb45552caf58df6809b5bd0a1e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 29 May 2018 15:39:26 +0200
Subject: [PATCH 623/916] Work around gcc 8 -Wcast-function-type in event table
 macros

Suppress the warnings about formally incorrect but working in practice
cast from an event handler taking an object of a class derived from
wxEvent to wxEventFunction, i.e. a handler taking just wxEvent itself.
---
 include/wx/event.h | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/include/wx/event.h b/include/wx/event.h
index a46f11f943..21fa3924c7 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -81,9 +81,9 @@ typedef int wxEventType;
 
 #define wxEVT_ANY           ((wxEventType)-1)
 
-// this is used to make the event table entry type safe, so that for an event
-// handler only a function with proper parameter list can be given. See also
-// the wxEVENT_HANDLER_CAST-macro.
+// This macro exists for compatibility only (even though it was never public,
+// it still appears in some code using wxWidgets), see public
+// wxEVENT_HANDLER_CAST instead.
 #define wxStaticCastEvent(type, val) static_cast<type>(val)
 
 #define wxDECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
@@ -122,10 +122,30 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
 #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \
     extern const expdecl wxEventTypeTag< type > name
 
-// Try to cast the given event handler to the correct handler type:
+// The type-erased method signature used for event handling.
+typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
 
+template <typename T>
+inline wxEventFunction wxEventFunctionCast(void (wxEvtHandler::*func)(T&))
+{
+    // There is no going around the cast here: we do rely calling the event
+    // handler method, which takes a reference to an object of a class derived
+    // from wxEvent, as if it took wxEvent itself. On all platforms supported
+    // by wxWidgets, this cast is harmless, but it's not a valid cast in C++
+    // and gcc 8 started giving warnings about this (with -Wextra), so suppress
+    // them locally to avoid generating hundreds of them when compiling any
+    // code using event table macros.
+
+    wxGCC_WARNING_SUPPRESS_CAST_FUNCTION_TYPE()
+
+    return reinterpret_cast<wxEventFunction>(func);
+
+    wxGCC_WARNING_RESTORE_CAST_FUNCTION_TYPE()
+}
+
+// Try to cast the given event handler to the correct handler type:
 #define wxEVENT_HANDLER_CAST( functype, func ) \
-    ( wxObjectEventFunction )( wxEventFunction )wxStaticCastEvent( functype, &func )
+    wxEventFunctionCast(static_cast<functype>(&func))
 
 
 // The tag is a type associated to the event type (which is an integer itself,
@@ -150,9 +170,6 @@ private:
     wxEventType m_type;
 };
 
-// These are needed for the functor definitions
-typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
-
 // We had some trouble with using wxEventFunction
 // in the past so we had introduced wxObjectEventFunction which
 // used to be a typedef for a member of wxObject and not wxEvtHandler to work
@@ -295,8 +312,8 @@ struct HandlerImpl<T, A, true>
     static wxEvtHandler *ConvertToEvtHandler(T *p)
         { return p; }
     static wxEventFunction ConvertToEvtMethod(void (T::*f)(A&))
-        { return static_cast<wxEventFunction>(
-                    reinterpret_cast<void (T::*)(wxEvent&)>(f)); }
+        { return wxEventFunctionCast(
+                    static_cast<void (wxEvtHandler::*)(A&)>(f)); }
 };
 
 // specialization for handlers not deriving from wxEvtHandler

From 546604ab559abc5581b8b4934eadbdadb607b3d8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Jun 2018 23:27:38 +0200
Subject: [PATCH 624/916] Fix wrong function pointer casts in dynamic arrays
 code

Don't cast function pointers of incompatible types, this resulted in gcc
8 -Wcast-function-type warnings and could hide real errors.

Use normal, taking elements by value, sort function for in wxBaseArray
methods used by the sorted arrays only and provide Sort() overloads for
both this sort function variant and the compatible with qsort() one
taking pointers to the elements.
---
 include/wx/dynarray.h | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index fa52765dd3..d7adffbd35 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -44,6 +44,11 @@ typedef int (wxCMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2);
 // Array class providing legacy dynamic arrays API on top of wxVector<>
 // ----------------------------------------------------------------------------
 
+// For some reasons lost in the depths of time, sort functions with different
+// signatures are used to sort normal arrays and to keep sorted arrays sorted.
+// These two functors can be used as predicates with std::sort() adapting the
+// sort function to it, whichever signature it uses.
+
 template<class T>
 class wxArray_SortFunction
 {
@@ -52,7 +57,7 @@ public:
 
     wxArray_SortFunction(CMPFUNC f) : m_f(f) { }
     bool operator()(const T& i1, const T& i2)
-      { return m_f((T*)&i1, (T*)&i2) < 0; }
+      { return m_f(const_cast<T*>(&i1), const_cast<T*>(&i2)) < 0; }
 private:
     CMPFUNC m_f;
 };
@@ -74,9 +79,9 @@ template <typename T>
 class wxBaseArray : public wxVector<T>
 {
     typedef wxSortedArray_SortFunction<T> Predicate;
-    typedef int (wxCMPFUNC_CONV *SCMPFUNC)(T, T);
 
 public:
+    typedef typename Predicate::CMPFUNC SCMPFUNC;
     typedef typename wxArray_SortFunction<T>::CMPFUNC CMPFUNC;
 
     typedef wxVector<T> base_vec;
@@ -151,17 +156,17 @@ public:
         return wxNOT_FOUND;
     }
 
-    int Index(T lItem, CMPFUNC fnCompare) const
+    int Index(T lItem, SCMPFUNC fnCompare) const
     {
-        Predicate p((SCMPFUNC)fnCompare);
+        Predicate p(fnCompare);
         const_iterator i = std::lower_bound(this->begin(), this->end(), lItem, p);
         return i != this->end() && !p(lItem, *i) ? (int)(i - this->begin())
                                                  : wxNOT_FOUND;
     }
 
-    size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const
+    size_t IndexForInsert(T lItem, SCMPFUNC fnCompare) const
     {
-        Predicate p((SCMPFUNC)fnCompare);
+        Predicate p(fnCompare);
         const_iterator i = std::lower_bound(this->begin(), this->end(), lItem, p);
         return i - this->begin();
     }
@@ -171,7 +176,7 @@ public:
         this->insert(this->end(), nInsert, lItem);
     }
 
-    size_t Add(T lItem, CMPFUNC fnCompare)
+    size_t Add(T lItem, SCMPFUNC fnCompare)
     {
         size_t n = IndexForInsert(lItem, fnCompare);
         Insert(lItem, n);
@@ -200,6 +205,12 @@ public:
         wxArray_SortFunction<T> p(fCmp);
         std::sort(this->begin(), this->end(), p);
     }
+
+    void Sort(SCMPFUNC fCmp)
+    {
+        Predicate p(fCmp);
+        std::sort(this->begin(), this->end(), p);
+    }
 };
 
 // ============================================================================
@@ -223,8 +234,6 @@ public:
 template <typename T, typename Cmp>
 class wxBaseSortedArray : public wxBaseArray<T>
 {
-    typedef typename wxBaseArray<T>::CMPFUNC CMPFUNC;
-
 public:
     explicit wxBaseSortedArray(Cmp fn) : m_fnCompare(fn) { }
 
@@ -237,7 +246,7 @@ public:
 
     size_t IndexForInsert(T item) const
     {
-        return this->wxBaseArray<T>::IndexForInsert(item, (CMPFUNC)m_fnCompare);
+        return this->wxBaseArray<T>::IndexForInsert(item, m_fnCompare);
     }
 
     void AddAt(T item, size_t index)
@@ -247,7 +256,7 @@ public:
 
     size_t Add(T item)
     {
-        return this->wxBaseArray<T>::Add(item, (CMPFUNC)m_fnCompare);
+        return this->wxBaseArray<T>::Add(item, m_fnCompare);
     }
 
     void push_back(T item)

From bc92ed9d854c504aa77c0dc2af194c45eab65f5e Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Sun, 3 Jun 2018 17:18:59 -0400
Subject: [PATCH 625/916] Replace wxUSE_GENERICDATAVIEWCTRL with
 wxHAS_GENERIC_DATAVIEWCTRL

The former symbol is inconsistent with all the other wxUSE_XXX ones and
hence confusing and kept only for compatibility reasons.

Closes https://github.com/wxWidgets/wxWidgets/pull/827
---
 src/common/datavcmn.cpp  | 4 ++--
 src/generic/datavgen.cpp | 4 ++--
 src/gtk/dataview.cpp     | 4 ++--
 src/osx/dataview_osx.cpp | 4 ++--
 src/qt/dataview.cpp      | 4 ++--
 src/qt/dvrenderer.cpp    | 4 ++--
 src/qt/dvrenderers.cpp   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 4418351686..1c3609261e 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -728,7 +728,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
     m_editorCtrl->PushEventHandler( handler );
 
-#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
+#if defined(__WXGTK20__) && !defined(wxHAS_GENERIC_DATAVIEWCTRL)
     handler->SetFocusOnIdle();
 #else
     m_editorCtrl->SetFocus();
@@ -3050,7 +3050,7 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
 
 void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
 {
-#if defined(wxUSE_GENERICDATAVIEWCTRL)
+#if defined(wxHAS_GENERIC_DATAVIEWCTRL)
     // automatically resize our only column to take the entire control width
     if ( GetColumnCount() )
     {
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 982947dedf..5c45bd7409 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -18,7 +18,7 @@
 
 #include "wx/dataview.h"
 
-#ifdef wxUSE_GENERICDATAVIEWCTRL
+#ifdef wxHAS_GENERIC_DATAVIEWCTRL
 
 #ifndef WX_PRECOMP
     #ifdef __WXMSW__
@@ -6782,6 +6782,6 @@ wxAccStatus wxDataViewCtrlAccessible::GetSelections(wxVariant* selections)
 }
 #endif // wxUSE_ACCESSIBILITY
 
-#endif // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxHAS_GENERIC_DATAVIEWCTRL
 
 #endif // wxUSE_DATAVIEWCTRL
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 8c87aee3ee..2715737b86 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/dataview.h"
 
-#ifndef wxUSE_GENERICDATAVIEWCTRL
+#ifndef wxHAS_GENERIC_DATAVIEWCTRL
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
@@ -5313,6 +5313,6 @@ void wxDataViewCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
     GTKApplyStyle(m_treeview, style);
 }
 
-#endif // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxHAS_GENERIC_DATAVIEWCTRL
 
 #endif // wxUSE_DATAVIEWCTRL
diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index 5cbce08115..f49a360dc6 100644
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/dataview.h"
 
-#ifndef wxUSE_GENERICDATAVIEWCTRL
+#ifndef wxHAS_GENERIC_DATAVIEWCTRL
 
 #include <limits>
 
@@ -750,6 +750,6 @@ wxBEGIN_EVENT_TABLE(wxDataViewCtrl,wxDataViewCtrlBase)
   EVT_MOTION(wxDataViewCtrl::OnMouse)
 wxEND_EVENT_TABLE()
 
-#endif // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxHAS_GENERIC_DATAVIEWCTRL
 
 #endif // wxUSE_DATAVIEWCTRL
diff --git a/src/qt/dataview.cpp b/src/qt/dataview.cpp
index fc1aa181ed..1b16d555e8 100644
--- a/src/qt/dataview.cpp
+++ b/src/qt/dataview.cpp
@@ -12,7 +12,7 @@
 
 #include "wx/dataview.h"
 
-#ifndef wxUSE_GENERICDATAVIEWCTRL
+#ifndef wxHAS_GENERIC_DATAVIEWCTRL
 
 wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
                   unsigned int model_column, int width,
@@ -316,6 +316,6 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
 {
 }
 
-#endif // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxHAS_GENERIC_DATAVIEWCTRL
 
 #endif // wxUSE_DATAVIEWCTRL
diff --git a/src/qt/dvrenderer.cpp b/src/qt/dvrenderer.cpp
index a960b18e32..c6e6b29202 100644
--- a/src/qt/dvrenderer.cpp
+++ b/src/qt/dvrenderer.cpp
@@ -12,7 +12,7 @@
 
 #include "wx/dataview.h"
 
-#ifndef wxUSE_GENERICDATAVIEWCTRL
+#ifndef wxHAS_GENERIC_DATAVIEWCTRL
 
 wxDataViewRenderer::wxDataViewRenderer( const wxString &variantType,
                     wxDataViewCellMode mode,
@@ -48,6 +48,6 @@ wxEllipsizeMode wxDataViewRenderer::GetEllipsizeMode() const
     return wxEllipsizeMode();
 }
 
-#endif // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxHAS_GENERIC_DATAVIEWCTRL
 
 #endif // wxUSE_DATAVIEWCTRL
diff --git a/src/qt/dvrenderers.cpp b/src/qt/dvrenderers.cpp
index 6afc6a415c..c552325f83 100644
--- a/src/qt/dvrenderers.cpp
+++ b/src/qt/dvrenderers.cpp
@@ -12,7 +12,7 @@
 
 #include "wx/dataview.h"
 
-#ifndef wxUSE_GENERICDATAVIEWCTRL
+#ifndef wxHAS_GENERIC_DATAVIEWCTRL
 
 wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype,
                         wxDataViewCellMode mode,
@@ -256,6 +256,6 @@ void wxDataViewChoiceRenderer::SetAlignment( int align )
 
 }
 
-#endif // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxHAS_GENERIC_DATAVIEWCTRL
 
 #endif // wxUSE_DATAVIEWCTRL

From 102be6a3cc3a47298ec6fb486ced1e55852758d3 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Tue, 5 Jun 2018 09:21:25 -0700
Subject: [PATCH 626/916] Add GtkStyleContext helper class

Manages ownership of GtkStyleContext and GtkWidgetPath, provides functions
for creating and querying style contexts.
---
 include/wx/gtk/private/stylecontext.h |  46 ++++
 src/gtk/renderer.cpp                  | 152 ++----------
 src/gtk/settings.cpp                  | 319 ++++++++++++--------------
 3 files changed, 211 insertions(+), 306 deletions(-)
 create mode 100644 include/wx/gtk/private/stylecontext.h

diff --git a/include/wx/gtk/private/stylecontext.h b/include/wx/gtk/private/stylecontext.h
new file mode 100644
index 0000000000..a81ac3823e
--- /dev/null
+++ b/include/wx/gtk/private/stylecontext.h
@@ -0,0 +1,46 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/stylecontext.h
+// Purpose:     GtkStyleContext helper class
+// Author:      Paul Cornett
+// Created:     2018-06-04
+// Copyright:   (c) 2018 Paul Cornett
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_STYLECONTEXT_H_
+#define _WX_GTK_PRIVATE_STYLECONTEXT_H_
+
+#ifdef __WXGTK3__
+
+class wxGtkStyleContext
+{
+public:
+    wxGtkStyleContext();
+    ~wxGtkStyleContext();
+    wxGtkStyleContext& Add(GType type, const char* objectName, ...) G_GNUC_NULL_TERMINATED;
+    wxGtkStyleContext& Add(const char* objectName);
+    wxGtkStyleContext& AddButton();
+    wxGtkStyleContext& AddCheckButton();
+    wxGtkStyleContext& AddHeaderbar();
+    wxGtkStyleContext& AddLabel();
+    wxGtkStyleContext& AddMenu();
+    wxGtkStyleContext& AddMenuItem();
+    wxGtkStyleContext& AddTextview(const char* child1 = NULL, const char* child2 = NULL);
+    wxGtkStyleContext& AddTooltip();
+    wxGtkStyleContext& AddTreeview();
+    wxGtkStyleContext& AddTreeviewHeaderButton(int pos);
+    wxGtkStyleContext& AddWindow(const char* className2 = NULL);
+    void Bg(wxColour& color, int state = GTK_STATE_FLAG_NORMAL) const;
+    void Fg(wxColour& color, int state = GTK_STATE_FLAG_NORMAL) const;
+    void Border(wxColour& color) const;
+    operator GtkStyleContext*() { return m_context; }
+
+private:
+    GtkStyleContext* m_context;
+    GtkWidgetPath* const m_path;
+
+    wxDECLARE_NO_COPY_CLASS(wxGtkStyleContext);
+};
+
+#endif // __WXGTK3__
+#endif // _WX_GTK_PRIVATE_STYLECONTEXT_H_
diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index ef0636771e..47aa1978a8 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -38,6 +38,7 @@
 #endif
 
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/stylecontext.h"
 
 #if defined(__WXGTK3__) && !GTK_CHECK_VERSION(3,14,0)
     #define GTK_STATE_FLAG_CHECKED (1 << 11)
@@ -230,58 +231,18 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
 #if GTK_CHECK_VERSION(3,20,0)
     if (gtk_check_version(3,20,0) == NULL)
     {
-        GtkWidgetPath* path = gtk_widget_path_new();
-        GtkStyleContext* parent;
-        GtkStyleContext* sc = gtk_style_context_new();
-
-        gtk_widget_path_append_type(path, GTK_TYPE_WINDOW);
-        gtk_widget_path_iter_set_object_name(path, -1, "window");
-        gtk_widget_path_iter_add_class(path, -1, "background");
-        gtk_style_context_set_path(sc, path);
-
-        parent = sc;
-        sc = gtk_style_context_new();
-        gtk_widget_path_append_type(path, GTK_TYPE_TREE_VIEW);
-        gtk_widget_path_iter_set_object_name(path, -1, "treeview");
-        gtk_widget_path_iter_add_class(path, -1, "view");
-        gtk_style_context_set_path(sc, path);
-        gtk_style_context_set_parent(sc, parent);
-        g_object_unref(parent);
-
-        parent = sc;
-        sc = gtk_style_context_new();
-        gtk_widget_path_append_type(path, G_TYPE_NONE);
-        gtk_widget_path_iter_set_object_name(path, -1, "header");
-        gtk_style_context_set_path(sc, path);
-        gtk_style_context_set_parent(sc, parent);
-        g_object_unref(parent);
-
-        parent = sc;
-        sc = gtk_style_context_new();
         int pos = 1;
         if (flags & wxCONTROL_SPECIAL)
             pos = 0;
         if (flags & wxCONTROL_DIRTY)
             pos = 2;
-        GtkWidgetPath* siblings = gtk_widget_path_new();
-        gtk_widget_path_append_type(siblings, GTK_TYPE_BUTTON);
-        gtk_widget_path_iter_set_object_name(siblings, -1, "button");
-        gtk_widget_path_append_type(siblings, GTK_TYPE_BUTTON);
-        gtk_widget_path_iter_set_object_name(siblings, -1, "button");
-        gtk_widget_path_append_type(siblings, GTK_TYPE_BUTTON);
-        gtk_widget_path_iter_set_object_name(siblings, -1, "button");
-        gtk_widget_path_append_with_siblings(path, siblings, pos);
-        gtk_widget_path_unref(siblings);
-        gtk_style_context_set_path(sc, path);
-        gtk_style_context_set_parent(sc, parent);
-        g_object_unref(parent);
-        gtk_widget_path_unref(path);
+
+        wxGtkStyleContext sc;
+        sc.AddTreeviewHeaderButton(pos);
 
         gtk_style_context_set_state(sc, stateTypeToFlags[state]);
         gtk_render_background(sc, cr, rect.x - x_diff, rect.y, rect.width, rect.height);
         gtk_render_frame(sc, cr, rect.x - x_diff, rect.y, rect.width, rect.height);
-
-        g_object_unref(sc);
     }
     else
 #endif
@@ -477,36 +438,14 @@ wxRendererGTK::DrawSplitterSash(wxWindow* win,
         x_diff = rect.width;
 
 #ifdef __WXGTK3__
-    GtkWidgetPath* path = gtk_widget_path_new();
-    GtkStyleContext* sc = gtk_style_context_new();
-    GtkStyleContext* sc1 = NULL;
-    gtk_widget_path_append_type(path, GTK_TYPE_PANED);
-#if GTK_CHECK_VERSION(3,20,0)
+    wxGtkStyleContext sc;
+    sc.Add(GTK_TYPE_PANED, "paned", "pane-separator", NULL);
     if (gtk_check_version(3,20,0) == NULL)
-    {
-        gtk_widget_path_iter_set_object_name(path, -1, "paned");
-        sc1 = gtk_style_context_new();
-        gtk_style_context_set_path(sc1, path);
-        gtk_widget_path_append_type(path, G_TYPE_NONE);
-        gtk_widget_path_iter_set_object_name(path, -1, "separator");
-        gtk_style_context_set_path(sc, path);
-        gtk_style_context_set_parent(sc, sc1);
-    }
-    else
-#endif
-    {
-        gtk_widget_path_iter_add_class(path, -1, GTK_STYLE_CLASS_PANE_SEPARATOR);
-        gtk_style_context_set_path(sc, path);
-    }
+        sc.Add("separator");
 
     gtk_style_context_set_state(sc,
         flags & wxCONTROL_CURRENT ? GTK_STATE_FLAG_PRELIGHT : GTK_STATE_FLAG_NORMAL);
     gtk_render_handle(sc, drawable, rect.x - x_diff, rect.y, rect.width, rect.height);
-
-    gtk_widget_path_unref(path);
-    g_object_unref(sc);
-    if (sc1)
-        g_object_unref(sc1);
 #else
     GdkWindow* gdk_window = wxGetGTKDrawable(win, dc);
     if (gdk_window == NULL)
@@ -605,20 +544,11 @@ wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win))
 {
 #ifdef __WXGTK3__
     int min_width, min_height;
-    GtkWidgetPath* path = gtk_widget_path_new();
-    GtkStyleContext* sc = gtk_style_context_new();
-    GtkStyleContext* sc1 = NULL;
-    gtk_widget_path_append_type(path, GTK_TYPE_CHECK_BUTTON);
-#if GTK_CHECK_VERSION(3,20,0)
+    wxGtkStyleContext sc;
+    sc.AddCheckButton();
     if (gtk_check_version(3,20,0) == NULL)
     {
-        gtk_widget_path_iter_set_object_name(path, -1, "checkbutton");
-        sc1 = gtk_style_context_new();
-        gtk_style_context_set_path(sc1, path);
-        gtk_widget_path_append_type(path, G_TYPE_NONE);
-        gtk_widget_path_iter_set_object_name(path, -1, "check");
-        gtk_style_context_set_path(sc, path);
-        gtk_style_context_set_parent(sc, sc1);
+        sc.Add("check");
         gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL,
             "min-width", &min_width, "min-height", &min_height, NULL);
         GtkBorder margin;
@@ -627,9 +557,7 @@ wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win))
         min_height += margin.top + margin.bottom;
     }
     else
-#endif
     {
-        gtk_style_context_set_path(sc, path);
         GValue value = G_VALUE_INIT;
         g_value_init(&value, G_TYPE_INT);
         gtk_style_context_get_style_property(sc, "indicator-size", &value);
@@ -639,10 +567,6 @@ wxRendererGTK::GetCheckBoxSize(wxWindow *WXUNUSED(win))
         min_height = min_width;
         g_value_unset(&value);
     }
-    gtk_widget_path_unref(path);
-    g_object_unref(sc);
-    if (sc1)
-        g_object_unref(sc1);
 
     return wxSize(min_width, min_height);
 #else // !__WXGTK3__
@@ -713,27 +637,16 @@ wxRendererGTK::DrawCheckBox(wxWindow* win,
         state |= GTK_STATE_FLAG_PRELIGHT;
 
     int min_width, min_height;
-    GtkWidgetPath* path = gtk_widget_path_new();
-    GtkStyleContext* sc = gtk_style_context_new();
-    GtkStyleContext* sc1 = NULL;
-    gtk_widget_path_append_type(path, GTK_TYPE_CHECK_BUTTON);
-#if GTK_CHECK_VERSION(3,20,0)
+    wxGtkStyleContext sc;
+    sc.AddCheckButton();
     if (gtk_check_version(3,20,0) == NULL)
     {
-        gtk_widget_path_iter_set_object_name(path, -1, "checkbutton");
-        sc1 = gtk_style_context_new();
-        gtk_style_context_set_path(sc1, path);
-        gtk_widget_path_append_type(path, G_TYPE_NONE);
-        gtk_widget_path_iter_set_object_name(path, -1, "check");
-        gtk_style_context_set_path(sc, path);
-        gtk_style_context_set_parent(sc, sc1);
+        sc.Add("check");
         gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL,
             "min-width", &min_width, "min-height", &min_height, NULL);
     }
     else
-#endif
     {
-        gtk_style_context_set_path(sc, path);
         GValue value = G_VALUE_INIT;
         g_value_init(&value, G_TYPE_INT);
         gtk_style_context_get_style_property(sc, "indicator-size", &value);
@@ -752,11 +665,6 @@ wxRendererGTK::DrawCheckBox(wxWindow* win,
     gtk_style_context_add_class(sc, "check");
     gtk_render_check(sc, cr, x, y, min_width, min_height);
     gtk_style_context_restore(sc);
-
-    gtk_widget_path_unref(path);
-    g_object_unref(sc);
-    if (sc1)
-        g_object_unref(sc1);
 #else
     GdkWindow* gdk_window = wxGetGTKDrawable(win, dc);
     if (gdk_window == NULL)
@@ -923,22 +831,12 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
     if (flags & wxCONTROL_DISABLED)
         state = GTK_STATE_FLAG_INSENSITIVE;
 
-    GtkWidgetPath* path = gtk_widget_path_new();
-    GtkStyleContext* sc = gtk_style_context_new();
-    gtk_widget_path_append_type(path, GTK_TYPE_ENTRY);
-#if GTK_CHECK_VERSION(3,20,0)
-    if (gtk_check_version(3,20,0) == NULL)
-        gtk_widget_path_iter_set_object_name(path, -1, "entry");
-#endif
-    gtk_widget_path_iter_add_class(path, -1, "entry");
-    gtk_style_context_set_path(sc, path);
+    wxGtkStyleContext sc;
+    sc.Add(GTK_TYPE_ENTRY, "entry", "entry", NULL);
 
     gtk_style_context_set_state(sc, GtkStateFlags(state));
     gtk_render_background(sc, drawable, rect.x, rect.y, rect.width, rect.height);
     gtk_render_frame(sc, drawable, rect.x, rect.y, rect.width, rect.height);
-
-    gtk_widget_path_unref(path);
-    g_object_unref(sc);
 #else
     GtkWidget* entry = wxGTKPrivate::GetTextEntryWidget();
 
@@ -1082,27 +980,18 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect,
         state |= GTK_STATE_FLAG_PRELIGHT;
 
     int min_width, min_height;
-    GtkWidgetPath* path = gtk_widget_path_new();
-    GtkStyleContext* sc = gtk_style_context_new();
-    GtkStyleContext* sc1 = NULL;
-    gtk_widget_path_append_type(path, GTK_TYPE_RADIO_BUTTON);
+    wxGtkStyleContext sc;
+    sc.Add(GTK_TYPE_RADIO_BUTTON, "radiobutton", NULL);
 #if GTK_CHECK_VERSION(3,20,0)
     if (gtk_check_version(3,20,0) == NULL)
     {
-        gtk_widget_path_iter_set_object_name(path, -1, "radiobutton");
-        sc1 = gtk_style_context_new();
-        gtk_style_context_set_path(sc1, path);
-        gtk_widget_path_append_type(path, G_TYPE_NONE);
-        gtk_widget_path_iter_set_object_name(path, -1, "radio");
-        gtk_style_context_set_path(sc, path);
-        gtk_style_context_set_parent(sc, sc1);
+        sc.Add("radio");
         gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL,
             "min-width", &min_width, "min-height", &min_height, NULL);
     }
     else
 #endif
     {
-        gtk_style_context_set_path(sc, path);
         GValue value = G_VALUE_INIT;
         g_value_init(&value, G_TYPE_INT);
         gtk_style_context_get_style_property(sc, "indicator-size", &value);
@@ -1121,11 +1010,6 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect,
     gtk_style_context_add_class(sc, "radio");
     gtk_render_option(sc, drawable, x, y, min_width, min_height);
     gtk_style_context_restore(sc);
-
-    gtk_widget_path_unref(path);
-    g_object_unref(sc);
-    if (sc1)
-        g_object_unref(sc1);
 #else
     GtkWidget* button = wxGTKPrivate::GetRadioButtonWidget();
 
diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index 3178897be1..d5859dc069 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -23,6 +23,7 @@
 #include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/gtk3-compat.h"
 #include "wx/gtk/private/win_gtk.h"
+#include "wx/gtk/private/stylecontext.h"
 
 bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);
 
@@ -192,60 +193,65 @@ static void notify_gtk_font_name(GObject*, GParamSpec*, void*)
 // the same hierarchy in it. So the best way to get style information seems
 // to be creating the widget paths and context hierarchy directly.
 
-static GtkStyleContext* StyleContext(
-    GtkStyleContext* parent,
-    GtkWidgetPath* path,
-    GType type,
-    const char* objectName,
-    const char* className1 = NULL,
-    const char* className2 = NULL)
+//-----------------------------------------------------------------------------
+// wxGtkStyleContext
+//-----------------------------------------------------------------------------
+
+wxGtkStyleContext::wxGtkStyleContext()
+    : m_path(gtk_widget_path_new())
 {
-    gtk_widget_path_append_type(path, type);
+    m_context = NULL;
+}
+
+wxGtkStyleContext& wxGtkStyleContext::Add(GType type, const char* objectName, ...)
+{
+    if (m_context == NULL && type != GTK_TYPE_WINDOW)
+        AddWindow();
+
+    gtk_widget_path_append_type(m_path, type);
 #if GTK_CHECK_VERSION(3,20,0)
     if (gtk_check_version(3,20,0) == NULL)
-        gtk_widget_path_iter_set_object_name(path, -1, objectName);
-#else
-    wxUnusedVar(objectName);
+        gtk_widget_path_iter_set_object_name(m_path, -1, objectName);
 #endif
-    if (className1)
-        gtk_widget_path_iter_add_class(path, -1, className1);
-    if (className2)
-        gtk_widget_path_iter_add_class(path, -1, className2);
+    va_list args;
+    va_start(args, objectName);
+    const char* className;
+    while ((className = va_arg(args, char*)))
+        gtk_widget_path_iter_add_class(m_path, -1, className);
+    va_end(args);
+
     GtkStyleContext* sc = gtk_style_context_new();
-    gtk_style_context_set_path(sc, path);
-    if (parent)
+    gtk_style_context_set_path(sc, m_path);
+    if (m_context)
     {
 #if GTK_CHECK_VERSION(3,4,0)
         if (gtk_check_version(3,4,0) == NULL)
-            gtk_style_context_set_parent(sc, parent);
+            gtk_style_context_set_parent(sc, m_context);
 #endif
-        g_object_unref(parent);
+        g_object_unref(m_context);
     }
-    return sc;
+    m_context = sc;
+    return *this;
 }
 
-static GtkStyleContext* StyleContext(
-    GtkWidgetPath* path,
-    GType type,
-    const char* objectName,
-    const char* className1 = NULL,
-    const char* className2 = NULL)
+wxGtkStyleContext& wxGtkStyleContext::Add(const char* objectName)
 {
-    GtkStyleContext* sc;
-    sc = StyleContext(NULL, path, GTK_TYPE_WINDOW, "window", "background");
-    sc = StyleContext(sc, path, type, objectName, className1, className2);
-    return sc;
+    return Add(G_TYPE_NONE, objectName, NULL);
 }
 
-static void StyleContextFree(GtkStyleContext* sc)
+wxGtkStyleContext::~wxGtkStyleContext()
 {
+    gtk_widget_path_unref(m_path);
+    if (m_context == NULL)
+        return;
     if (gtk_check_version(3,16,0) == NULL || gtk_check_version(3,4,0))
     {
-        g_object_unref(sc);
+        g_object_unref(m_context);
         return;
     }
 #if GTK_CHECK_VERSION(3,4,0)
     // GTK+ < 3.16 does not properly handle freeing child context before parent
+    GtkStyleContext* sc = m_context;
     do {
         GtkStyleContext* parent = gtk_style_context_get_parent(sc);
         if (parent)
@@ -259,74 +265,84 @@ static void StyleContextFree(GtkStyleContext* sc)
 #endif
 }
 
-static GtkStyleContext* ButtonContext(GtkWidgetPath* path)
+wxGtkStyleContext& wxGtkStyleContext::AddButton()
 {
-    GtkStyleContext* sc;
-    sc = StyleContext(path, GTK_TYPE_BUTTON, "button", "button");
-    return sc;
+    return Add(GTK_TYPE_BUTTON, "button", "button", NULL);
 }
 
-static GtkStyleContext* ButtonLabelContext(GtkWidgetPath* path)
+wxGtkStyleContext& wxGtkStyleContext::AddCheckButton()
 {
-    GtkStyleContext* sc;
-    sc = ButtonContext(path);
-    sc = StyleContext(sc, path, GTK_TYPE_LABEL, "label");
-    return sc;
+    return Add(GTK_TYPE_CHECK_BUTTON, "checkbutton", NULL);
 }
 
-static GtkStyleContext* HeaderbarContext(GtkWidgetPath* path)
+#if GTK_CHECK_VERSION(3,10,0)
+wxGtkStyleContext& wxGtkStyleContext::AddHeaderbar()
 {
-    GtkStyleContext* sc;
-    sc = StyleContext(path, GTK_TYPE_HEADER_BAR, "headerbar", "titlebar", "header-bar");
-    return sc;
+    return Add(GTK_TYPE_HEADER_BAR, "headerbar", "titlebar", "header-bar", NULL);
+}
+#endif
+
+wxGtkStyleContext& wxGtkStyleContext::AddLabel()
+{
+    return Add(GTK_TYPE_LABEL, "label", NULL);
 }
 
-static GtkStyleContext* HeaderbarLabelContext(GtkWidgetPath* path)
+wxGtkStyleContext& wxGtkStyleContext::AddMenu()
 {
-    GtkStyleContext* sc;
-    sc = HeaderbarContext(path);
-    sc = StyleContext(sc, path, GTK_TYPE_LABEL, "label");
-    return sc;
+    return AddWindow("popup").Add(GTK_TYPE_MENU, "menu", "menu", NULL);
 }
 
-static GtkStyleContext* MenuContext(GtkWidgetPath* path)
+wxGtkStyleContext& wxGtkStyleContext::AddMenuItem()
 {
-    GtkStyleContext* sc;
-    sc = StyleContext(NULL, path, GTK_TYPE_WINDOW, "window", "background", "popup");
-    sc = StyleContext(sc, path, GTK_TYPE_MENU, "menu", "menu");
-    return sc;
+    return AddMenu().Add(GTK_TYPE_MENU_ITEM, "menuitem", "menuitem", NULL);
 }
 
-static GtkStyleContext* MenuItemContext(GtkWidgetPath* path)
+wxGtkStyleContext& wxGtkStyleContext::AddTextview(const char* child1, const char* child2)
 {
-    GtkStyleContext* sc;
-    sc = MenuContext(path);
-    sc = StyleContext(sc, path, GTK_TYPE_MENU_ITEM, "menuitem", "menuitem");
-    return sc;
-}
-
-static GtkStyleContext* TextviewContext(GtkWidgetPath* path, const char* child1 = NULL, const char* child2 = NULL)
-{
-    GtkStyleContext* sc;
-    sc = StyleContext(path, GTK_TYPE_TEXT_VIEW, "textview", "view");
+    Add(GTK_TYPE_TEXT_VIEW, "textview", "view", NULL);
     if (child1 && gtk_check_version(3,20,0) == NULL)
     {
-        sc = StyleContext(sc, path, G_TYPE_NONE, child1);
+        Add(child1);
         if (child2)
-            sc = StyleContext(sc, path, G_TYPE_NONE, child2);
+            Add(child2);
     }
-    return sc;
+    return *this;
 }
 
-static GtkStyleContext* TreeviewContext(GtkWidgetPath* path)
+wxGtkStyleContext& wxGtkStyleContext::AddTreeview()
 {
-    GtkStyleContext* sc;
-    sc = StyleContext(path, GTK_TYPE_TREE_VIEW, "treeview", "view");
-    return sc;
+    return Add(GTK_TYPE_TREE_VIEW, "treeview", "view", NULL);
 }
 
-static GtkStyleContext* TooltipContext(GtkWidgetPath* path)
+#if GTK_CHECK_VERSION(3,20,0)
+wxGtkStyleContext& wxGtkStyleContext::AddTreeviewHeaderButton(int pos)
 {
+    AddTreeview().Add("header");
+    GtkStyleContext* sc = gtk_style_context_new();
+
+    GtkWidgetPath* siblings = gtk_widget_path_new();
+    gtk_widget_path_append_type(siblings, GTK_TYPE_BUTTON);
+    gtk_widget_path_iter_set_object_name(siblings, -1, "button");
+    gtk_widget_path_append_type(siblings, GTK_TYPE_BUTTON);
+    gtk_widget_path_iter_set_object_name(siblings, -1, "button");
+    gtk_widget_path_append_type(siblings, GTK_TYPE_BUTTON);
+    gtk_widget_path_iter_set_object_name(siblings, -1, "button");
+
+    gtk_widget_path_append_with_siblings(m_path, siblings, pos);
+    gtk_widget_path_unref(siblings);
+
+    gtk_style_context_set_path(sc, m_path);
+    gtk_style_context_set_parent(sc, m_context);
+    g_object_unref(m_context);
+    m_context = sc;
+    return *this;
+}
+#endif // GTK_CHECK_VERSION(3,20,0)
+
+wxGtkStyleContext& wxGtkStyleContext::AddTooltip()
+{
+    wxASSERT(m_context == NULL);
+    GtkWidgetPath* path = m_path;
     gtk_widget_path_append_type(path, GTK_TYPE_WINDOW);
 #if GTK_CHECK_VERSION(3,20,0)
     if (gtk_check_version(3,20,0) == NULL)
@@ -335,17 +351,22 @@ static GtkStyleContext* TooltipContext(GtkWidgetPath* path)
     gtk_widget_path_iter_add_class(path, -1, "background");
     gtk_widget_path_iter_add_class(path, -1, "tooltip");
     gtk_widget_path_iter_set_name(path, -1, "gtk-tooltip");
-    GtkStyleContext* sc = gtk_style_context_new();
-    gtk_style_context_set_path(sc, path);
-    return sc;
+    m_context = gtk_style_context_new();
+    gtk_style_context_set_path(m_context, m_path);
+    return *this;
 }
 
-static void bg(GtkStyleContext* sc, wxColour& color, int state = GTK_STATE_FLAG_NORMAL)
+wxGtkStyleContext& wxGtkStyleContext::AddWindow(const char* className2)
+{
+    return Add(GTK_TYPE_WINDOW, "window", "background", className2, NULL);
+}
+
+void wxGtkStyleContext::Bg(wxColour& color, int state) const
 {
     GdkRGBA* rgba;
     cairo_pattern_t* pattern = NULL;
-    gtk_style_context_set_state(sc, GtkStateFlags(state));
-    gtk_style_context_get(sc, GtkStateFlags(state),
+    gtk_style_context_set_state(m_context, GtkStateFlags(state));
+    gtk_style_context_get(m_context, GtkStateFlags(state),
         "background-color", &rgba, "background-image", &pattern, NULL);
     color = wxColour(*rgba);
     gdk_rgba_free(rgba);
@@ -401,43 +422,33 @@ static void bg(GtkStyleContext* sc, wxColour& color, int state = GTK_STATE_FLAG_
     if (color.Alpha() == 0)
     {
         // Try TLW as last resort, but not if we're already doing it
-        const GtkWidgetPath* path0 = gtk_style_context_get_path(sc);
-        if (gtk_widget_path_length(path0) > 1 ||
-            gtk_widget_path_iter_get_object_type(path0, 0) != GTK_TYPE_WINDOW)
-        {
-            GtkWidgetPath* path = gtk_widget_path_new();
-            GtkStyleContext* sc2;
-            sc2 = StyleContext(NULL, path, GTK_TYPE_WINDOW, "window", "background");
-            gtk_widget_path_unref(path);
-            bg(sc2, color, state);
-        }
+        if (gtk_widget_path_length(m_path) > 1)
+            wxGtkStyleContext().AddWindow().Bg(color, state);
     }
-
-    StyleContextFree(sc);
 }
 
-static void fg(GtkStyleContext* sc, wxColour& color, int state = GTK_STATE_FLAG_NORMAL)
+void wxGtkStyleContext::Fg(wxColour& color, int state) const
 {
     GdkRGBA rgba;
-    gtk_style_context_set_state(sc, GtkStateFlags(state));
+    gtk_style_context_set_state(m_context, GtkStateFlags(state));
 #ifdef __WXGTK4__
-    gtk_style_context_get_color(sc, &rgba);
+    gtk_style_context_get_color(m_context, &rgba);
 #else
-    gtk_style_context_get_color(sc, GtkStateFlags(state), &rgba);
+    gtk_style_context_get_color(m_context, GtkStateFlags(state), &rgba);
 #endif
     color = wxColour(rgba);
-    StyleContextFree(sc);
 }
 
-static void border(GtkStyleContext* sc, wxColour& color)
+void wxGtkStyleContext::Border(wxColour& color) const
 {
     GdkRGBA* rgba;
-    gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, "border-color", &rgba, NULL);
+    gtk_style_context_get(m_context, GTK_STATE_FLAG_NORMAL, "border-color", &rgba, NULL);
     color = wxColour(*rgba);
     gdk_rgba_free(rgba);
-    StyleContextFree(sc);
 }
 
+//-----------------------------------------------------------------------------
+
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
     if (unsigned(index) > wxSYS_COLOUR_MAX)
@@ -455,8 +466,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
             G_CALLBACK(notify_gtk_theme_name), NULL);
     }
 
-    GtkWidgetPath* path = gtk_widget_path_new();
-    GtkStyleContext* sc;
+    wxGtkStyleContext sc;
 
     switch (index)
     {
@@ -467,18 +477,17 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 #if GTK_CHECK_VERSION(3,10,0)
         if (gtk_check_version(3,10,0) == NULL)
         {
-            sc = HeaderbarContext(path);
             int state = GTK_STATE_FLAG_NORMAL;
             if (index == wxSYS_COLOUR_INACTIVECAPTION ||
                 index == wxSYS_COLOUR_GRADIENTINACTIVECAPTION)
             {
                 state = GTK_STATE_FLAG_BACKDROP;
             }
-            bg(sc, color, state);
+            sc.AddHeaderbar().Bg(color, state);
             break;
         }
-#endif
         wxFALLTHROUGH;
+#endif
     case wxSYS_COLOUR_3DLIGHT:
     case wxSYS_COLOUR_ACTIVEBORDER:
     case wxSYS_COLOUR_BTNFACE:
@@ -486,64 +495,54 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
     case wxSYS_COLOUR_INACTIVEBORDER:
     case wxSYS_COLOUR_SCROLLBAR:
     case wxSYS_COLOUR_WINDOWFRAME:
-        sc = ButtonContext(path);
-        bg(sc, color);
+        sc.AddButton().Bg(color);
         break;
     case wxSYS_COLOUR_HIGHLIGHT:
-        sc = TextviewContext(path, "text", "selection");
-        bg(sc, color, GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED);
+        sc.AddTextview("text", "selection");
+        sc.Bg(color, GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED);
         break;
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
-        sc = TextviewContext(path, "text", "selection");
-        fg(sc, color, GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED);
+        sc.AddTextview("text", "selection");
+        sc.Fg(color, GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED);
         break;
     case wxSYS_COLOUR_WINDOWTEXT:
-        sc = TextviewContext(path, "text");
-        fg(sc, color);
+        sc.AddTextview("text").Fg(color);
         break;
     case wxSYS_COLOUR_BTNHIGHLIGHT:
-        sc = ButtonContext(path);
-        bg(sc, color, GTK_STATE_FLAG_PRELIGHT);
+        sc.AddButton().Bg(color, GTK_STATE_FLAG_PRELIGHT);
         break;
     case wxSYS_COLOUR_BTNSHADOW:
-        sc = ButtonContext(path);
-        border(sc, color);
+        sc.AddButton().Border(color);
         break;
     case wxSYS_COLOUR_CAPTIONTEXT:
 #if GTK_CHECK_VERSION(3,10,0)
         if (gtk_check_version(3,10,0) == NULL)
         {
-            sc = HeaderbarLabelContext(path);
-            fg(sc, color);
+            sc.AddHeaderbar().AddLabel().Fg(color);
             break;
         }
-#endif
         wxFALLTHROUGH;
+#endif
     case wxSYS_COLOUR_BTNTEXT:
-        sc = ButtonLabelContext(path);
-        fg(sc, color);
+        sc.AddButton().AddLabel().Fg(color);
         break;
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
 #if GTK_CHECK_VERSION(3,10,0)
         if (gtk_check_version(3,10,0) == NULL)
         {
-            sc = HeaderbarLabelContext(path);
-            fg(sc, color, GTK_STATE_FLAG_BACKDROP);
+            sc.AddHeaderbar().AddLabel().Fg(color, GTK_STATE_FLAG_BACKDROP);
             break;
         }
-#endif
         wxFALLTHROUGH;
+#endif
     case wxSYS_COLOUR_GRAYTEXT:
-        sc = StyleContext(path, GTK_TYPE_LABEL, "label");
-        fg(sc, color, GTK_STATE_FLAG_INSENSITIVE);
+        sc.AddLabel().Fg(color, GTK_STATE_FLAG_INSENSITIVE);
         break;
     case wxSYS_COLOUR_HOTLIGHT:
-        sc = StyleContext(path, GTK_TYPE_LINK_BUTTON, "button", "link");
-#ifdef __WXGTK4__
-        fg(sc, color, GTK_STATE_FLAG_LINK);
-#else
-        if (gtk_check_version(3,12,0) == NULL)
-            fg(sc, color, GTK_STATE_FLAG_LINK);
+        sc.Add(GTK_TYPE_LINK_BUTTON, "button", "link", NULL);
+        if (wx_is_at_least_gtk3(12))
+            sc.Fg(color, GTK_STATE_FLAG_LINK);
+#ifndef __WXGTK4__
         else
         {
             wxGCC_WARNING_SUPPRESS(deprecated-declarations)
@@ -556,53 +555,40 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
                 gdkColor = *link_color;
             color = wxColour(gdkColor);
             g_value_unset(&value);
-            StyleContextFree(sc);
             wxGCC_WARNING_RESTORE()
         }
 #endif
         break;
     case wxSYS_COLOUR_INFOBK:
-        sc = TooltipContext(path);
-        bg(sc, color);
+        sc.AddTooltip().Bg(color);
         break;
     case wxSYS_COLOUR_INFOTEXT:
-        sc = TooltipContext(path);
-        sc = StyleContext(sc, path, GTK_TYPE_LABEL, "label");
-        fg(sc, color);
+        sc.AddTooltip().AddLabel().Fg(color);
         break;
     case wxSYS_COLOUR_LISTBOX:
-        sc = TreeviewContext(path);
-        bg(sc, color);
+        sc.AddTreeview().Bg(color);
         break;
     case wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT:
-        sc = TreeviewContext(path);
-        fg(sc, color, GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED);
+        sc.AddTreeview().Fg(color, GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED);
         break;
     case wxSYS_COLOUR_LISTBOXTEXT:
-        sc = TreeviewContext(path);
-        fg(sc, color);
+        sc.AddTreeview().Fg(color);
         break;
     case wxSYS_COLOUR_MENU:
-        sc = MenuContext(path);
-        bg(sc, color);
+        sc.AddMenu().Bg(color);
         break;
     case wxSYS_COLOUR_MENUBAR:
-        sc = StyleContext(path, GTK_TYPE_MENU_BAR, "menubar", "menubar");
-        bg(sc, color);
+        sc.Add(GTK_TYPE_MENU_BAR, "menubar", "menubar", NULL).Bg(color);
         break;
     case wxSYS_COLOUR_MENUHILIGHT:
-        sc = MenuItemContext(path);
-        bg(sc, color, GTK_STATE_FLAG_PRELIGHT);
+        sc.AddMenuItem().Bg(color, GTK_STATE_FLAG_PRELIGHT);
         break;
     case wxSYS_COLOUR_MENUTEXT:
-        sc = MenuItemContext(path);
-        sc = StyleContext(sc, path, GTK_TYPE_LABEL, "label");
-        fg(sc, color);
+        sc.AddMenuItem().AddLabel().Fg(color);
         break;
     case wxSYS_COLOUR_APPWORKSPACE:
     case wxSYS_COLOUR_WINDOW:
-        sc = TextviewContext(path);
-        bg(sc, color);
+        sc.AddTextview().Bg(color);
         break;
     case wxSYS_COLOUR_3DDKSHADOW:
         color.Set(0, 0, 0);
@@ -613,8 +599,6 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         break;
     }
 
-    gtk_widget_path_unref(path);
-
     return color;
 }
 #else // !__WXGTK3__
@@ -790,13 +774,10 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
                     g_signal_connect(gtk_settings_get_default(), "notify::gtk-font-name",
                         G_CALLBACK(notify_gtk_font_name), NULL);
                 }
-                GtkWidgetPath* path = gtk_widget_path_new();
-                GtkStyleContext* sc;
-                sc = ButtonLabelContext(path);
+                wxGtkStyleContext sc;
+                sc.AddButton().AddLabel();
                 gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL,
                     GTK_STYLE_PROPERTY_FONT, &info.description, NULL);
-                gtk_widget_path_unref(path);
-                StyleContextFree(sc);
 #else
                 info.description = ButtonStyle()->font_desc;
 #endif
@@ -877,15 +858,12 @@ static int GetScrollbarWidth()
     if (wx_is_at_least_gtk3(20))
     {
         GtkBorder border;
-        GtkWidgetPath* path = gtk_widget_path_new();
-        GtkStyleContext* sc;
-        sc = StyleContext(path, GTK_TYPE_SCROLLBAR, "scrollbar", "right");
+        wxGtkStyleContext sc;
+        sc.Add(GTK_TYPE_SCROLLBAR, "scrollbar", "scrollbar", "vertical", "right", NULL);
 
         gtk_style_context_get_border(sc, GTK_STATE_FLAG_NORMAL, &border);
 
-        sc = StyleContext(sc, path, G_TYPE_NONE, "contents");
-        sc = StyleContext(sc, path, G_TYPE_NONE, "trough");
-        sc = StyleContext(sc, path, G_TYPE_NONE, "slider");
+        sc.Add("contents").Add("trough").Add("slider");
 
         gtk_style_context_get(sc, GTK_STATE_FLAG_NORMAL, "min-width", &width, NULL);
         width += border.left + border.right;
@@ -896,9 +874,6 @@ static int GetScrollbarWidth()
         width += border.left + border.right;
         gtk_style_context_get_margin(sc, GTK_STATE_FLAG_NORMAL, &border);
         width += border.left + border.right;
-
-        gtk_widget_path_unref(path);
-        StyleContextFree(sc);
     }
     else
 #endif

From b839388c8286b3ff34901d3055f9d70bf3af14e4 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 6 Jun 2018 09:09:12 -0700
Subject: [PATCH 627/916] Avoid GLib warning "couldn't find weak ref" with
 wxBitmapComboBox

Should have been part of c391cfd617
---
 src/gtk/bmpcbox.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gtk/bmpcbox.cpp b/src/gtk/bmpcbox.cpp
index b7a124cd3a..dbcc502ecd 100644
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -127,6 +127,7 @@ void wxBitmapComboBox::GTKCreateComboBoxWidget()
         m_widget = gtk_combo_box_entry_new_with_model( GTK_TREE_MODEL(store), m_stringCellIndex );
 #endif
         m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
+        g_object_add_weak_pointer(G_OBJECT(m_entry), (void**)&m_entry);
         gtk_editable_set_editable(GTK_EDITABLE(m_entry), true);
     }
     g_object_ref(m_widget);

From ce903da7983be5dbb658f86ba89b5664413ce405 Mon Sep 17 00:00:00 2001
From: Maarten <MaartenBent@users.noreply.github.com>
Date: Fri, 8 Jun 2018 19:17:22 +0200
Subject: [PATCH 628/916] Fix glitch in AUI frame with standard wxToolbar

When the height of the AUI toolbar pane is higher than the wxToolbar, the extra
area shows a glitch. This happens because the paint handler never draws on this
area. Clearing the DC of the frame with the AUI background colour fixes this.

See https://github.com/wxWidgets/wxWidgets/pull/829

Closes #18138
---
 src/aui/framemanager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 8f3c89605d..ab34ce3035 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -3935,6 +3935,10 @@ void wxAuiManager::Repaint(wxDC* dc)
 void wxAuiManager::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(m_frame);
+
+    dc.SetBackground(GetArtProvider()->GetColor(wxAUI_DOCKART_BACKGROUND_COLOUR));
+    dc.Clear();
+
     Repaint(&dc);
 }
 

From 93edcaef2049c3f01ce0941ee1954e7253df74f3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Jun 2018 23:27:38 +0200
Subject: [PATCH 629/916] Fix wrong function pointer casts in dynamic arrays
 code

Don't cast function pointers of incompatible types, this resulted in gcc
8 -Wcast-function-type warnings and could hide real errors.

To fix this, overload wxBaseArray::Sort() to accept either the "legacy"
sort function compatible with qsort() or a function compatible with
std::sort(), as it seems both variants could be used before. Also make
the type of the latter function customizable via a new optional Sorter
template parameter in wxBaseArray in order to allow wxSortedArrayString
to specify its own variant of it, taking (const) references instead of
values.

This complicates things, but should preserve compatibility while being
type-safe and, also, allows to simplify _WX_DEFINE_SORTED_TYPEARRAY_2 by
not passing the sort function signature to it any more.
---
 include/wx/arrstr.h   | 22 +++++++++++++++++++---
 include/wx/dynarray.h | 41 ++++++++++++++++++++---------------------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 89dbf5316d..5a19181524 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -80,9 +80,25 @@ public:
     }
 };
 
-_WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase,
-                              wxArrayStringBase, = wxStringSortAscending,
-                              class WXDLLIMPEXP_BASE, wxArrayString::CompareFunction);
+// Unlike all the other sorted arrays, this one uses a comparison function
+// taking objects by reference rather than value, so define a special functor
+// wrapping it.
+class wxSortedArrayString_SortFunction
+{
+public:
+    typedef int (wxCMPFUNC_CONV *CMPFUNC)(const wxString&, const wxString&);
+
+    explicit wxSortedArrayString_SortFunction(CMPFUNC f) : m_f(f) { }
+
+    bool operator()(const wxString& s1, const wxString& s2)
+      { return m_f(s1, s2) < 0; }
+
+private:
+    CMPFUNC m_f;
+};
+
+typedef wxBaseSortedArray<wxString, wxSortedArrayString_SortFunction>
+    wxSortedArrayStringBase;
 
 class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase
 {
diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index d7adffbd35..c1566953a6 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -75,13 +75,11 @@ private:
     CMPFUNC m_f;
 };
 
-template <typename T>
+template <typename T, typename Sorter = wxSortedArray_SortFunction<T> >
 class wxBaseArray : public wxVector<T>
 {
-    typedef wxSortedArray_SortFunction<T> Predicate;
-
 public:
-    typedef typename Predicate::CMPFUNC SCMPFUNC;
+    typedef typename Sorter::CMPFUNC SCMPFUNC;
     typedef typename wxArray_SortFunction<T>::CMPFUNC CMPFUNC;
 
     typedef wxVector<T> base_vec;
@@ -158,7 +156,7 @@ public:
 
     int Index(T lItem, SCMPFUNC fnCompare) const
     {
-        Predicate p(fnCompare);
+        Sorter p(fnCompare);
         const_iterator i = std::lower_bound(this->begin(), this->end(), lItem, p);
         return i != this->end() && !p(lItem, *i) ? (int)(i - this->begin())
                                                  : wxNOT_FOUND;
@@ -166,7 +164,7 @@ public:
 
     size_t IndexForInsert(T lItem, SCMPFUNC fnCompare) const
     {
-        Predicate p(fnCompare);
+        Sorter p(fnCompare);
         const_iterator i = std::lower_bound(this->begin(), this->end(), lItem, p);
         return i - this->begin();
     }
@@ -208,7 +206,7 @@ public:
 
     void Sort(SCMPFUNC fCmp)
     {
-        Predicate p(fCmp);
+        Sorter p(fCmp);
         std::sort(this->begin(), this->end(), p);
     }
 };
@@ -222,31 +220,34 @@ public:
 //    cannot handle types with size greater than pointer because of sorting
 // ----------------------------------------------------------------------------
 
-#define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\
-    typedef wxBaseSortedArray<T, comptype> wxBaseSortedArrayFor##name;        \
+#define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp)       \
+    typedef wxBaseSortedArray<T> wxBaseSortedArrayFor##name;                  \
     classexp name : public wxBaseSortedArrayFor##name                         \
     {                                                                         \
     public:                                                                   \
-        name(comptype fn defcomp) : wxBaseSortedArrayFor##name(fn) { }        \
+        name(wxBaseSortedArrayFor##name::SCMPFUNC fn defcomp)                 \
+            : wxBaseSortedArrayFor##name(fn) { }                              \
     }
 
 
-template <typename T, typename Cmp>
-class wxBaseSortedArray : public wxBaseArray<T>
+template <typename T, typename Sorter = wxSortedArray_SortFunction<T> >
+class wxBaseSortedArray : public wxBaseArray<T, Sorter>
 {
 public:
-    explicit wxBaseSortedArray(Cmp fn) : m_fnCompare(fn) { }
+    typedef typename Sorter::CMPFUNC SCMPFUNC;
+
+    explicit wxBaseSortedArray(SCMPFUNC fn) : m_fnCompare(fn) { }
 
     wxBaseSortedArray& operator=(const wxBaseSortedArray& src)
     {
-        wxBaseArray<T>::operator=(src);
+        wxBaseArray<T, Sorter>::operator=(src);
         m_fnCompare = src.m_fnCompare;
         return *this;
     }
 
     size_t IndexForInsert(T item) const
     {
-        return this->wxBaseArray<T>::IndexForInsert(item, m_fnCompare);
+        return this->wxBaseArray<T, Sorter>::IndexForInsert(item, m_fnCompare);
     }
 
     void AddAt(T item, size_t index)
@@ -256,7 +257,7 @@ public:
 
     size_t Add(T item)
     {
-        return this->wxBaseArray<T>::Add(item, m_fnCompare);
+        return this->wxBaseArray<T, Sorter>::Add(item, m_fnCompare);
     }
 
     void push_back(T item)
@@ -265,7 +266,7 @@ public:
     }
 
 private:
-    Cmp m_fnCompare;
+    SCMPFUNC m_fnCompare;
 };
 
 
@@ -572,9 +573,8 @@ private:
 
 #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, expmode)  \
     typedef T _wxArray##name;                                             \
-    typedef int (CMPFUNC_CONV *SCMPFUNC##name)(T pItem1, T pItem2);       \
     _WX_DEFINE_SORTED_TYPEARRAY_2(_wxArray##name, name, base,             \
-                                wxARRAY_EMPTY, class expmode, SCMPFUNC##name)
+                                  wxARRAY_EMPTY, class expmode)
 
 // ----------------------------------------------------------------------------
 // WX_DEFINE_SORTED_TYPEARRAY_CMP: exactly the same as above but the comparison
@@ -599,9 +599,8 @@ private:
 #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \
                                                      expmode)                \
     typedef T _wxArray##name;                                                \
-    typedef int (CMPFUNC_CONV *SCMPFUNC##name)(T pItem1, T pItem2);          \
     _WX_DEFINE_SORTED_TYPEARRAY_2(_wxArray##name, name, base, = cmpfunc,     \
-                                class expmode, SCMPFUNC##name)
+                                  class expmode)
 
 // ----------------------------------------------------------------------------
 // WX_DECLARE_OBJARRAY(T, name): this macro generates a new array class

From 71bb680a93a05947b6c82842fdcf5e79c842f944 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 11 Jun 2018 22:38:05 +0200
Subject: [PATCH 630/916] Using NSColor System Colours

Removing the old HITheme Constants for the last two wx system colours, first step for Dark Mode support, see https://trac.wxwidgets.org/ticket/18146
---
 src/osx/cocoa/settings.mm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
index 101ded7eac..d59f9f7c0e 100644
--- a/src/osx/cocoa/settings.mm
+++ b/src/osx/cocoa/settings.mm
@@ -74,9 +74,14 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         sysColor = [NSColor windowFrameColor];
         break;
     case wxSYS_COLOUR_WINDOW:
-        return wxColour(wxMacCreateCGColorFromHITheme( 15 /* kThemeBrushDocumentWindowBackground */ )) ;
+        sysColor = [NSColor windowBackgroundColor];
+        break;
     case wxSYS_COLOUR_BTNFACE:
-        return wxColour(wxMacCreateCGColorFromHITheme( 3 /* kThemeBrushDialogBackgroundActive */));
+        if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+            sysColor = [NSColor windowBackgroundColor];
+        else
+            sysColor = [NSColor controlColor];
+        break;
     case wxSYS_COLOUR_LISTBOX:
         sysColor = [NSColor controlBackgroundColor];
         break;

From f4d4545873d572d9921c107a6f05163c457dd31b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 12 Jun 2018 19:52:26 +0200
Subject: [PATCH 631/916] Explicitly disable all warnings from windows.h for
 MSVC

While Windows headers compile without warnings at maximal warning level,
they still contain some warnings which are disabled by default, but can
be enabled explicitly, such as C4668.

Make life simpler for the user code doing this by avoiding giving these
warnings from the Platform SDK headers as it doesn't cost much to do
this from wxMSW itself, while doing it from the user code is nontrivial.
---
 include/wx/msw/wrapwin.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 1bbe4f4143..e4ef98a6b6 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -34,8 +34,17 @@
     #include <winsock2.h>
 #endif
 
+// Disable any warnings inside Windows headers.
+#ifdef __VISUALC__
+    #pragma warning(push, 1)
+#endif
+
 #include <windows.h>
 
+#ifdef __VISUALC__
+    #pragma warning(pop)
+#endif
+
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 

From cd02c548f4ee06196cdfb5aef7441f56e44045e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vaclav@slavik.io>
Date: Tue, 12 Jun 2018 20:27:50 +0200
Subject: [PATCH 632/916] Implement wxEVT_SYS_COLOUR_CHANGED in wxOSX (#832)

Starting with macOS 10.14 Mojave, system colors can change dynamically
when the user switches between light and dark modes. Detect this by
observing the effectiveAppearance property and emit
wxSysColourChangedEvent accordingly.

See #18146.
---
 src/osx/cocoa/nonownedwnd.mm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index a5eed3e9bb..9a7bb661e6 100644
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -305,6 +305,8 @@ static NSResponder* s_formerFirstResponder = NULL;
 // controller
 //
 
+static void *EffectiveAppearanceContext = &EffectiveAppearanceContext;
+
 @interface wxNonOwnedWindowController : NSObject <NSWindowDelegate>
 {
 }
@@ -610,6 +612,32 @@ extern int wxOSXGetIdFromSelector(SEL action );
         [view setFrameSize: expectedframerect.size];
     }
 }
+ 
+- (void)addObservers:(NSWindow*)win
+{
+    [win addObserver:self forKeyPath:@"effectiveAppearance"
+             options:0 context:EffectiveAppearanceContext];
+}
+
+- (void)removeObservers:(NSWindow*)win
+{
+    [win removeObserver:self forKeyPath:@"effectiveAppearance" context:EffectiveAppearanceContext];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+    if (context == EffectiveAppearanceContext)
+    {
+        wxNonOwnedWindowCocoaImpl* windowimpl = [(NSWindow*)object WX_implementation];
+        wxNonOwnedWindow* wxpeer = windowimpl ? windowimpl->GetWXPeer() : NULL;
+        if (wxpeer)
+        {
+            wxSysColourChangedEvent event;
+            event.SetEventObject(wxpeer);
+            wxpeer->HandleWindowEvent(event);
+        }
+    }
+}
 
 @end
 
@@ -632,6 +660,7 @@ wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
 {
     if ( !m_wxPeer->IsNativeWindowWrapper() )
     {
+        [(wxNonOwnedWindowController*)[m_macWindow delegate] removeObservers:m_macWindow];
         [m_macWindow setDelegate:nil];
      
         // make sure we remove this first, otherwise the ref count will not lead to the 
@@ -648,6 +677,7 @@ void wxNonOwnedWindowCocoaImpl::WillBeDestroyed()
 {
     if ( !m_wxPeer->IsNativeWindowWrapper() )
     {
+        [(wxNonOwnedWindowController*)[m_macWindow delegate] removeObservers:m_macWindow];
         [m_macWindow setDelegate:nil];
     }
 }
@@ -738,6 +768,7 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
     [m_macWindow setLevel:m_macWindowLevel];
 
     [m_macWindow setDelegate:controller];
+    [controller addObservers:m_macWindow];
 
     if ( ( style & wxFRAME_SHAPED) )
     {

From 2acda9833729f7aff8e735f5733b093d1f6a5d6d Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 12 Jun 2018 23:14:44 +0200
Subject: [PATCH 633/916] Fixing NSColor value for wxSYS_COLOUR_WINDOW

controlBackgroundColor should be used as a background for large controls like lists etc. this corresponds to the usage of wxSYS_COLOUR_WINDOW, thanks to dkulp
---
 src/osx/cocoa/settings.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
index d59f9f7c0e..060f24037f 100644
--- a/src/osx/cocoa/settings.mm
+++ b/src/osx/cocoa/settings.mm
@@ -74,7 +74,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         sysColor = [NSColor windowFrameColor];
         break;
     case wxSYS_COLOUR_WINDOW:
-        sysColor = [NSColor windowBackgroundColor];
+        sysColor = [NSColor controlBackgroundColor];
         break;
     case wxSYS_COLOUR_BTNFACE:
         if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )

From ebe70d2af00822041f91944292e827b44a0cad27 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 13 Jun 2018 18:58:05 +0200
Subject: [PATCH 634/916] Adding macOS 10.14 constant

---
 include/wx/platform.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/wx/platform.h b/include/wx/platform.h
index e7913cfab6..9e67fc7d76 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -487,6 +487,9 @@
 #        ifndef MAC_OS_X_VERSION_10_13
 #           define MAC_OS_X_VERSION_10_13 101300
 #        endif
+#        ifndef MAC_OS_X_VERSION_10_14
+#           define MAC_OS_X_VERSION_10_14 101400
+#        endif
 #        if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
 #            ifndef NSAppKitVersionNumber10_10
 #                define NSAppKitVersionNumber10_10 1343

From 9cef8282ab93679f46fbfc26a68b20b7aea496cb Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 13 Jun 2018 23:02:50 +0200
Subject: [PATCH 635/916] Supporting Appearance Mode change under macOS 10.14

The system color functions depend on the current appearance, this is not automatically set to the effective appearance (that can be changed during runtime via the system preferences), added a helper class to make sure the correct version is used for retrieval.
---
 include/wx/osx/cocoa/private.h | 12 ++++++++++++
 src/osx/carbon/utilscocoa.mm   | 24 ++++++++++++++++++++++++
 src/osx/cocoa/settings.mm      |  2 ++
 3 files changed, 38 insertions(+)

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 057ddc8deb..73b93b4c86 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -505,6 +505,18 @@ extern NSLayoutManager* gNSLayoutManager;
 wxString wxStringWithNSString(NSString *nsstring);
 NSString* wxNSStringWithWxString(const wxString &wxstring);
 
+// helper class for setting the current appearance to the
+// effective appearance and restore when exiting scope
+
+class WXDLLIMPEXP_CORE wxOSXEffectiveAppearanceSetter
+{
+public:
+    wxOSXEffectiveAppearanceSetter();
+    ~wxOSXEffectiveAppearanceSetter();
+private:
+    void * formerAppearance;
+};
+
 #endif // wxUSE_GUI
 
 #endif
diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index 4bb4f8fc17..22305a4c91 100644
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -584,5 +584,29 @@ NSString* wxNSStringWithWxString(const wxString &wxstring)
 #endif // wxUSE_UNICODE
 }
 
+// ----------------------------------------------------------------------------
+// helper class for getting the correct system colors according to the
+// appearance in effect
+// ----------------------------------------------------------------------------
+
+wxOSXEffectiveAppearanceSetter::wxOSXEffectiveAppearanceSetter()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
+    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+    {
+        formerAppearance = NSAppearance.currentAppearance;
+        NSAppearance.currentAppearance = NSApp.effectiveAppearance;
+    }
+#endif
+}
+
+wxOSXEffectiveAppearanceSetter::~wxOSXEffectiveAppearanceSetter()
+{
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
+    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+        NSAppearance.currentAppearance = (NSAppearance*) formerAppearance;
+#endif
+}
+
 #endif
 
diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
index 060f24037f..f6270bbb90 100644
--- a/src/osx/cocoa/settings.mm
+++ b/src/osx/cocoa/settings.mm
@@ -52,6 +52,8 @@ static int wxOSXGetUserDefault(NSString* key, int defaultValue)
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
+    wxOSXEffectiveAppearanceSetter helper;
+    
     NSColor* sysColor = nil;
     switch( index )
     {

From 1adc3ba4eef649c838ed3d06052b5bb27db3dc06 Mon Sep 17 00:00:00 2001
From: Naser Buhamad <arabgb@gmail.com>
Date: Wed, 13 Jun 2018 23:53:58 +0200
Subject: [PATCH 636/916] Fix menu bar background colour in wxQt

wxMenuBar is a native, not generic, window, so pass "false" to
PostCreation() to use the correct colours for it.
---
 docs/changes.txt | 4 ++++
 src/qt/menu.cpp  | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index f5b2e3ba67..cd8c9da99a 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -107,6 +107,10 @@ wxOSX:
 
 - Fix dispatching pending events (and CallAfter()) in console applications.
 
+wxQt:
+
+- Fix menu bar background colour (Naser Buhamad).
+
 
 3.1.1: (released 2018-02-19)
 ----------------------------
diff --git a/src/qt/menu.cpp b/src/qt/menu.cpp
index cec2fd1d7d..61d27b7976 100644
--- a/src/qt/menu.cpp
+++ b/src/qt/menu.cpp
@@ -162,13 +162,13 @@ QMenu *wxMenu::GetHandle() const
 wxMenuBar::wxMenuBar()
 {
     m_qtMenuBar  = new QMenuBar();
-    PostCreation();
+    PostCreation(false);
 }
 
 wxMenuBar::wxMenuBar( long WXUNUSED( style ))
 {
     m_qtMenuBar = new QMenuBar();
-    PostCreation();
+    PostCreation(false);
 }
 
 wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED( style ))
@@ -178,7 +178,7 @@ wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], lon
     for ( size_t i = 0; i < count; ++i )
         Append( menus[ i ], titles[ i ] );
 
-    PostCreation();
+    PostCreation(false);
 }
 
 

From 016a506eeeebf3a8b00058e7979b49c1f3200782 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 14 Jun 2018 10:41:27 -0700
Subject: [PATCH 637/916] add GtkWidgetPath wrapper class

---
 src/gtk/settings.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index d5859dc069..2c8132cbbe 100644
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -193,6 +193,18 @@ static void notify_gtk_font_name(GObject*, GParamSpec*, void*)
 // the same hierarchy in it. So the best way to get style information seems
 // to be creating the widget paths and context hierarchy directly.
 
+//-----------------------------------------------------------------------------
+
+class wxGtkWidgetPath
+{
+public:
+    wxGtkWidgetPath() : m_path(gtk_widget_path_new()) { }
+    ~wxGtkWidgetPath() { gtk_widget_path_free(m_path); }
+    operator GtkWidgetPath*() { return m_path; }
+private:
+    GtkWidgetPath* const m_path;
+};
+
 //-----------------------------------------------------------------------------
 // wxGtkStyleContext
 //-----------------------------------------------------------------------------
@@ -241,7 +253,7 @@ wxGtkStyleContext& wxGtkStyleContext::Add(const char* objectName)
 
 wxGtkStyleContext::~wxGtkStyleContext()
 {
-    gtk_widget_path_unref(m_path);
+    gtk_widget_path_free(m_path);
     if (m_context == NULL)
         return;
     if (gtk_check_version(3,16,0) == NULL || gtk_check_version(3,4,0))
@@ -320,7 +332,7 @@ wxGtkStyleContext& wxGtkStyleContext::AddTreeviewHeaderButton(int pos)
     AddTreeview().Add("header");
     GtkStyleContext* sc = gtk_style_context_new();
 
-    GtkWidgetPath* siblings = gtk_widget_path_new();
+    wxGtkWidgetPath siblings;
     gtk_widget_path_append_type(siblings, GTK_TYPE_BUTTON);
     gtk_widget_path_iter_set_object_name(siblings, -1, "button");
     gtk_widget_path_append_type(siblings, GTK_TYPE_BUTTON);
@@ -329,7 +341,6 @@ wxGtkStyleContext& wxGtkStyleContext::AddTreeviewHeaderButton(int pos)
     gtk_widget_path_iter_set_object_name(siblings, -1, "button");
 
     gtk_widget_path_append_with_siblings(m_path, siblings, pos);
-    gtk_widget_path_unref(siblings);
 
     gtk_style_context_set_path(sc, m_path);
     gtk_style_context_set_parent(sc, m_context);

From 5091d878254c80a85a7287383d64168ccbf64bee Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 14 Jun 2018 20:09:37 +0200
Subject: [PATCH 638/916] Support Dark Mode for Status Bar

see #18146
---
 include/wx/osx/statusbr.h   |  2 ++
 src/osx/carbon/statbrma.cpp | 51 +++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index e8ff1d312e..a331cd2ec6 100644
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -35,6 +35,8 @@ protected:
     virtual void DrawField(wxDC& dc, int i, int textHeight) wxOVERRIDE;
     virtual void DoUpdateStatusText(int number = 0) wxOVERRIDE;
 
+    virtual void InitColours();
+
 private:
     wxColour m_textActive, m_textInactive,
              m_bgActiveFrom, m_bgActiveTo,
diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp
index 76dc302dd4..01fe6abdd4 100644
--- a/src/osx/carbon/statbrma.cpp
+++ b/src/osx/carbon/statbrma.cpp
@@ -67,6 +67,13 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
     // normal system font is too tall for fitting into the standard height
     SetWindowVariant( wxWINDOW_VARIANT_SMALL );
 
+    InitColours();
+
+    return true;
+}
+
+void wxStatusBarMac::InitColours()
+{
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
     if ( !wxPlatformInfo::Get().CheckOSVersion(10, 10) )
     {
@@ -82,17 +89,41 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
     else
 #endif // MAC_OS_X_VERSION_MIN_REQUIRED < 101000
     {
-        // 10.10 Yosemite and newer:
-        m_textActive = wxColour(0x40, 0x40, 0x40);
-        m_textInactive = wxColour(0x4B, 0x4B, 0x4B);
-        m_bgActiveFrom = wxColour(0xE9, 0xE7, 0xEA);
-        m_bgActiveTo = wxColour(0xCD, 0xCB, 0xCE);
-        m_borderActive = wxColour(0xBA, 0xB8, 0xBB);
-        m_borderInactive = wxColour(0xC3, 0xC3, 0xC3);
-        SetBackgroundColour(wxColour(0xF4, 0xF4, 0xF4)); // inactive bg
+        if (!wxPlatformInfo::Get().CheckOSVersion(10, 14))
+        {
+            // 10.10 Yosemite to 10.13 :
+            m_textActive = wxColour(0x40, 0x40, 0x40);
+            m_textInactive = wxColour(0x4B, 0x4B, 0x4B);
+            m_bgActiveFrom = wxColour(0xE9, 0xE7, 0xEA);
+            m_bgActiveTo = wxColour(0xCD, 0xCB, 0xCE);
+            m_borderActive = wxColour(0xBA, 0xB8, 0xBB);
+            m_borderInactive = wxColour(0xC3, 0xC3, 0xC3);
+            SetBackgroundColour(wxColour(0xF4, 0xF4, 0xF4)); // inactive bg
+        }
+        else
+        {
+            wxColour bg = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+            m_textActive = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT);
+            m_textInactive = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
+            
+            if ( bg.Red() < 128 )
+            {
+                // dark mode appearance
+                m_bgActiveFrom = wxColour(0x32, 0x32, 0x34);
+                m_bgActiveTo = wxColour(0x29, 0x29, 0x2A);
+                m_borderActive = wxColour(0x00, 0x00, 0x00);
+                m_borderInactive = wxColour(0x00, 0x00, 0x00);
+            }
+            else
+            {
+                m_bgActiveFrom = wxColour(0xE9, 0xE7, 0xEA);
+                m_bgActiveTo = wxColour(0xCD, 0xCB, 0xCE);
+                m_borderActive = wxColour(0xBA, 0xB8, 0xBB);
+                m_borderInactive = wxColour(0xC3, 0xC3, 0xC3);
+            }
+            SetBackgroundColour(bg); // inactive bg
+        }
     }
-
-    return true;
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int textHeight)

From 56d125041f8f9f1787cdf8fd47032fce759ac9a3 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 14 Jun 2018 20:11:26 +0200
Subject: [PATCH 639/916] Use built-in conversion to CGColorRef where available

---
 src/osx/cocoa/colour.mm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/osx/cocoa/colour.mm b/src/osx/cocoa/colour.mm
index aca75b9174..e6a4d1750a 100644
--- a/src/osx/cocoa/colour.mm
+++ b/src/osx/cocoa/colour.mm
@@ -21,6 +21,16 @@ static inline wxColour::ChannelType NSColorChannelToWX(CGFloat c)
 
 wxColour::wxColour(WX_NSColor col)
 {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
+    if ( wxPlatformInfo::Get().CheckOSVersion(10, 8) )
+    {
+        CGColorRef cgcolor = [col CGColor];
+        CFRetain(cgcolor);
+        InitCGColorRef(cgcolor);
+        return ;
+    }
+#endif
+        
     // Simplest case is when we can directly get the RGBA components:
     if ( NSColor* colRGBA = [col colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
     {

From 7da13b273c8f099bc21bc463bf0b9f13c42eab31 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 14 Jun 2018 22:33:53 +0200
Subject: [PATCH 640/916] Fix wxOSX compilation problem due to missing
 wx/settings.h

Include the header required by the code using wxSystemSettings added in
5091d878254c80a85a7287383d64168ccbf64bee

See #18146.
---
 src/osx/carbon/statbrma.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp
index 01fe6abdd4..c4a37e01e6 100644
--- a/src/osx/carbon/statbrma.cpp
+++ b/src/osx/carbon/statbrma.cpp
@@ -14,6 +14,7 @@
 
 #include "wx/statusbr.h"
 #include "wx/platinfo.h"
+#include "wx/settings.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"

From caa2fde425b9d5fd87d1e915c2b177d1da4b35f9 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 15 Jun 2018 10:06:17 +0200
Subject: [PATCH 641/916] added missing override

---
 include/wx/osx/statusbr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index a331cd2ec6..d94c87de37 100644
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -35,7 +35,7 @@ protected:
     virtual void DrawField(wxDC& dc, int i, int textHeight) wxOVERRIDE;
     virtual void DoUpdateStatusText(int number = 0) wxOVERRIDE;
 
-    virtual void InitColours();
+    virtual void InitColours() wxOVERRIDE;
 
 private:
     wxColour m_textActive, m_textInactive,

From 60c1a4be8b9018e0dbf1df44d084b80e13705285 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 16 Jun 2018 10:36:46 +0200
Subject: [PATCH 642/916] Fixing implementation of
 wxSYS_COLOUR_INACTIVECAPTIONTEXT

---
 src/osx/cocoa/settings.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
index f6270bbb90..121ef1b699 100644
--- a/src/osx/cocoa/settings.mm
+++ b/src/osx/cocoa/settings.mm
@@ -95,7 +95,6 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
     case wxSYS_COLOUR_INFOTEXT:
-    case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
     case wxSYS_COLOUR_LISTBOXTEXT:
         sysColor = [NSColor controlTextColor];
         break;
@@ -105,6 +104,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
     case wxSYS_COLOUR_BTNHIGHLIGHT:
         sysColor = [NSColor controlHighlightColor];
         break;
+    case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
     case wxSYS_COLOUR_GRAYTEXT:
         sysColor = [NSColor disabledControlTextColor];
         break;

From 12f8e4b5c3f427f5ad5ce3ef0941ce70ca29be95 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 16 Jun 2018 10:44:27 +0200
Subject: [PATCH 643/916] First part of support for Dark Mode for wxRibbon

see #18146
---
 src/ribbon/art_aui.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/ribbon/art_aui.cpp b/src/ribbon/art_aui.cpp
index 7df2bfa702..356eec2dc7 100644
--- a/src/ribbon/art_aui.cpp
+++ b/src/ribbon/art_aui.cpp
@@ -38,7 +38,7 @@ wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()
     : wxRibbonMSWArtProvider(false)
 {
 #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
+    wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 #else
     wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
@@ -245,7 +245,11 @@ void wxRibbonAUIArtProvider::SetColourScheme(
     m_tab_ctrl_background_colour = LikePrimary(0.9);
     m_tab_ctrl_background_gradient_colour = LikePrimary(1.7);
     m_tab_border_pen = LikePrimary(0.75);
+#ifdef __WXMAC__
+    m_tab_label_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT);
+#else
     m_tab_label_colour = LikePrimary(0.1);
+#endif
     m_tab_hover_background_top_colour =  primary_hsl.ToRGB();
     m_tab_hover_background_top_gradient_colour = LikePrimary(1.6);
     m_tab_hover_background_brush = m_tab_hover_background_top_colour;
@@ -268,7 +272,11 @@ void wxRibbonAUIArtProvider::SetColourScheme(
     m_button_bar_hover_background_brush = LikeSecondary(1.7);
     m_button_bar_active_background_brush = LikeSecondary(1.4);
     m_button_bar_label_colour = m_tab_label_colour;
+#ifdef __WXMAC__
+    m_button_bar_label_disabled_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT);
+#else
     m_button_bar_label_disabled_colour = m_tab_label_colour;
+#endif
     m_gallery_border_pen = m_tab_border_pen;
     m_gallery_item_border_pen = m_button_bar_hover_border_pen;
     m_gallery_hover_background_brush = LikePrimary(1.2);

From d2aafff4a2beee8f911d57ed87fa35f53272d944 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 17 Jun 2018 17:32:11 +0200
Subject: [PATCH 644/916] Second part of support for Dark Mode for wxRibbon,
 use flat appearance starting from 10.10

see #18146
---
 src/ribbon/art_aui.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/ribbon/art_aui.cpp b/src/ribbon/art_aui.cpp
index 356eec2dc7..83fb98d6e6 100644
--- a/src/ribbon/art_aui.cpp
+++ b/src/ribbon/art_aui.cpp
@@ -243,6 +243,11 @@ void wxRibbonAUIArtProvider::SetColourScheme(
     wxRibbonShiftLuminance(secondary_hsl, luminance ## f).ToRGB()
 
     m_tab_ctrl_background_colour = LikePrimary(0.9);
+#ifdef __WXMAC__
+    if ( wxPlatformInfo::Get().CheckOSVersion(10, 10 ) )
+        m_tab_ctrl_background_gradient_colour = m_tab_ctrl_background_colour;
+    else
+#endif
     m_tab_ctrl_background_gradient_colour = LikePrimary(1.7);
     m_tab_border_pen = LikePrimary(0.75);
 #ifdef __WXMAC__
@@ -251,9 +256,19 @@ void wxRibbonAUIArtProvider::SetColourScheme(
     m_tab_label_colour = LikePrimary(0.1);
 #endif
     m_tab_hover_background_top_colour =  primary_hsl.ToRGB();
+#ifdef __WXMAC__
+    if ( wxPlatformInfo::Get().CheckOSVersion(10, 10 ) )
+        m_tab_hover_background_top_gradient_colour = m_tab_hover_background_top_colour;
+    else
+#endif
     m_tab_hover_background_top_gradient_colour = LikePrimary(1.6);
     m_tab_hover_background_brush = m_tab_hover_background_top_colour;
     m_tab_active_background_colour = m_tab_ctrl_background_gradient_colour;
+#ifdef __WXMAC__
+    if ( wxPlatformInfo::Get().CheckOSVersion(10, 10 ) )
+        m_tab_active_background_gradient_colour = m_tab_active_background_colour;
+    else
+#endif
     m_tab_active_background_gradient_colour = primary_hsl.ToRGB();
     m_tab_active_top_background_brush = m_tab_active_background_colour;
     m_panel_label_colour = m_tab_label_colour;

From 805db8baa867e05296cc3732e0b13dae595c99a8 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 17 Jun 2018 18:39:01 +0200
Subject: [PATCH 645/916] Dark Mode for wxRenderer for HeaderButtons and Sashes

see #18146
---
 src/osx/carbon/renderer.cpp | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp
index f7cd333d38..0f777377ac 100644
--- a/src/osx/carbon/renderer.cpp
+++ b/src/osx/carbon/renderer.cpp
@@ -172,6 +172,11 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
     wxHeaderSortIconType sortArrow,
     wxHeaderButtonParams* params )
 {
+    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14) )
+    {
+        if ( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() < 128 )
+            return wxRendererNative::GetGeneric().DrawHeaderButton(win, dc,  rect, flags, sortArrow, params);
+    }
     const wxCoord x = rect.x;
     const wxCoord y = rect.y;
     const wxCoord w = rect.width;
@@ -334,7 +339,7 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
     wxOrientation orient,
     int WXUNUSED(flags) )
 {
-    bool hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL;
+    bool hasMetal = win->MacGetTopLevelWindow()->GetExtraStyle() & wxFRAME_EX_METAL && !wxPlatformInfo::Get().CheckOSVersion(10, 14);
     SInt32 height;
 
     height = wxRendererNative::Get().GetSplitterParams(win).widthSash;
@@ -360,13 +365,15 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
         wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
         cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext();
 
-        HIThemeBackgroundDrawInfo bgdrawInfo;
-        bgdrawInfo.version = 0;
-        bgdrawInfo.state = kThemeStateActive;
-        bgdrawInfo.kind = hasMetal ? kThemeBackgroundMetal : kThemeBackgroundPlacard;
-
         if ( hasMetal )
+        {
+            HIThemeBackgroundDrawInfo bgdrawInfo;
+            bgdrawInfo.version = 0;
+            bgdrawInfo.state = kThemeStateActive;
+            bgdrawInfo.kind = hasMetal ? kThemeBackgroundMetal : kThemeBackgroundPlacard;
+
             HIThemeDrawBackground(&splitterRect, &bgdrawInfo, cgContext, kHIThemeOrientationNormal);
+        }
         else
         {
             CGContextSetFillColorWithColor(cgContext,win->GetBackgroundColour().GetCGColor());
@@ -375,11 +382,14 @@ void wxRendererMac::DrawSplitterSash( wxWindow *win,
 
         if ( win->HasFlag(wxSP_3DSASH) )
         {
-            HIThemeSplitterDrawInfo drawInfo;
-            drawInfo.version = 0;
-            drawInfo.state = kThemeStateActive;
-            drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone;
-            HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
+            if ( !wxPlatformInfo::Get().CheckOSVersion(10, 14) || wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() > 128  )
+            {
+                HIThemeSplitterDrawInfo drawInfo;
+                drawInfo.version = 0;
+                drawInfo.state = kThemeStateActive;
+                drawInfo.adornment = hasMetal ? kHIThemeSplitterAdornmentMetal : kHIThemeSplitterAdornmentNone;
+                HIThemeDrawPaneSplitter( &splitterRect, &drawInfo, cgContext, kHIThemeOrientationNormal );
+            }
         }
     }
 }

From fe0f9fefe4e77916f09175e1e67b5860a519a83e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 00:26:32 +0200
Subject: [PATCH 646/916] Refactor wxDCClipper ctors to use a common Init()
 method

No changes, this is just a pure refactoring to facilitate the upcoming
change which won't have to be done in all these ctors any more.
---
 include/wx/dc.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 38edf9da5f..cfc57cd1bd 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1437,18 +1437,15 @@ class WXDLLIMPEXP_CORE wxDCClipper
 public:
     wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc)
     {
-        dc.GetClippingBox(m_oldClipRect);
-        dc.SetClippingRegion(r.GetBox());
+        Init(r.GetBox());
     }
     wxDCClipper(wxDC& dc, const wxRect& r) : m_dc(dc)
     {
-        dc.GetClippingBox(m_oldClipRect);
-        dc.SetClippingRegion(r.x, r.y, r.width, r.height);
+        Init(r);
     }
     wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) : m_dc(dc)
     {
-        dc.GetClippingBox(m_oldClipRect);
-        dc.SetClippingRegion(x, y, w, h);
+        Init(wxRect(x, y, w, h));
     }
 
     ~wxDCClipper()
@@ -1459,6 +1456,13 @@ public:
     }
 
 private:
+    // Common part of all ctors.
+    void Init(const wxRect& r)
+    {
+        m_dc.GetClippingBox(m_oldClipRect);
+        m_dc.SetClippingRegion(r);
+    }
+
     wxDC& m_dc;
     wxRect m_oldClipRect;
 

From 119dce5eb8db37b60624a7b76e06e42b2b3e555c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 10:21:59 +0200
Subject: [PATCH 647/916] Fix check for existing clipping region in wxDCClipper

wxDC::GetClippingBox() is actually supposed to return a rectangle equal
to the total wxDC area and not an empty rectangle if there is no
clipping box at all, so avoid restoring the old clipping region
unnecessarily in this case too: even if it should be harmless, it's
still unnecessarily inefficient and, in practice, this is not really
harmless neither as wxPdfDC (from the third party wxPdfDocument library)
doesn't handle having a clipping region set when adding a new page
correctly and so using wxDCClipper broke PDF generation.

This fixes another fallout from 2a8c290e0de5e657f22a0c13817df65688b01345

See #13834.
---
 include/wx/dc.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index cfc57cd1bd..76b5df8058 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1459,7 +1459,14 @@ private:
     // Common part of all ctors.
     void Init(const wxRect& r)
     {
+        // GetClippingBox() is supposed to return the rectangle corresponding
+        // to the full DC area and some implementations actually do it, while
+        // others return an empty rectangle instead. Check for both possible
+        // results here to avoid restoring the clipping region unnecessarily in
+        // the dtor.
         m_dc.GetClippingBox(m_oldClipRect);
+        if ( m_oldClipRect == m_dc.GetSize() )
+            m_oldClipRect = wxRect();
         m_dc.SetClippingRegion(r);
     }
 

From e13904308f2b5f7cdf4afb37dd6b44c4d870d87e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 10:54:26 +0200
Subject: [PATCH 648/916] Add convenient tags for clipping box unit tests

No real changes, just replace the old CppUnit test registration macros
with wxREGISTER_UNIT_TEST_WITH_TAGS() which allows to specify the tags
explicitly and use "clip" as the tag for all the tests here to allow
running all of them (and just them) by specifying "[clip]" on the test
program command line.
---
 tests/graphics/clippingbox.cpp | 54 ++++++----------------------------
 1 file changed, 9 insertions(+), 45 deletions(-)

diff --git a/tests/graphics/clippingbox.cpp b/tests/graphics/clippingbox.cpp
index 6074b00e3c..6068660f91 100644
--- a/tests/graphics/clippingbox.cpp
+++ b/tests/graphics/clippingbox.cpp
@@ -244,11 +244,7 @@ protected:
 // For GTK+ 3 wxDC is equivalent to wxGCDC
 // and hence doesn't need to be tested individually.
 #if !defined(__WXGTK3__)
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseDC );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseDC, "ClippingBoxTestCaseDC" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseDC, "[clip][dc]");
 #endif // !__WXGTK3__
 
 #if wxUSE_GRAPHICS_CONTEXT
@@ -342,11 +338,7 @@ protected:
 // For MSW we have individual test cases for each graphics renderer
 // so we don't need to test wxGCDC with default renderer.
 #ifndef __WXMSW__
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseGCDC );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseGCDC, "ClippingBoxTestCaseGCDC" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseGCDC, "[clip][gcdc]");
 #endif // !__WXMSW__
 
 #ifdef __WXMSW__
@@ -403,11 +395,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(ClippingBoxTestCaseGCDCGDIPlus);
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseGCDCGDIPlus );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseGCDCGDIPlus, "ClippingBoxTestCaseGCDCGDIPlus" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseGCDCGDIPlus, "[clip][gcdc][gdi+]");
 
 #endif // wxUSE_GRAPHICS_GDIPLUS
 
@@ -472,11 +460,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(ClippingBoxTestCaseGCDCDirect2D);
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseGCDCDirect2D );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseGCDCDirect2D, "ClippingBoxTestCaseGCDCDirect2D" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseGCDCDirect2D, "[clip][gcdc][d2d]");
 
 #endif // wxUSE_GRAPHICS_DIRECT2D
 
@@ -533,11 +517,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(ClippingBoxTestCaseGCDCCairo);
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseGCDCCairo );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseGCDCCairo, "ClippingBoxTestCaseGCDCCairo" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseGCDCCairo, "[clip][gc][cairo]");
 
 #endif // wxUSE_CAIRO
 
@@ -1619,11 +1599,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(ClippingBoxTestCaseGCGDIPlus);
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseGCGDIPlus );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseGCGDIPlus, "ClippingBoxTestCaseGCGDIPlus" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseGCGDIPlus, "[clip][gc][gdi+]");
 
 #endif // wxUSE_GRAPHICS_GDIPLUS
 
@@ -1673,11 +1649,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(ClippingBoxTestCaseGCDirect2D);
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseGCDirect2D );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseGCDirect2D, "ClippingBoxTestCaseGCDirect2D" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseGCDirect2D, "[clip][gc][d2d]");
 
 #endif // wxUSE_GRAPHICS_DIRECT2D
 
@@ -1718,11 +1690,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(ClippingBoxTestCaseGCCairo);
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseGCCairo );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseGCCairo, "ClippingBoxTestCaseGCCairo" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseGCCairo, "[clip][gc][cairo]");
 
 #endif // wxUSE_CAIRO
 
@@ -1761,11 +1729,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(ClippingBoxTestCaseGCCoreGraphics);
 };
 
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( ClippingBoxTestCaseGCCoreGraphics );
-
-// also include in it's own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ClippingBoxTestCaseGCCoreGraphics, "ClippingBoxTestCaseGCCoreGraphics" );
+wxREGISTER_UNIT_TEST_WITH_TAGS(ClippingBoxTestCaseGCCoreGraphics, "[clip][gc][cg]");
 
 #endif // __WXOSX__
 

From 350867939a2560e8614edb5fe797cc9fbb12f1f6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 14:39:11 +0200
Subject: [PATCH 649/916] Add bool return value for wxDC::GetClippingBox()

Determining whether there is an actual clipping region or not is not
that simple, as shown by the recent problems in wxDCClipper code, so
return a boolean value indicating this from GetClippingBox() directly,
instead of requiring the caller to find it out on their own.

This simplifies wxDCClipper code, as well as any other code calling
GetClippingBox(), at the price of some extra complexity in wxDCImpl
itself, which seems to be worth it.
---
 include/wx/dc.h       | 60 ++++++++++++++++++++++++-------------------
 interface/wx/dc.h     | 24 ++++++++++++++++-
 src/common/dcbase.cpp | 55 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 28 deletions(-)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 76b5df8058..5749d578b3 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -446,21 +446,18 @@ public:
     // NB: this function works with device coordinates, not the logical ones!
     virtual void DoSetDeviceClippingRegion(const wxRegion& region) = 0;
 
-    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
-                                  wxCoord *w, wxCoord *h) const
-    {
-        int dcWidth, dcHeight;
-        DoGetSize(&dcWidth, &dcHeight);
+    // Method used to implement wxDC::GetClippingBox().
+    //
+    // Default implementation returns values stored in m_clip[XY][12] member
+    // variables, so this method doesn't need to be overridden if they're kept
+    // up to date.
+    virtual bool DoGetClippingRect(wxRect& rect) const;
 
-        if ( x )
-            *x = m_clipping ? m_clipX1 : DeviceToLogicalX(0);
-        if ( y )
-            *y = m_clipping ? m_clipY1 : DeviceToLogicalY(0);
-        if ( w )
-            *w = m_clipping ? m_clipX2 - m_clipX1 : DeviceToLogicalXRel(dcWidth);
-        if ( h )
-            *h = m_clipping ? m_clipY2 - m_clipY1 : DeviceToLogicalYRel(dcHeight);
-    }
+    // This method is kept for backwards compatibility but shouldn't be used
+    // nor overridden in the new code, implement DoGetClippingRect() above
+    // instead.
+    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
+                                  wxCoord *w, wxCoord *h) const;
 
     virtual void DestroyClippingRegion() { ResetClipping(); }
 
@@ -736,6 +733,9 @@ protected:
 #endif // wxUSE_PALETTE
 
 private:
+    // Return the full DC area in logical coordinates.
+    wxRect GetLogicalArea() const;
+
     wxDECLARE_ABSTRACT_CLASS(wxDCImpl);
 };
 
@@ -959,10 +959,22 @@ public:
     void DestroyClippingRegion()
         { m_pimpl->DestroyClippingRegion(); }
 
-    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
-        { m_pimpl->DoGetClippingBox(x, y, w, h); }
-    void GetClippingBox(wxRect& rect) const
-        { m_pimpl->DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height); }
+    bool GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+    {
+        wxRect r;
+        const bool clipping = m_pimpl->DoGetClippingRect(r);
+        if ( x )
+            *x = r.x;
+        if ( y )
+            *y = r.y;
+        if ( w )
+            *w = r.width;
+        if ( h )
+            *h = r.height;
+        return clipping;
+    }
+    bool GetClippingBox(wxRect& rect) const
+        { return m_pimpl->DoGetClippingRect(rect); }
 
     // coordinates conversions and transforms
 
@@ -1451,7 +1463,7 @@ public:
     ~wxDCClipper()
     {
         m_dc.DestroyClippingRegion();
-        if ( !m_oldClipRect.IsEmpty() )
+        if ( m_restoreOld )
             m_dc.SetClippingRegion(m_oldClipRect);
     }
 
@@ -1459,19 +1471,13 @@ private:
     // Common part of all ctors.
     void Init(const wxRect& r)
     {
-        // GetClippingBox() is supposed to return the rectangle corresponding
-        // to the full DC area and some implementations actually do it, while
-        // others return an empty rectangle instead. Check for both possible
-        // results here to avoid restoring the clipping region unnecessarily in
-        // the dtor.
-        m_dc.GetClippingBox(m_oldClipRect);
-        if ( m_oldClipRect == m_dc.GetSize() )
-            m_oldClipRect = wxRect();
+        m_restoreOld = m_dc.GetClippingBox(m_oldClipRect);
         m_dc.SetClippingRegion(r);
     }
 
     wxDC& m_dc;
     wxRect m_oldClipRect;
+    bool m_restoreOld;
 
     wxDECLARE_NO_COPY_CLASS(wxDCClipper);
 };
diff --git a/interface/wx/dc.h b/interface/wx/dc.h
index 79490c9c9a..9e363dc90a 100644
--- a/interface/wx/dc.h
+++ b/interface/wx/dc.h
@@ -764,8 +764,30 @@ public:
 
         @remarks
         Clipping region is given in logical coordinates.
+
+        @param x If non-@NULL, filled in with the logical horizontal coordinate
+            of the top left corner of the clipping region if the function
+            returns true or 0 otherwise.
+        @param y If non-@NULL, filled in with the logical vertical coordinate
+            of the top left corner of the clipping region if the function
+            returns true or 0 otherwise.
+        @param width If non-@NULL, filled in with the width of the clipping
+            region if the function returns true or the device context width
+            otherwise.
+        @param height If non-@NULL, filled in with the height of the clipping
+            region if the function returns true or the device context height
+            otherwise.
+        @return @true if there is a clipping region or @false if there is no
+            active clipping region (note that this return value is available
+            only since wxWidgets 3.1.2, this function didn't return anything in
+            the previous versions).
     */
-    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) const;
+    bool GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) const;
+
+    /**
+        @overload
+    */
+    bool GetClippingBox(wxRect& rect) const;
 
     /**
         Sets the clipping region for this device context to the intersection of
diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 6747d70f6b..a458696c1a 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -406,6 +406,61 @@ void wxDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
     }
 }
 
+wxRect wxDCImpl::GetLogicalArea() const
+{
+    const wxSize size = GetSize();
+    return wxRect(DeviceToLogicalX(0),
+                  DeviceToLogicalY(0),
+                  DeviceToLogicalXRel(size.x),
+                  DeviceToLogicalYRel(size.y));
+}
+
+bool wxDCImpl::DoGetClippingRect(wxRect& rect) const
+{
+    // Call the old function for compatibility.
+    DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height);
+    if ( rect != wxRect(-1, -1, 0, 0) )
+    {
+        // Custom overridden version of DoGetClippingBox() was called, we need
+        // to check if there is an actual clipping region or not. Normally the
+        // function is supposed to return the whole DC area (in logical
+        // coordinates) in this case, but also check that the clipping region
+        // is not empty because some implementations seem to do this instead.
+        return !rect.IsEmpty() && rect != GetLogicalArea();
+    }
+
+    if ( m_clipping )
+    {
+        rect = wxRect(m_clipX1,
+                      m_clipY1,
+                      m_clipX2 - m_clipX1,
+                      m_clipY2 - m_clipY1);
+
+        return true;
+    }
+    else // No active clipping region.
+    {
+        rect = GetLogicalArea();
+
+        return false;
+    }
+}
+
+void wxDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y,
+                                wxCoord *w, wxCoord *h) const
+{
+    // Dummy implementation just to allow DoGetClippingRect() above to
+    // determine if this version was called or not.
+    if ( x )
+        *x = -1;
+    if ( y )
+        *y = -1;
+    if ( w )
+        *w = 0;
+    if ( h )
+        *h = 0;
+}
+
 // ----------------------------------------------------------------------------
 // coordinate conversions and transforms
 // ----------------------------------------------------------------------------

From 6a442d272347c647062ebd3cb1dcf4cae04248f8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 16:53:52 +0200
Subject: [PATCH 650/916] Remove unnecessary clipping virtual methods from
 wxSVGFileDCImpl

These methods seem to be useless as they're never called, only the
corresponding DoXXX() methods are used by wxDC.
---
 include/wx/dcsvg.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 66d1cb42ea..488d0c3057 100644
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -86,23 +86,11 @@ public:
     virtual wxCoord GetCharHeight() const wxOVERRIDE;
     virtual wxCoord GetCharWidth() const wxOVERRIDE;
 
-    virtual void SetClippingRegion(wxCoord x, wxCoord y,
-                                   wxCoord w, wxCoord h)
-    {
-        DoSetClippingRegion(x, y, w, h);
-    }
-
     virtual void SetPalette(const wxPalette&  WXUNUSED(palette)) wxOVERRIDE
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented"));
     }
 
-    virtual void GetClippingBox(wxCoord *x, wxCoord *y,
-                                wxCoord *w, wxCoord *h)
-    {
-        DoGetClippingBox(x, y, w, h);
-    }
-
     virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) wxOVERRIDE
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented"));

From 070336470f27e046bc29f00688cea4833a6b218b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 16:54:50 +0200
Subject: [PATCH 651/916] Make wxSVGFileDC::GetClippingBox() actually work

wxSVGFileDCImpl class uses the default, i.e. inherited from wxDCImpl,
implementation of this method, but for it to work, the clipping box
coordinates stored in wxDCImpl need to be updated when the clipping
region changes or is destroyed and this wasn't done before.

Fix this now and add a unit test verifying that this indeed works.
---
 src/common/dcsvg.cpp           |  6 ++++++
 tests/graphics/clippingbox.cpp | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index ca44afcac3..9eb2f4f0fb 100644
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -934,6 +934,9 @@ void wxSVGFileDCImpl::DoSetClippingRegion(int x, int y, int width, int height)
 
     m_clipUniqueId++;
     m_clipNestingLevel++;
+
+    // Update the base class m_clip[XY][12] fields too.
+    wxDCImpl::DoSetClippingRegion(x, y, width, height);
 }
 
 void wxSVGFileDCImpl::DestroyClippingRegion()
@@ -958,6 +961,9 @@ void wxSVGFileDCImpl::DestroyClippingRegion()
     DoStartNewGraphics();
 
     m_clipUniqueId = 0;
+
+    // Also update the base class clipping region information.
+    wxDCImpl::DestroyClippingRegion();
 }
 
 void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent, wxCoord *externalLeading, const wxFont *font) const
diff --git a/tests/graphics/clippingbox.cpp b/tests/graphics/clippingbox.cpp
index 6068660f91..42eed74701 100644
--- a/tests/graphics/clippingbox.cpp
+++ b/tests/graphics/clippingbox.cpp
@@ -21,7 +21,9 @@
 #if wxUSE_GRAPHICS_CONTEXT
 #include "wx/dcgraph.h"
 #endif // wxUSE_GRAPHICS_CONTEXT
+#include "wx/dcsvg.h"
 
+#include "testfile.h"
 
 // ----------------------------------------------------------------------------
 // test class
@@ -2122,3 +2124,29 @@ void ClippingBoxTestCaseGCBase::RegionsAndPushPopState()
 }
 
 #endif // wxUSE_GRAPHICS_CONTEXT
+
+#if wxUSE_SVG
+
+// We can't reuse the existing tests for wxSVGFileDC as we can't check its
+// output, but we can still at least check the behaviour of GetClippingBox().
+TEST_CASE("ClippingBoxTestCaseSVGDC", "[clip][svgdc]")
+{
+    TestFile tf;
+    wxSVGFileDC dc(tf.GetName(), s_dcSize.x, s_dcSize.y);
+
+    wxRect rect;
+    dc.GetClippingBox(rect);
+    CHECK( rect == wxRect(s_dcSize) );
+
+    const wxRect rectClip(10, 20, 80, 75);
+    dc.SetClippingRegion(rectClip);
+
+    dc.GetClippingBox(rect);
+    CHECK( rect == rectClip );
+
+    dc.DestroyClippingRegion();
+    dc.GetClippingBox(rect);
+    CHECK( rect == wxRect(s_dcSize) );
+}
+
+#endif // wxUSE_SVG

From 110ace680be6cc91c40366391873658d63fd7481 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 22:53:53 +0200
Subject: [PATCH 652/916] Remove unnecessary calls from wxDCImpl ctor

There is no need to call neither ResetBoundingBox() nor ResetClipping()
when the variables they reset had just been initialized to the same
values in the ctor initializer list.
---
 src/common/dcbase.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index a458696c1a..0a0e2d2f1d 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -353,9 +353,6 @@ wxDCImpl::wxDCImpl( wxDC *owner )
                     (double)wxGetDisplaySizeMM().GetWidth();
     m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() /
                     (double)wxGetDisplaySizeMM().GetHeight();
-
-    ResetBoundingBox();
-    ResetClipping();
 }
 
 wxDCImpl::~wxDCImpl()

From 43ce00b5bd2ba645eb0788e35abc8858d9e156e7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 22:52:23 +0200
Subject: [PATCH 653/916] Call base class version from overridden
 DestroyClippingRegion()

No real changes, just call wxDCImpl::DestroyClippingRegion() from
the overridden versions in the derived classes instead of calling
ResetClipping(): this makes the code more clear as it follows the usual
pattern of the derived class doing something first and then forwarding
to the base class.

Also, as ResetClipping() is not really useful, add a comment documenting
that it shouldn't be used in the new code.
---
 include/wx/dc.h        | 5 ++++-
 src/common/dcgraph.cpp | 2 +-
 src/dfb/dc.cpp         | 2 +-
 src/qt/dc.cpp          | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 5749d578b3..55b1129218 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -666,7 +666,10 @@ private:
     wxDC       *m_owner;
 
 protected:
-    // unset clipping variables (after clipping region was destroyed)
+    // This method exists for backwards compatibility only (while it's not
+    // documented, there are derived classes using it outside wxWidgets
+    // itself), don't use it in any new code and just call wxDCImpl version of
+    // DestroyClippingRegion() to reset the clipping information instead.
     void ResetClipping()
     {
         m_clipping = false;
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 6eafed2622..8a1441697d 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -376,7 +376,7 @@ void wxGCDCImpl::DestroyClippingRegion()
     m_graphicContext->SetPen( m_pen );
     m_graphicContext->SetBrush( m_brush );
 
-    ResetClipping();
+    wxDCImpl::DestroyClippingRegion();
     m_isClipBoxValid = false;
 }
 
diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index a8458e58ea..d6141a7602 100644
--- a/src/dfb/dc.cpp
+++ b/src/dfb/dc.cpp
@@ -115,7 +115,7 @@ void wxDFBDCImpl::DestroyClippingRegion()
 
     m_surface->SetClip(NULL);
 
-    ResetClipping();
+    wxDCImpl::DestroyClippingRegion();
 }
 
 // ---------------------------------------------------------------------------
diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp
index 98c21fa739..38e4e0af21 100644
--- a/src/qt/dc.cpp
+++ b/src/qt/dc.cpp
@@ -454,7 +454,7 @@ void wxQtDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
 
 void wxQtDCImpl::DestroyClippingRegion()
 {
-    ResetClipping();
+    wxDCImpl::DestroyClippingRegion();
     m_clippingRegion->Clear();
 
     if (m_qtPainter->isActive())

From c5530b1abf36c652c29611c2ccb5a9d01305a3c1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 18 Jun 2018 23:57:05 +0200
Subject: [PATCH 654/916] Switch to using DoGetClippingRect() instead of
 DoGetClippingBox()

The new method returns a boolean flag which indicates whether there is
any clipping region or not and so is preferable to using the old one and
checking its return value to determine this, which can't be done
reliably.
---
 include/wx/dc.h           |  8 ++++++--
 include/wx/dcgraph.h      |  3 +--
 include/wx/gtk/dcclient.h |  2 +-
 include/wx/msw/dc.h       |  3 +--
 src/common/dcbase.cpp     | 16 ++++++++++------
 src/common/dcgraph.cpp    | 24 ++++++++++++++----------
 src/gtk/dcclient.cpp      | 13 +++----------
 src/msw/dc.cpp            | 27 +++++++++++++++++----------
 src/msw/dcclient.cpp      |  2 +-
 9 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 55b1129218..a34a73b698 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -453,11 +453,15 @@ public:
     // up to date.
     virtual bool DoGetClippingRect(wxRect& rect) const;
 
+#if WXWIN_COMPATIBILITY_3_0
     // This method is kept for backwards compatibility but shouldn't be used
     // nor overridden in the new code, implement DoGetClippingRect() above
     // instead.
-    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
-                                  wxCoord *w, wxCoord *h) const;
+    wxDEPRECATED_BUT_USED_INTERNALLY(
+        virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
+                                      wxCoord *w, wxCoord *h) const
+    );
+#endif // WXWIN_COMPATIBILITY_3_0
 
     virtual void DestroyClippingRegion() { ResetClipping(); }
 
diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index f9ac7461dd..9a11a19ce4 100644
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -195,8 +195,7 @@ public:
     virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height) wxOVERRIDE;
-    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
-                                  wxCoord *w, wxCoord *h) const wxOVERRIDE;
+    virtual bool DoGetClippingRect(wxRect& rect) const wxOVERRIDE;
 
     virtual void DoGetTextExtent(const wxString& string,
         wxCoord *x, wxCoord *y,
diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 7911b74274..a633faccda 100644
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -71,7 +71,7 @@ public:
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE;
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) wxOVERRIDE;
     virtual void DoSetDeviceClippingRegion( const wxRegion &region ) wxOVERRIDE;
-    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const wxOVERRIDE;
+    virtual bool DoGetClippingRect(wxRect& rect) const wxOVERRIDE;
 
     virtual wxCoord GetCharWidth() const wxOVERRIDE;
     virtual wxCoord GetCharHeight() const wxOVERRIDE;
diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 269b81cff2..7e16a138b2 100644
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -243,8 +243,7 @@ public:
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
                                      wxCoord width, wxCoord height) wxOVERRIDE;
     virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
-    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
-                                  wxCoord *w, wxCoord *h) const wxOVERRIDE;
+    virtual bool DoGetClippingRect(wxRect& rect) const wxOVERRIDE;
 
     virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
 
diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 0a0e2d2f1d..1363984b7e 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -414,6 +414,7 @@ wxRect wxDCImpl::GetLogicalArea() const
 
 bool wxDCImpl::DoGetClippingRect(wxRect& rect) const
 {
+#if WXWIN_COMPATIBILITY_3_0
     // Call the old function for compatibility.
     DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height);
     if ( rect != wxRect(-1, -1, 0, 0) )
@@ -425,6 +426,7 @@ bool wxDCImpl::DoGetClippingRect(wxRect& rect) const
         // is not empty because some implementations seem to do this instead.
         return !rect.IsEmpty() && rect != GetLogicalArea();
     }
+#endif // WXWIN_COMPATIBILITY_3_0
 
     if ( m_clipping )
     {
@@ -443,6 +445,7 @@ bool wxDCImpl::DoGetClippingRect(wxRect& rect) const
     }
 }
 
+#if WXWIN_COMPATIBILITY_3_0
 void wxDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y,
                                 wxCoord *w, wxCoord *h) const
 {
@@ -457,6 +460,7 @@ void wxDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y,
     if ( h )
         *h = 0;
 }
+#endif // WXWIN_COMPATIBILITY_3_0
 
 // ----------------------------------------------------------------------------
 // coordinate conversions and transforms
@@ -1370,12 +1374,12 @@ void wxDC::GetDeviceOrigin(long *x, long *y) const
 
 void wxDC::GetClippingBox(long *x, long *y, long *w, long *h) const
     {
-        wxCoord xx,yy,ww,hh;
-        m_pimpl->DoGetClippingBox(&xx, &yy, &ww, &hh);
-        if (x) *x = xx;
-        if (y) *y = yy;
-        if (w) *w = ww;
-        if (h) *h = hh;
+        wxRect r;
+        m_pimpl->DoGetClippingRect(r);
+        if (x) *x = r.x;
+        if (y) *y = r.y;
+        if (w) *w = r.width;
+        if (h) *h = r.height;
     }
 
 void wxDC::DrawObject(wxDrawObject* drawobject)
diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 8a1441697d..d70113dfcc 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -282,6 +282,17 @@ void wxGCDCImpl::UpdateClipBox()
     double x, y, w, h;
     m_graphicContext->GetClipBox(&x, &y, &w, &h);
 
+    // We shouldn't reset m_clipping if the clipping region that we set happens
+    // to be empty (e.g. because its intersection with the previous clipping
+    // region was empty), but we should set it to true if we do have a valid
+    // clipping region and it was false which may happen if the clipping region
+    // set from the outside of wxWidgets code.
+    if ( !m_clipping )
+    {
+        if ( w != 0. && h != 0. )
+            m_clipping = true;
+    }
+
     m_clipX1 = wxRound(x);
     m_clipY1 = wxRound(y);
     m_clipX2 = wxRound(x+w);
@@ -289,9 +300,9 @@ void wxGCDCImpl::UpdateClipBox()
     m_isClipBoxValid = true;
 }
 
-void wxGCDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+bool wxGCDCImpl::DoGetClippingRect(wxRect& rect) const
 {
-    wxCHECK_RET( IsOk(), wxS("wxGCDC::DoGetClippingRegion - invalid GC") );
+    wxCHECK_MSG( IsOk(), false, wxS("wxGCDC::DoGetClippingRegion - invalid GC") );
     // Check if we should retrieve the clipping region possibly not set
     // by SetClippingRegion() but modified by application: this can
     // happen when we're associated with an existing graphics context using
@@ -303,14 +314,7 @@ void wxGCDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h
         self->UpdateClipBox();
     }
 
-    if ( x )
-        *x = m_clipX1;
-    if ( y )
-        *y = m_clipY1;
-    if ( w )
-        *w = m_clipX2 - m_clipX1;
-    if ( h )
-        *h = m_clipY2 - m_clipY1;
+    return wxDCImpl::DoGetClippingRect(rect);
 }
 
 void wxGCDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 0f29c219f5..9e98f62b4d 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1914,9 +1914,9 @@ void wxWindowDCImpl::UpdateClipBox()
     m_isClipBoxValid = true;
 }
 
-void wxWindowDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+bool wxWindowDCImpl::DoGetClippingRect(wxRect& rect) const
 {
-    wxCHECK_RET( IsOk(), wxS("invalid window dc") );
+    wxCHECK_MSG( IsOk(), false, wxS("invalid window dc") );
 
     // Check if we should try to retrieve the clipping region possibly not set
     // by our SetClippingRegion() but preset or modified by application: this
@@ -1928,14 +1928,7 @@ void wxWindowDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoor
         self->UpdateClipBox();
     }
 
-    if ( x )
-        *x = m_clipX1;
-    if ( y )
-        *y = m_clipY1;
-    if ( w )
-        *w = m_clipX2 - m_clipX1;
-    if ( h )
-        *h = m_clipY2 - m_clipY1;
+    return wxGTKDCImpl::DoGetClippingRect(rect);
 }
 
 void wxWindowDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 404c86735b..41ada622d9 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -574,8 +574,7 @@ void wxMSWDCImpl::UpdateClipBox()
     m_isClipBoxValid = true;
 }
 
-void
-wxMSWDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+bool wxMSWDCImpl::DoGetClippingRect(wxRect& rect) const
 {
     // check if we should try to retrieve the clipping region possibly not set
     // by our SetClippingRegion() but preset or modified by Windows: this
@@ -589,14 +588,22 @@ wxMSWDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) co
         self->UpdateClipBox();
     }
 
-    if ( x )
-        *x = m_clipX1;
-    if ( y )
-        *y = m_clipY1;
-    if ( w )
-        *w = m_clipX2 - m_clipX1;
-    if ( h )
-        *h = m_clipY2 - m_clipY1;
+    // Unfortunately we can't just call wxDCImpl::DoGetClippingRect() here
+    // because it wouldn't return the correct result if there is no clipping
+    // region and this DC has a world transform applied to it, as the base
+    // class version doesn't know anything about world transforms and wouldn't
+    // apply it to GetLogicalArea() that it returns in this case.
+    //
+    // We could solve this by overriding GetLogicalArea() in wxMSW and using
+    // DPtoLP() to perform the conversion correctly ourselves, but it's even
+    // simpler to just use the value returned by our UpdateClipBox() which is
+    // already correct in any case, so just do this instead.
+    rect = wxRect(m_clipX1,
+                  m_clipY1,
+                  m_clipX2 - m_clipX1,
+                  m_clipY2 - m_clipY1);
+
+    return m_clipping;
 }
 
 // common part of DoSetClippingRegion() and DoSetDeviceClippingRegion()
diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp
index 511256f4a5..ae8cbeaec0 100644
--- a/src/msw/dcclient.cpp
+++ b/src/msw/dcclient.cpp
@@ -302,7 +302,7 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
     InitDC();
 
     // the HDC can have a clipping box (which we didn't set), make sure our
-    // DoGetClippingBox() checks for it
+    // DoGetClippingRect() checks for it
     m_clipping = true;
 }
 

From 778bccbf1253a4737c5ef93ff12c01176e3c3441 Mon Sep 17 00:00:00 2001
From: Tobias Taschner <TcT2k@users.noreply.github.com>
Date: Mon, 18 Jun 2018 10:54:45 +0200
Subject: [PATCH 655/916] Include macOS 10.14 name in wxGetOsDescription()

---
 src/osx/cocoa/utils_base.mm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/osx/cocoa/utils_base.mm b/src/osx/cocoa/utils_base.mm
index 588392590b..97e06079a6 100644
--- a/src/osx/cocoa/utils_base.mm
+++ b/src/osx/cocoa/utils_base.mm
@@ -140,6 +140,9 @@ wxString wxGetOsDescription()
             case 13:
                 osName = "High Sierra";
                 break;
+            case 14:
+                osName = "Mojave";
+                break;
         };
     }
 #else

From dcd012184a82f1f8538fe90c2c9c0e7286ec59d8 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 19 Jun 2018 21:49:15 +0200
Subject: [PATCH 656/916] Dark Mode for wxPropertyGrid

see #18146, thanks to dkulp
---
 src/propgrid/propgrid.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index b08d74fabb..d2509b993a 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -1425,6 +1425,9 @@ void wxPropertyGrid::RegainColours()
         int colDec = -72;
     #endif
         wxColour capForeCol = wxPGAdjustColour(m_colCapBack,colDec,5000,5000,true);
+        if (wxPGGetColAvg(m_colCapBack) < 100)
+            capForeCol = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+        
         m_colCapFore = capForeCol;
         m_categoryDefaultCell.GetData()->SetFgCol(capForeCol);
     }

From c58d7755a1e387bd3ef17c6b3125580e36541677 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 19 Jun 2018 21:50:34 +0200
Subject: [PATCH 657/916] Dark Mode for non native toolbar

see #18146
---
 src/osx/cocoa/toolbar.mm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 6fbbd937b2..b37e841a6f 100644
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -1673,7 +1673,10 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
         
         wxRect rect(0,0,w,h);
         
-        dc.GradientFillLinear( rect , wxColour( 0xCC,0xCC,0xCC ), wxColour( 0xA8,0xA8,0xA8 ) , wxSOUTH );
+        //  TODO determine whether to use flat appearance in earlier system
+        if ( !wxPlatformInfo::Get().CheckOSVersion(10, 14 ) )
+            dc.GradientFillLinear( rect , wxColour( 0xCC,0xCC,0xCC ), wxColour( 0xA8,0xA8,0xA8 ) , wxSOUTH );
+        
         dc.SetPen( wxPen( wxColour( 0x51,0x51,0x51 ) ) );
         if ( HasFlag(wxTB_LEFT) )
             dc.DrawLine(w-1, 0, w-1, h);

From 3e078d509c3decba1aeab4015c3f7c99b639eaf1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Jun 2018 13:52:50 +0200
Subject: [PATCH 658/916] Remove WXDLLIMPEXP_CORE from wxArrayTreeItemIds
 declaration

This class doesn't have any non-inline methods and so doesn't need to be
exported from the DLL.

This also avoids warnings in MSVC DLL build about using non
dll-interface class wxArrayTreeItemIdsBase as base for dll-interface
class wxArrayTreeItemIds (C4275).
---
 include/wx/treebase.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 3c75616d22..e2fd96d5e6 100644
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -79,7 +79,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxTreeItemIdValue, wxArrayTreeItemIdsBase);
 // this is a wrapper around the array class defined above which allow to wok
 // with values of natural wxTreeItemId type instead of using wxTreeItemIdValue
 // and does it without any loss of efficiency
-class WXDLLIMPEXP_CORE wxArrayTreeItemIds : public wxArrayTreeItemIdsBase
+class wxArrayTreeItemIds : public wxArrayTreeItemIdsBase
 {
 public:
     void Add(const wxTreeItemId& id)

From abce91f9671f8e3df34aac265b06a14f9c81bd2b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Jun 2018 13:59:03 +0200
Subject: [PATCH 659/916] Remove dynarray.cpp source file

After the recent dynamic array macros refactoring, there was no
implementation of wxBaseArray any more and only wxArrayString-related
code remained in this file, so just move the latter to arrstr.cpp, where
it should have been put from the beginning (except that this code
probably predates arrstr.cpp addition), and remove the old file
entirely.
---
 Makefile.in                                  |  19 ---
 build/bakefiles/files.bkl                    |   1 -
 build/cmake/files.cmake                      |   1 -
 build/files                                  |   1 -
 build/msw/makefile.bcc                       |  16 ---
 build/msw/makefile.gcc                       |  16 ---
 build/msw/makefile.vc                        |  16 ---
 build/msw/wx_base.vcxproj                    |   1 -
 build/msw/wx_base.vcxproj.filters            |   3 -
 build/msw/wx_vc7_base.vcproj                 |   3 -
 build/msw/wx_vc8_base.vcproj                 |   4 -
 build/msw/wx_vc9_base.vcproj                 |   4 -
 build/osx/wxcocoa.xcodeproj/project.pbxproj  |   8 --
 build/osx/wxiphone.xcodeproj/project.pbxproj |   4 -
 src/common/arrstr.cpp                        | 110 ++++++++++++++-
 src/common/descrip.mms                       |   3 -
 src/common/dynarray.cpp                      | 135 -------------------
 17 files changed, 109 insertions(+), 236 deletions(-)
 delete mode 100644 src/common/dynarray.cpp

diff --git a/Makefile.in b/Makefile.in
index d2b234ea11..94c92f2eef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -780,7 +780,6 @@ ALL_BASE_SOURCES =  \
 	src/common/datetimefmt.cpp \
 	src/common/datstrm.cpp \
 	src/common/dircmn.cpp \
-	src/common/dynarray.cpp \
 	src/common/dynlib.cpp \
 	src/common/dynload.cpp \
 	src/common/encconv.cpp \
@@ -964,7 +963,6 @@ MONODLL_OBJECTS =  \
 	monodll_datetimefmt.o \
 	monodll_datstrm.o \
 	monodll_dircmn.o \
-	monodll_dynarray.o \
 	monodll_dynlib.o \
 	monodll_dynload.o \
 	monodll_encconv.o \
@@ -1107,7 +1105,6 @@ MONOLIB_OBJECTS =  \
 	monolib_datetimefmt.o \
 	monolib_datstrm.o \
 	monolib_dircmn.o \
-	monolib_dynarray.o \
 	monolib_dynlib.o \
 	monolib_dynload.o \
 	monolib_encconv.o \
@@ -1239,7 +1236,6 @@ BASEDLL_OBJECTS =  \
 	basedll_datetimefmt.o \
 	basedll_datstrm.o \
 	basedll_dircmn.o \
-	basedll_dynarray.o \
 	basedll_dynlib.o \
 	basedll_dynload.o \
 	basedll_encconv.o \
@@ -1354,7 +1350,6 @@ BASELIB_OBJECTS =  \
 	baselib_datetimefmt.o \
 	baselib_datstrm.o \
 	baselib_dircmn.o \
-	baselib_dynarray.o \
 	baselib_dynlib.o \
 	baselib_dynload.o \
 	baselib_encconv.o \
@@ -16058,9 +16053,6 @@ monodll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONODLL_ODEP)
 monodll_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
 
-monodll_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
 monodll_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
 
@@ -21320,9 +21312,6 @@ monolib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONOLIB_ODEP)
 monolib_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
 
-monolib_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
 monolib_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
 
@@ -26582,9 +26571,6 @@ basedll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASEDLL_ODEP)
 basedll_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
 
-basedll_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(BASEDLL_ODEP)
-	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
 basedll_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
 
@@ -27062,9 +27048,6 @@ baselib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASELIB_ODEP)
 baselib_dircmn.o: $(srcdir)/src/common/dircmn.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/dircmn.cpp
 
-baselib_dynarray.o: $(srcdir)/src/common/dynarray.cpp $(BASELIB_ODEP)
-	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/dynarray.cpp
-
 baselib_dynlib.o: $(srcdir)/src/common/dynlib.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/dynlib.cpp
 
@@ -37615,7 +37598,6 @@ BASE_DIST: ALL_DIST INTL_DIST
 	mkdir $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 
@@ -37842,7 +37824,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/makefile.* $(DISTDIR)/samples
-	$(CP_P) $(SAMPDIR)/Info.plist $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
 	$(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d529b6d731..7e08bfd60d 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -473,7 +473,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/datetimefmt.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
-    src/common/dynarray.cpp
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 0acb0dc7df..e8dfb59328 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -385,7 +385,6 @@ set(BASE_CMN_SRC
     src/common/datetimefmt.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
-    src/common/dynarray.cpp
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp
diff --git a/build/files b/build/files
index 166aab50a1..54cb655f3a 100644
--- a/build/files
+++ b/build/files
@@ -406,7 +406,6 @@ BASE_CMN_SRC =
     src/common/datetimefmt.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
-    src/common/dynarray.cpp
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 334895a139..54a578174a 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -382,7 +382,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_datetimefmt.obj \
 	$(OBJS)\monodll_datstrm.obj \
 	$(OBJS)\monodll_dircmn.obj \
-	$(OBJS)\monodll_dynarray.obj \
 	$(OBJS)\monodll_dynlib.obj \
 	$(OBJS)\monodll_dynload.obj \
 	$(OBJS)\monodll_encconv.obj \
@@ -535,7 +534,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_datetimefmt.obj \
 	$(OBJS)\monolib_datstrm.obj \
 	$(OBJS)\monolib_dircmn.obj \
-	$(OBJS)\monolib_dynarray.obj \
 	$(OBJS)\monolib_dynlib.obj \
 	$(OBJS)\monolib_dynload.obj \
 	$(OBJS)\monolib_encconv.obj \
@@ -684,7 +682,6 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_datetimefmt.obj \
 	$(OBJS)\basedll_datstrm.obj \
 	$(OBJS)\basedll_dircmn.obj \
-	$(OBJS)\basedll_dynarray.obj \
 	$(OBJS)\basedll_dynlib.obj \
 	$(OBJS)\basedll_dynload.obj \
 	$(OBJS)\basedll_encconv.obj \
@@ -818,7 +815,6 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_datetimefmt.obj \
 	$(OBJS)\baselib_datstrm.obj \
 	$(OBJS)\baselib_dircmn.obj \
-	$(OBJS)\baselib_dynarray.obj \
 	$(OBJS)\baselib_dynlib.obj \
 	$(OBJS)\baselib_dynload.obj \
 	$(OBJS)\baselib_encconv.obj \
@@ -6475,9 +6471,6 @@ $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\monodll_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\monodll_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -9024,9 +9017,6 @@ $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -11573,9 +11563,6 @@ $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -11921,9 +11908,6 @@ $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 7a686f28c3..8a94040201 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -370,7 +370,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_datetimefmt.o \
 	$(OBJS)\monodll_datstrm.o \
 	$(OBJS)\monodll_dircmn.o \
-	$(OBJS)\monodll_dynarray.o \
 	$(OBJS)\monodll_dynlib.o \
 	$(OBJS)\monodll_dynload.o \
 	$(OBJS)\monodll_encconv.o \
@@ -524,7 +523,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_datetimefmt.o \
 	$(OBJS)\monolib_datstrm.o \
 	$(OBJS)\monolib_dircmn.o \
-	$(OBJS)\monolib_dynarray.o \
 	$(OBJS)\monolib_dynlib.o \
 	$(OBJS)\monolib_dynload.o \
 	$(OBJS)\monolib_encconv.o \
@@ -674,7 +672,6 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_datetimefmt.o \
 	$(OBJS)\basedll_datstrm.o \
 	$(OBJS)\basedll_dircmn.o \
-	$(OBJS)\basedll_dynarray.o \
 	$(OBJS)\basedll_dynlib.o \
 	$(OBJS)\basedll_dynload.o \
 	$(OBJS)\basedll_encconv.o \
@@ -808,7 +805,6 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_datetimefmt.o \
 	$(OBJS)\baselib_datstrm.o \
 	$(OBJS)\baselib_dircmn.o \
-	$(OBJS)\baselib_dynarray.o \
 	$(OBJS)\baselib_dynlib.o \
 	$(OBJS)\baselib_dynload.o \
 	$(OBJS)\baselib_encconv.o \
@@ -6657,9 +6653,6 @@ $(OBJS)\monodll_datstrm.o: ../../src/common/datstrm.cpp
 $(OBJS)\monodll_dircmn.o: ../../src/common/dircmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_dynarray.o: ../../src/common/dynarray.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_dynlib.o: ../../src/common/dynlib.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9208,9 +9201,6 @@ $(OBJS)\monolib_datstrm.o: ../../src/common/datstrm.cpp
 $(OBJS)\monolib_dircmn.o: ../../src/common/dircmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_dynarray.o: ../../src/common/dynarray.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_dynlib.o: ../../src/common/dynlib.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -11759,9 +11749,6 @@ $(OBJS)\basedll_datstrm.o: ../../src/common/datstrm.cpp
 $(OBJS)\basedll_dircmn.o: ../../src/common/dircmn.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\basedll_dynarray.o: ../../src/common/dynarray.cpp
-	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\basedll_dynlib.o: ../../src/common/dynlib.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -12107,9 +12094,6 @@ $(OBJS)\baselib_datstrm.o: ../../src/common/datstrm.cpp
 $(OBJS)\baselib_dircmn.o: ../../src/common/dircmn.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\baselib_dynarray.o: ../../src/common/dynarray.cpp
-	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\baselib_dynlib.o: ../../src/common/dynlib.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 1015011203..db4b6e918e 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -402,7 +402,6 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_datetimefmt.obj \
 	$(OBJS)\monodll_datstrm.obj \
 	$(OBJS)\monodll_dircmn.obj \
-	$(OBJS)\monodll_dynarray.obj \
 	$(OBJS)\monodll_dynlib.obj \
 	$(OBJS)\monodll_dynload.obj \
 	$(OBJS)\monodll_encconv.obj \
@@ -565,7 +564,6 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_datetimefmt.obj \
 	$(OBJS)\monolib_datstrm.obj \
 	$(OBJS)\monolib_dircmn.obj \
-	$(OBJS)\monolib_dynarray.obj \
 	$(OBJS)\monolib_dynlib.obj \
 	$(OBJS)\monolib_dynload.obj \
 	$(OBJS)\monolib_encconv.obj \
@@ -722,7 +720,6 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_datetimefmt.obj \
 	$(OBJS)\basedll_datstrm.obj \
 	$(OBJS)\basedll_dircmn.obj \
-	$(OBJS)\basedll_dynarray.obj \
 	$(OBJS)\basedll_dynlib.obj \
 	$(OBJS)\basedll_dynload.obj \
 	$(OBJS)\basedll_encconv.obj \
@@ -866,7 +863,6 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_datetimefmt.obj \
 	$(OBJS)\baselib_datstrm.obj \
 	$(OBJS)\baselib_dircmn.obj \
-	$(OBJS)\baselib_dynarray.obj \
 	$(OBJS)\baselib_dynlib.obj \
 	$(OBJS)\baselib_dynload.obj \
 	$(OBJS)\baselib_encconv.obj \
@@ -7172,9 +7168,6 @@ $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\monodll_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\monodll_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -9721,9 +9714,6 @@ $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -12270,9 +12260,6 @@ $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
@@ -12618,9 +12605,6 @@ $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
 $(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp
 
-$(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp
-
 $(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp
 
diff --git a/build/msw/wx_base.vcxproj b/build/msw/wx_base.vcxproj
index 920df8bae3..fd937a91be 100644
--- a/build/msw/wx_base.vcxproj
+++ b/build/msw/wx_base.vcxproj
@@ -471,7 +471,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\src\common\dynarray.cpp" />
     <ClCompile Include="..\..\src\common\dynlib.cpp" />
     <ClCompile Include="..\..\src\common\dynload.cpp" />
     <ClCompile Include="..\..\src\common\encconv.cpp" />
diff --git a/build/msw/wx_base.vcxproj.filters b/build/msw/wx_base.vcxproj.filters
index 30fff49b7e..44e8f07935 100644
--- a/build/msw/wx_base.vcxproj.filters
+++ b/build/msw/wx_base.vcxproj.filters
@@ -72,9 +72,6 @@
     <ClCompile Include="..\..\src\common\dummy.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\common\dynarray.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\common\dynlib.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 007b65e75f..f17b456f79 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -348,9 +348,6 @@
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\src\common\dynarray.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\common\dynlib.cpp">
 			</File>
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index a2014a225b..cf9f52adfe 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -869,10 +869,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\src\common\dynarray.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\dynlib.cpp"
 				>
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 7b04347201..747fc6838a 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -865,10 +865,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\src\common\dynarray.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\common\dynlib.cpp"
 				>
diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj
index 2954b26491..98a74c5db0 100644
--- a/build/osx/wxcocoa.xcodeproj/project.pbxproj
+++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj
@@ -1028,9 +1028,6 @@
 		5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; };
 		5417332FE2DB3CD3A647B15E /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; };
 		5417332FE2DB3CD3A647B15F /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; };
-		54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; };
-		54A89D04FF953D55AE8DCCF1 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; };
-		54A89D04FF953D55AE8DCCF2 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; };
 		5519BA1F2463308FAC4A0C9F /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57E4784E521339BEB971D81D /* LexAVS.cxx */; };
 		5519BA1F2463308FAC4A0CA0 /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57E4784E521339BEB971D81D /* LexAVS.cxx */; };
 		5519BA1F2463308FAC4A0CA1 /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57E4784E521339BEB971D81D /* LexAVS.cxx */; };
@@ -4490,7 +4487,6 @@
 		AC62806DE67F33E18C386D4F /* LexDMAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMAP.cxx; path = ../../src/stc/scintilla/lexers/LexDMAP.cxx; sourceTree = "<group>"; };
 		AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiaction_osx.cpp; path = ../../src/osx/uiaction_osx.cpp; sourceTree = "<group>"; };
 		AC8BB1AABB3D393EBA527060 /* intl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intl.cpp; path = ../../src/common/intl.cpp; sourceTree = "<group>"; };
-		ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynarray.cpp; path = ../../src/common/dynarray.cpp; sourceTree = "<group>"; };
 		ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ffile.cpp; path = ../../src/common/ffile.cpp; sourceTree = "<group>"; };
 		AE856D950B8C369EB0FE13BA /* datectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectlg.cpp; path = ../../src/generic/datectlg.cpp; sourceTree = "<group>"; };
 		AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = nonownedwnd.mm; path = ../../src/osx/cocoa/nonownedwnd.mm; sourceTree = "<group>"; };
@@ -5967,7 +5963,6 @@
 				864438709B363773B8C3382D /* datetimefmt.cpp */,
 				81B3DFBB73573FFDBD320334 /* datstrm.cpp */,
 				EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */,
-				ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */,
 				D272910EC35531E5B4D6E05B /* dynlib.cpp */,
 				93BA27DFFB023F2EBD6295E3 /* dynload.cpp */,
 				C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */,
@@ -7373,7 +7368,6 @@
 				1D726139C977341A97D0C933 /* datetimefmt.cpp in Sources */,
 				E63364B7E727383BA8E2B7EE /* datstrm.cpp in Sources */,
 				3ED6F4B64C283232A79423D1 /* dircmn.cpp in Sources */,
-				54A89D04FF953D55AE8DCCF2 /* dynarray.cpp in Sources */,
 				AD7EEB418C7930CB828EAF89 /* dynlib.cpp in Sources */,
 				0164A65CDB7A334A8E9AA4C1 /* dynload.cpp in Sources */,
 				246B4FF96BA135258FE45F51 /* encconv.cpp in Sources */,
@@ -8082,7 +8076,6 @@
 				1D726139C977341A97D0C932 /* datetimefmt.cpp in Sources */,
 				E63364B7E727383BA8E2B7ED /* datstrm.cpp in Sources */,
 				3ED6F4B64C283232A79423D0 /* dircmn.cpp in Sources */,
-				54A89D04FF953D55AE8DCCF1 /* dynarray.cpp in Sources */,
 				AD7EEB418C7930CB828EAF88 /* dynlib.cpp in Sources */,
 				0164A65CDB7A334A8E9AA4C0 /* dynload.cpp in Sources */,
 				246B4FF96BA135258FE45F50 /* encconv.cpp in Sources */,
@@ -9306,7 +9299,6 @@
 				1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */,
 				E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */,
 				3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */,
-				54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */,
 				AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */,
 				0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */,
 				246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */,
diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj
index 59850629b9..79482e0900 100644
--- a/build/osx/wxiphone.xcodeproj/project.pbxproj
+++ b/build/osx/wxiphone.xcodeproj/project.pbxproj
@@ -292,7 +292,6 @@
 		5388468A6F8F3141B25CD400 /* treebkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7925E38823563BCDB5565DCF /* treebkg.cpp */; };
 		539B586AEAD630A79FC12ECF /* sstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F46EC1508C063C8395CE7A95 /* sstream.cpp */; };
 		5417332FE2DB3CD3A647B15D /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF1F491B8A8376E8E2E8182 /* cursor.cpp */; };
-		54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */; };
 		5519BA1F2463308FAC4A0C9F /* LexAVS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57E4784E521339BEB971D81D /* LexAVS.cxx */; };
 		551BF168445E3D7BB54D0174 /* LexPS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = EDB48813110636DBA045BF3A /* LexPS.cxx */; };
 		552708E6296D33EBB5F6A493 /* tif_swab.c in Sources */ = {isa = PBXBuildFile; fileRef = AAC12B4456E13F57BEA25A5E /* tif_swab.c */; };
@@ -1438,7 +1437,6 @@
 		AC62806DE67F33E18C386D4F /* LexDMAP.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexDMAP.cxx; path = ../../src/stc/scintilla/lexers/LexDMAP.cxx; sourceTree = "<group>"; };
 		AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uiaction_osx.cpp; path = ../../src/osx/uiaction_osx.cpp; sourceTree = "<group>"; };
 		AC8BB1AABB3D393EBA527060 /* intl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = intl.cpp; path = ../../src/common/intl.cpp; sourceTree = "<group>"; };
-		ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dynarray.cpp; path = ../../src/common/dynarray.cpp; sourceTree = "<group>"; };
 		ADA6B65038FB32F7A3EFBB97 /* ffile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ffile.cpp; path = ../../src/common/ffile.cpp; sourceTree = "<group>"; };
 		AE856D950B8C369EB0FE13BA /* datectlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = datectlg.cpp; path = ../../src/generic/datectlg.cpp; sourceTree = "<group>"; };
 		AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = nonownedwnd.mm; path = ../../src/osx/iphone/nonownedwnd.mm; sourceTree = "<group>"; };
@@ -2579,7 +2577,6 @@
 				864438709B363773B8C3382D /* datetimefmt.cpp */,
 				81B3DFBB73573FFDBD320334 /* datstrm.cpp */,
 				EC9B6DFBF2F73917A99361C5 /* dircmn.cpp */,
-				ACC61BA84C6C33D4BCA403ED /* dynarray.cpp */,
 				D272910EC35531E5B4D6E05B /* dynlib.cpp */,
 				93BA27DFFB023F2EBD6295E3 /* dynload.cpp */,
 				C269E9CA99DF3AE5B1BD6AFA /* encconv.cpp */,
@@ -2893,7 +2890,6 @@
 				1D726139C977341A97D0C931 /* datetimefmt.cpp in Sources */,
 				E63364B7E727383BA8E2B7EC /* datstrm.cpp in Sources */,
 				3ED6F4B64C283232A79423CF /* dircmn.cpp in Sources */,
-				54A89D04FF953D55AE8DCCF0 /* dynarray.cpp in Sources */,
 				AD7EEB418C7930CB828EAF87 /* dynlib.cpp in Sources */,
 				0164A65CDB7A334A8E9AA4BF /* dynload.cpp in Sources */,
 				246B4FF96BA135258FE45F4F /* encconv.cpp in Sources */,
diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp
index cdb9590eaf..721a63f50b 100644
--- a/src/common/arrstr.cpp
+++ b/src/common/arrstr.cpp
@@ -55,7 +55,115 @@ wxArrayString::wxArrayString(size_t sz, const wxString* a)
     assign(a, a + sz);
 }
 
-#if !wxUSE_STD_CONTAINERS
+#if wxUSE_STD_CONTAINERS
+
+#include "wx/arrstr.h"
+
+#include "wx/beforestd.h"
+#include <functional>
+#include "wx/afterstd.h"
+
+// some compilers (Sun CC being the only known example) distinguish between
+// extern "C" functions and the functions with C++ linkage and ptr_fun and
+// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
+// this case, we need the wrappers below to make this work
+struct wxStringCmp
+{
+    typedef wxString first_argument_type;
+    typedef wxString second_argument_type;
+    typedef int result_type;
+
+    int operator()(const wxString& s1, const wxString& s2) const
+    {
+        return s1.compare(s2);
+    }
+};
+
+struct wxStringCmpNoCase
+{
+    typedef wxString first_argument_type;
+    typedef wxString second_argument_type;
+    typedef int result_type;
+
+    int operator()(const wxString& s1, const wxString& s2) const
+    {
+        return s1.CmpNoCase(s2);
+    }
+};
+
+int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
+{
+    wxArrayString::const_iterator it;
+
+    if (bCase)
+    {
+        it = std::find_if(begin(), end(),
+                          std::not1(
+                              std::bind2nd(
+                                  wxStringCmp(), str)));
+    }
+    else // !bCase
+    {
+        it = std::find_if(begin(), end(),
+                          std::not1(
+                              std::bind2nd(
+                                  wxStringCmpNoCase(), str)));
+    }
+
+    return it == end() ? wxNOT_FOUND : it - begin();
+}
+
+template<class F>
+class wxStringCompareLess
+{
+public:
+    wxStringCompareLess(F f) : m_f(f) { }
+    bool operator()(const wxString& s1, const wxString& s2)
+        { return m_f(s1, s2) < 0; }
+private:
+    F m_f;
+};
+
+template<class F>
+wxStringCompareLess<F> wxStringCompare(F f)
+{
+    return wxStringCompareLess<F>(f);
+}
+
+void wxArrayString::Sort(CompareFunction function)
+{
+    std::sort(begin(), end(), wxStringCompare(function));
+}
+
+void wxArrayString::Sort(bool reverseOrder)
+{
+    if (reverseOrder)
+    {
+        std::sort(begin(), end(), std::greater<wxString>());
+    }
+    else
+    {
+        std::sort(begin(), end());
+    }
+}
+
+int wxSortedArrayString::Index(const wxString& str,
+                               bool WXUNUSED_UNLESS_DEBUG(bCase),
+                               bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const
+{
+    wxASSERT_MSG( bCase && !bFromEnd,
+                  "search parameters ignored for sorted array" );
+
+    wxSortedArrayString::const_iterator
+        it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp()));
+
+    if ( it == end() || str.Cmp(*it) != 0 )
+        return wxNOT_FOUND;
+
+    return it - begin();
+}
+
+#else // !wxUSE_STD_CONTAINERS
 
 #ifndef   ARRAY_DEFAULT_INITIAL_SIZE    // also defined in dynarray.h
 #define   ARRAY_DEFAULT_INITIAL_SIZE    (16)
diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 480572a857..ca0695e240 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -89,7 +89,6 @@ OBJECTS = \
 		docmdi.obj,\
 		docview.obj,\
 		dpycmn.obj,\
-		dynarray.obj,\
 		dynlib.obj,\
 		encconv.obj,\
 		event.obj,\
@@ -281,7 +280,6 @@ SOURCES = \
 		docmdi.cpp,\
 		docview.cpp,\
 		dpycmn.cpp,\
-		dynarray.cpp,\
 		dynlib.cpp,\
 		encconv.cpp,\
 		event.cpp,\
@@ -523,7 +521,6 @@ dlgcmn.obj : dlgcmn.cpp
 dobjcmn.obj : dobjcmn.cpp
 docmdi.obj : docmdi.cpp
 docview.obj : docview.cpp
-dynarray.obj : dynarray.cpp
 dynlib.obj : dynlib.cpp
 encconv.obj : encconv.cpp
 event.obj : event.cpp
diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
deleted file mode 100644
index 241c55450e..0000000000
--- a/src/common/dynarray.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dynarray.cpp
-// Purpose:     implementation of wxBaseArray class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     12.09.97
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// headers
-// ============================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include  "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/intl.h"
-#endif //WX_PRECOMP
-
-#if wxUSE_STD_CONTAINERS
-
-#include "wx/arrstr.h"
-
-#include "wx/beforestd.h"
-#include <functional>
-#include "wx/afterstd.h"
-
-// some compilers (Sun CC being the only known example) distinguish between
-// extern "C" functions and the functions with C++ linkage and ptr_fun and
-// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
-// this case, we need the wrappers below to make this work
-struct wxStringCmp
-{
-    typedef wxString first_argument_type;
-    typedef wxString second_argument_type;
-    typedef int result_type;
-
-    int operator()(const wxString& s1, const wxString& s2) const
-    {
-        return s1.compare(s2);
-    }
-};
-
-struct wxStringCmpNoCase
-{
-    typedef wxString first_argument_type;
-    typedef wxString second_argument_type;
-    typedef int result_type;
-
-    int operator()(const wxString& s1, const wxString& s2) const
-    {
-        return s1.CmpNoCase(s2);
-    }
-};
-
-int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
-{
-    wxArrayString::const_iterator it;
-
-    if (bCase)
-    {
-        it = std::find_if(begin(), end(),
-                          std::not1(
-                              std::bind2nd(
-                                  wxStringCmp(), str)));
-    }
-    else // !bCase
-    {
-        it = std::find_if(begin(), end(),
-                          std::not1(
-                              std::bind2nd(
-                                  wxStringCmpNoCase(), str)));
-    }
-
-    return it == end() ? wxNOT_FOUND : it - begin();
-}
-
-template<class F>
-class wxStringCompareLess
-{
-public:
-    wxStringCompareLess(F f) : m_f(f) { }
-    bool operator()(const wxString& s1, const wxString& s2)
-        { return m_f(s1, s2) < 0; }
-private:
-    F m_f;
-};
-
-template<class F>
-wxStringCompareLess<F> wxStringCompare(F f)
-{
-    return wxStringCompareLess<F>(f);
-}
-
-void wxArrayString::Sort(CompareFunction function)
-{
-    std::sort(begin(), end(), wxStringCompare(function));
-}
-
-void wxArrayString::Sort(bool reverseOrder)
-{
-    if (reverseOrder)
-    {
-        std::sort(begin(), end(), std::greater<wxString>());
-    }
-    else
-    {
-        std::sort(begin(), end());
-    }
-}
-
-int wxSortedArrayString::Index(const wxString& str,
-                               bool WXUNUSED_UNLESS_DEBUG(bCase),
-                               bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const
-{
-    wxASSERT_MSG( bCase && !bFromEnd,
-                  "search parameters ignored for sorted array" );
-
-    wxSortedArrayString::const_iterator
-        it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp()));
-
-    if ( it == end() || str.Cmp(*it) != 0 )
-        return wxNOT_FOUND;
-
-    return it - begin();
-}
-
-#endif // wxUSE_STD_CONTAINERS

From 01cd3cc01972b4b13c73de92533b73af530462e5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@zeitlins.org>
Date: Wed, 20 Jun 2018 18:15:38 +0200
Subject: [PATCH 660/916] Fix image unit test compilation when wxUSE_GIF==0

Don't compile GIF-related test cases and don't add GIF image handler in
this build configuration.
---
 tests/image/image.cpp | 86 ++++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/tests/image/image.cpp b/tests/image/image.cpp
index ae8a301e8e..3c4837d178 100644
--- a/tests/image/image.cpp
+++ b/tests/image/image.cpp
@@ -73,9 +73,11 @@ private:
         CPPUNIT_TEST( CompareSavedImage );
         CPPUNIT_TEST( SavePNG );
         CPPUNIT_TEST( SaveTIFF );
-        CPPUNIT_TEST( SaveAnimatedGIF );
         CPPUNIT_TEST( ReadCorruptedTGA );
+#if wxUSE_GIF
+        CPPUNIT_TEST( SaveAnimatedGIF );
         CPPUNIT_TEST( GIFComment );
+#endif // wxUSE_GIF
         CPPUNIT_TEST( DibPadding );
         CPPUNIT_TEST( BMPFlippingAndRLECompression );
         CPPUNIT_TEST( ScaleCompare );
@@ -89,9 +91,11 @@ private:
     void CompareSavedImage();
     void SavePNG();
     void SaveTIFF();
-    void SaveAnimatedGIF();
     void ReadCorruptedTGA();
+#if wxUSE_GIF
+    void SaveAnimatedGIF();
     void GIFComment();
+#endif // wxUSE_GIF
     void DibPadding();
     void BMPFlippingAndRLECompression();
     void ScaleCompare();
@@ -113,7 +117,9 @@ ImageTestCase::ImageTestCase()
     wxImage::AddHandler(new wxANIHandler);
     wxImage::AddHandler(new wxBMPHandler);
     wxImage::AddHandler(new wxCURHandler);
+#if wxUSE_GIF
     wxImage::AddHandler(new wxGIFHandler);
+#endif // wxUSE_GIF
     wxImage::AddHandler(new wxJPEGHandler);
     wxImage::AddHandler(new wxPCXHandler);
     wxImage::AddHandler(new wxPNMHandler);
@@ -1134,42 +1140,6 @@ void ImageTestCase::SaveTIFF()
     TestTIFFImage(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, 2, &alphaImage);
 }
 
-void ImageTestCase::SaveAnimatedGIF()
-{
-#if wxUSE_PALETTE
-    wxImage image("horse.gif");
-    CPPUNIT_ASSERT( image.IsOk() );
-
-    wxImageArray images;
-    images.Add(image);
-    for (int i = 0; i < 4-1; ++i)
-    {
-        images.Add( images[i].Rotate90() );
-
-        images[i+1].SetPalette(images[0].GetPalette());
-    }
-
-    wxMemoryOutputStream memOut;
-    CPPUNIT_ASSERT( wxGIFHandler().SaveAnimation(images, &memOut) );
-
-    wxGIFHandler handler;
-    wxMemoryInputStream memIn(memOut);
-    CPPUNIT_ASSERT(memIn.IsOk());
-    const int imageCount = handler.GetImageCount(memIn);
-    CPPUNIT_ASSERT_EQUAL(4, imageCount);
-
-    for (int i = 0; i < imageCount; ++i)
-    {
-        wxFileOffset pos = memIn.TellI();
-        CPPUNIT_ASSERT( handler.LoadFile(&image, memIn, true, i) );
-        memIn.SeekI(pos);
-
-        wxINFO_FMT("Compare test for GIF frame number %d failed", i);
-        CHECK_THAT(image, RGBSameAs(images[i]));
-    }
-#endif // #if wxUSE_PALETTE
-}
-
 void ImageTestCase::ReadCorruptedTGA()
 {
     static unsigned char corruptTGA[18+1+3] =
@@ -1206,6 +1176,44 @@ void ImageTestCase::ReadCorruptedTGA()
     CPPUNIT_ASSERT( !tgaImage.LoadFile(memIn) );
 }
 
+#if wxUSE_GIF
+
+void ImageTestCase::SaveAnimatedGIF()
+{
+#if wxUSE_PALETTE
+    wxImage image("horse.gif");
+    CPPUNIT_ASSERT( image.IsOk() );
+
+    wxImageArray images;
+    images.Add(image);
+    for (int i = 0; i < 4-1; ++i)
+    {
+        images.Add( images[i].Rotate90() );
+
+        images[i+1].SetPalette(images[0].GetPalette());
+    }
+
+    wxMemoryOutputStream memOut;
+    CPPUNIT_ASSERT( wxGIFHandler().SaveAnimation(images, &memOut) );
+
+    wxGIFHandler handler;
+    wxMemoryInputStream memIn(memOut);
+    CPPUNIT_ASSERT(memIn.IsOk());
+    const int imageCount = handler.GetImageCount(memIn);
+    CPPUNIT_ASSERT_EQUAL(4, imageCount);
+
+    for (int i = 0; i < imageCount; ++i)
+    {
+        wxFileOffset pos = memIn.TellI();
+        CPPUNIT_ASSERT( handler.LoadFile(&image, memIn, true, i) );
+        memIn.SeekI(pos);
+
+        wxINFO_FMT("Compare test for GIF frame number %d failed", i);
+        CHECK_THAT(image, RGBSameAs(images[i]));
+    }
+#endif // #if wxUSE_PALETTE
+}
+
 static void TestGIFComment(const wxString& comment)
 {
     wxImage image("horse.gif");
@@ -1281,6 +1289,8 @@ void ImageTestCase::GIFComment()
     }
 }
 
+#endif // wxUSE_GIF
+
 void ImageTestCase::DibPadding()
 {
     /*

From 710474c63455116073eb2e79c4fdb1692adae019 Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Thu, 21 Jun 2018 09:11:28 +0300
Subject: [PATCH 661/916] Allow configuring showing printing dialog in
 wxHtmlEasyPrinting

Add wxHtmlEasyPrinting::SetPromptMode() to allow suppressing the
"prompt" shown by wxPrinter::Print() when it's called from this class
code.

Closes https://github.com/wxWidgets/wxWidgets/pull/838
---
 docs/changes.txt             |  1 +
 include/wx/html/htmprint.h   | 12 ++++++++++++
 interface/wx/html/htmprint.h | 26 ++++++++++++++++++++++++++
 src/html/htmprint.cpp        | 10 +++++++++-
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index cd8c9da99a..b314d6abb6 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -88,6 +88,7 @@ All (GUI):
 - Fix bug with missing items in overflowing AUI toolbar (Maarten Bent).
 - Revert to left-aligning wxSpinCtrl contents by default.
 - Make wxRibbonButtonBar buttons more customizable (Max Maisel).
+- Add wxHtmlEasyPrinting::SetPromptMode() (pavel-t).
 
 wxGTK:
 
diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 3c0d12f6ab..0c206ade6c 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -273,6 +273,16 @@ public:
     void SetName(const wxString& name) { m_Name = name; }
             // set the printout name
 
+    // Controls showing the dialog when printing: by default, always shown.
+    enum PromptMode
+    {
+        Prompt_Never,
+        Prompt_Once,
+        Prompt_Always
+    };
+
+    void SetPromptMode(PromptMode promptMode) { m_promptMode = promptMode; }
+
 protected:
     virtual wxHtmlPrintout *CreatePrintout();
     virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);
@@ -296,6 +306,8 @@ private:
     wxString m_Headers[2], m_Footers[2];
     wxWindow *m_ParentWindow;
 
+    PromptMode m_promptMode;
+
     wxDECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting);
 };
 
diff --git a/interface/wx/html/htmprint.h b/interface/wx/html/htmprint.h
index 6e6a0908dc..8e2dfdc9db 100644
--- a/interface/wx/html/htmprint.h
+++ b/interface/wx/html/htmprint.h
@@ -340,6 +340,32 @@ public:
     */
     void SetParentWindow(wxWindow* window);
 
+    /**
+        Controls when the print dialog should be shown.
+
+        @see SetPromptMode()
+
+        @since 3.1.2
+    */
+    enum PromptMode
+    {
+        Prompt_Never,  //!< Do not show the print dialog.
+        Prompt_Once,   //!< Show the print dialog only the first time.
+        Prompt_Always  //!< Show the print dialog every time (default value).
+    };
+
+    /**
+        Enable or disable showing the dialog before printing.
+
+        The prompt mode determines the value of the @c prompt parameter passed
+        to wxPrinter::Print() when it is called by this class.
+
+        Default prompt mode value is Prompt_Always.
+
+        @since 3.1.2
+    */
+    void SetPromptMode(PromptMode promptMode);
+
 private:
     /**
         Check whether the document fits into the page area.
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 781c9f4d98..ba1f31b016 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -619,6 +619,8 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWin
     m_PageSetupData->SetMarginBottomRight(wxPoint(25, 25));
 
     SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);
+
+    m_promptMode = Prompt_Always;
 }
 
 
@@ -709,7 +711,13 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
     wxPrintDialogData printDialogData(*GetPrintData());
     wxPrinter printer(&printDialogData);
 
-    if (!printer.Print(m_ParentWindow, printout, true))
+    const bool prompt = m_promptMode != Prompt_Never;
+    if (m_promptMode == Prompt_Once)
+    {
+        m_promptMode = Prompt_Never;
+    }
+
+    if (!printer.Print(m_ParentWindow, printout, prompt))
     {
         return false;
     }

From c6523f016e65e132d1677c30e983bbbc93fe4213 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 21 Jun 2018 20:22:53 +0200
Subject: [PATCH 662/916] Dark Mode Patches

thanks to dkulp,
see https://github.com/wxWidgets/wxWidgets/pull/840
see #18146
---
 src/aui/auibar.cpp  | 48 +++++++++++++++++++++++++++++++++++++---
 src/aui/dockart.cpp | 33 ++++++++++++++++++---------
 src/aui/tabart.cpp  | 54 +++++++++++++++++++++++++++++++++++++++------
 3 files changed, 115 insertions(+), 20 deletions(-)

diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 3d6c1326a6..852630b6a7 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -72,7 +72,7 @@ static wxColor GetBaseColor()
 {
 
 #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
+    wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 #else
     wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
@@ -208,8 +208,22 @@ void wxAuiGenericToolBarArt::DrawBackground(
 {
     wxRect rect = _rect;
     rect.height++;
-    wxColour startColour = m_baseColour.ChangeLightness(150);
-    wxColour endColour = m_baseColour.ChangeLightness(90);
+    
+    int startLightness = 150;
+    int endLightness = 90;
+    
+    
+    if ((m_baseColour.Red() < 75)
+        && (m_baseColour.Green() < 75)
+        && (m_baseColour.Blue() < 75))
+    {
+        //dark mode, we cannot go very light
+        startLightness = 110;
+        endLightness = 90;
+    }
+    wxColour startColour = m_baseColour.ChangeLightness(startLightness);
+    wxColour endColour = m_baseColour.ChangeLightness(endLightness);
+    
     dc.GradientFillLinear(rect, startColour, endColour, wxSOUTH);
 }
 
@@ -233,7 +247,11 @@ void wxAuiGenericToolBarArt::DrawLabel(
                                     const wxRect& rect)
 {
     dc.SetFont(m_font);
+#ifdef __WXMAC__
+    dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
+#else
     dc.SetTextForeground(*wxBLACK);
+#endif
 
     // we only care about the text height here since the text
     // will get cropped based on the width of the item
@@ -343,9 +361,19 @@ void wxAuiGenericToolBarArt::DrawButton(
         dc.DrawBitmap(bmp, bmpX, bmpY, true);
 
     // set the item's text color based on if it is disabled
+#ifdef __WXMAC__
+    dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
+#else
     dc.SetTextForeground(*wxBLACK);
+#endif
     if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED)
+    {
+#ifdef __WXMAC__
+        dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT));
+#else
         dc.SetTextForeground(DISABLED_TEXT_COLOR);
+#endif
+    }
 
     if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
     {
@@ -470,9 +498,19 @@ void wxAuiGenericToolBarArt::DrawDropDownButton(
     dc.DrawBitmap(dropbmp, dropBmpX, dropBmpY, true);
 
     // set the item's text color based on if it is disabled
+#ifdef __WXMAC__
+    dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
+#else
     dc.SetTextForeground(*wxBLACK);
+#endif
     if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED)
+    {
+#ifdef __WXMAC__
+        dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT));
+#else
         dc.SetTextForeground(DISABLED_TEXT_COLOR);
+#endif
+    }
 
     if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() )
     {
@@ -511,7 +549,11 @@ void wxAuiGenericToolBarArt::DrawControlLabel(
         return;
 
     // set the label's text color
+#ifdef __WXMAC__
+    dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
+#else
     dc.SetTextForeground(*wxBLACK);
+#endif
 
     textX = rect.x + (rect.width/2) - (textWidth/2) + 1;
     textY = rect.y + rect.height - textHeight - 1;
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index bc9e014bb3..391d322efe 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -152,7 +152,7 @@ wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size)
 wxAuiDefaultDockArt::wxAuiDefaultDockArt()
 {
 #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
+    wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 #else
     wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
@@ -178,7 +178,11 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
     m_activeCaptionTextColour = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
     m_inactiveCaptionColour = darker1Colour;
     m_inactiveCaptionGradientColour = baseColour.ChangeLightness(97);
+#ifdef __WXMAC__
+    m_inactiveCaptionTextColour = wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT);
+#else
     m_inactiveCaptionTextColour = *wxBLACK;
+#endif
 
     m_sashBrush = wxBrush(baseColour);
     m_backgroundBrush = wxBrush(baseColour);
@@ -378,16 +382,25 @@ void wxAuiDefaultDockArt::DrawSash(wxDC& dc, wxWindow *window, int orientation,
     wxUnusedVar(window);
     wxUnusedVar(orientation);
 
-    HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height );
-    CGContextRef cgContext ;
-    wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
-    cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext() ;
+    if ( wxPlatformInfo::Get().CheckOSVersion(10, 14) && wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW).Red() < 128 )
+    {
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.SetBrush(m_sashBrush);
+        dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
+    }
+    else
+    {
+        HIRect splitterRect = CGRectMake( rect.x , rect.y , rect.width , rect.height );
+        CGContextRef cgContext ;
+        wxGCDCImpl *impl = (wxGCDCImpl*) dc.GetImpl();
+        cgContext = (CGContextRef) impl->GetGraphicsContext()->GetNativeContext() ;
 
-    HIThemeSplitterDrawInfo drawInfo ;
-    drawInfo.version = 0 ;
-    drawInfo.state = kThemeStateActive ;
-    drawInfo.adornment = kHIThemeSplitterAdornmentNone ;
-    HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ;
+        HIThemeSplitterDrawInfo drawInfo ;
+        drawInfo.version = 0 ;
+        drawInfo.state = kThemeStateActive ;
+        drawInfo.adornment = kHIThemeSplitterAdornmentNone ;
+        HIThemeDrawPaneSplitter( &splitterRect , &drawInfo , cgContext , kHIThemeOrientationNormal ) ;
+    }
 
 #elif defined(__WXGTK__)
     // clear out the rectangle first
diff --git a/src/aui/tabart.cpp b/src/aui/tabart.cpp
index 0a74494646..9ced916ff6 100644
--- a/src/aui/tabart.cpp
+++ b/src/aui/tabart.cpp
@@ -163,7 +163,7 @@ wxAuiGenericTabArt::wxAuiGenericTabArt()
     m_tabCtrlHeight = 0;
 
 #if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor baseColour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
+    wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 #else
     wxColor baseColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 #endif
@@ -262,9 +262,20 @@ void wxAuiGenericTabArt::DrawBackground(wxDC& dc,
                                         const wxRect& rect)
 {
     // draw background
-
-    wxColor top_color       = m_baseColour.ChangeLightness(90);
-    wxColor bottom_color   = m_baseColour.ChangeLightness(170);
+    int topLightness = 90;
+    int bottomLightness = 170;
+    if ((m_baseColour.Red() < 75)
+        && (m_baseColour.Green() < 75)
+        && (m_baseColour.Blue() < 75))
+    {
+        //dark mode, we cannot go very light
+        topLightness = 90;
+        bottomLightness = 110;
+    }
+    
+    
+    wxColor top_color       = m_baseColour.ChangeLightness(topLightness);
+    wxColor bottom_color   = m_baseColour.ChangeLightness(bottomLightness);
     wxRect r;
 
    if (m_flags &wxAUI_NB_BOTTOM)
@@ -427,8 +438,17 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc,
         dc.DrawRectangle(r.x+1, r.y+1, r.width-1, r.height-4);
 
         // this white helps fill out the gradient at the top of the tab
-        dc.SetPen(*wxWHITE_PEN);
-        dc.SetBrush(*wxWHITE_BRUSH);
+        wxColor gradient = *wxWHITE;
+        if ((m_baseColour.Red() < 75)
+            && (m_baseColour.Green() < 75)
+            && (m_baseColour.Blue() < 75))
+        {
+            //dark mode, we go darker
+            gradient = m_activeColour.ChangeLightness(70);
+        }
+        
+        dc.SetPen(wxPen(gradient));
+        dc.SetBrush(wxBrush(gradient));
         dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4);
 
         // these two points help the rounded corners appear more antialiased
@@ -444,7 +464,7 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc,
         r.y -= 2;
 
         // draw gradient background
-        wxColor top_color = *wxWHITE;
+        wxColor top_color = gradient;
         wxColor bottom_color = m_activeColour;
         dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
     }
@@ -466,6 +486,15 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc,
         // -- draw top gradient fill for glossy look
         wxColor top_color = m_baseColour;
         wxColor bottom_color = top_color.ChangeLightness(160);
+        if ((m_baseColour.Red() < 75)
+            && (m_baseColour.Green() < 75)
+            && (m_baseColour.Blue() < 75))
+        {
+            //dark mode, we go darker
+            top_color = m_activeColour.ChangeLightness(70);
+            bottom_color = m_baseColour;
+        }
+        
         dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
 
         r.y += r.height;
@@ -532,6 +561,16 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc,
                           tab_width - (text_offset-tab_x) - close_button_width);
 
     // draw tab text
+#if defined( __WXMAC__ )
+    if (page.active)
+    {
+        dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_CAPTIONTEXT));
+    }
+    else
+    {
+        dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_INACTIVECAPTIONTEXT));
+    }
+#endif
     dc.DrawText(draw_text,
                 text_offset,
                 drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1);
@@ -1317,3 +1356,4 @@ void wxAuiSimpleTabArt::SetMeasuringFont(const wxFont& font)
 }
 
 #endif // wxUSE_AUI
+
\ No newline at end of file

From a8c1ae705818425435231498e7c729449418eb39 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 22 Jun 2018 02:43:23 +0200
Subject: [PATCH 663/916] Fix TLW activation unit test

Ensure that another TLW is active before calling ShowWithoutActivating()
as otherwise the newly shown window would be considered active, even if
it actually isn't, because it contains the current focus.
---
 tests/toplevel/toplevel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/toplevel/toplevel.cpp b/tests/toplevel/toplevel.cpp
index 60722f0ce2..799f35fd10 100644
--- a/tests/toplevel/toplevel.cpp
+++ b/tests/toplevel/toplevel.cpp
@@ -17,6 +17,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/dialog.h"
     #include "wx/frame.h"
     #include "wx/textctrl.h"
@@ -32,6 +33,7 @@ static void TopLevelWindowShowTest(wxTopLevelWindow* tlw)
 
 // only run this test on platforms where ShowWithoutActivating is implemented.
 #if defined(__WXMSW__) || defined(__WXMAC__)
+    wxTheApp->GetTopWindow()->SetFocus();
     tlw->ShowWithoutActivating();
     CHECK(tlw->IsShown());
     CHECK(!tlw->IsActive());
@@ -53,7 +55,7 @@ static void TopLevelWindowShowTest(wxTopLevelWindow* tlw)
     tlw->Hide();
     CHECK(!tlw->IsShown());
 #ifndef __WXGTK__
-    CHECK(tlw->IsActive());
+    CHECK(!tlw->IsActive());
 #endif
 }
 

From f03d655b1af50a9d86dc16072fa40426bc132351 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 22 Jun 2018 02:44:40 +0200
Subject: [PATCH 664/916] Enable running TLW activation unit tests in CI
 environments

Hopefully the previous commit fixed it under AppVeyor.
---
 tests/toplevel/toplevel.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/toplevel/toplevel.cpp b/tests/toplevel/toplevel.cpp
index 799f35fd10..5e62a1b05c 100644
--- a/tests/toplevel/toplevel.cpp
+++ b/tests/toplevel/toplevel.cpp
@@ -61,13 +61,6 @@ static void TopLevelWindowShowTest(wxTopLevelWindow* tlw)
 
 TEST_CASE("wxTopLevel::Show", "[tlw][show]")
 {
-    if ( IsAutomaticTest() )
-    {
-        // For some reason, activation test doesn't work when running under
-        // AppVeyor, so skip it to avoid spurious failures.
-        return;
-    }
-
     SECTION("Dialog")
     {
         wxDialog* dialog = new wxDialog(NULL, -1, "Dialog Test");

From 3518f1a7d8b27877183b0aa2338a59dec836ae3c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 22 Jun 2018 03:23:31 +0200
Subject: [PATCH 665/916] Use a single wxTopLevelWindow::m_showCmd flag in
 wxMSW

This single field replaces m_iconized and m_maximizeOnShow which were
not really independent and will make it simpler to schedule either
maximizing or maximizing the window later, when it can't be done
immediately because the window is hidden, in the following commit.
---
 include/wx/msw/toplevel.h | 17 ++++----
 src/msw/dialog.cpp        |  6 +--
 src/msw/frame.cpp         |  8 ++--
 src/msw/toplevel.cpp      | 90 ++++++++++++++++++++++-----------------
 4 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index c79754f722..3652cbbf0a 100644
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -132,9 +132,12 @@ protected:
                       const wxPoint& pos,
                       const wxSize& size);
 
-    // common part of Iconize(), Maximize() and Restore()
+    // Just a wrapper around MSW ShowWindow().
     void DoShowWindow(int nShowCmd);
 
+    // Return true if the window is iconized at MSW level, ignoring m_showCmd.
+    bool MSWIsIconized() const;
+
     // override those to return the normal window coordinates even when the
     // window is minimized
     virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE;
@@ -156,13 +159,11 @@ protected:
                                           int& x, int& y,
                                           int& w, int& h) const wxOVERRIDE;
 
-
-    // is the window currently iconized?
-    bool m_iconized;
-
-    // should the frame be maximized when it will be shown? set by Maximize()
-    // when it is called while the frame is hidden
-    bool m_maximizeOnShow;
+    // This field contains the show command to use when showing the window the
+    // next time and also indicates whether the window should be considered
+    // being iconized or maximized (which may be different from whether it's
+    // actually iconized or maximized at MSW level).
+    WXUINT m_showCmd;
 
     // Data to save/restore when calling ShowFullScreen
     long                  m_fsStyle; // Passed to ShowFullScreen
diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 45478e34a3..c6281f583d 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -321,7 +321,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             switch ( wParam )
             {
                 case SIZE_MINIMIZED:
-                    m_iconized = true;
+                    m_showCmd = SW_MINIMIZE;
                     break;
 
                 case SIZE_MAXIMIZED:
@@ -331,9 +331,9 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
                     if ( m_hGripper )
                         ShowGripper( wParam == SIZE_RESTORED );
 
-                    if ( m_iconized )
+                    if ( m_showCmd == SW_MINIMIZE )
                         (void)SendIconizeEvent(false);
-                    m_iconized = false;
+                    m_showCmd = SW_RESTORE;
 
                     break;
             }
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 91b917667b..742d928850 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -261,7 +261,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
 // generate an artificial resize event
 void wxFrame::SendSizeEvent(int flags)
 {
-    if ( !m_iconized )
+    if ( !MSWIsIconized() )
     {
         RECT r = wxGetWindowRect(GetHwnd());
 
@@ -667,7 +667,7 @@ void wxFrame::PositionToolBar()
 // on the desktop, but are iconized/restored with it
 void wxFrame::IconizeChildFrames(bool bIconize)
 {
-    m_iconized = bIconize;
+    m_showCmd = bIconize ? SW_MINIMIZE : SW_RESTORE;
 
     for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
           node;
@@ -750,7 +750,7 @@ bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
             // only do it it if we were iconized before, otherwise resizing the
             // parent frame has a curious side effect of bringing it under it's
             // children
-            if ( !m_iconized )
+            if ( m_showCmd != SW_MINIMIZE )
                 break;
 
             // restore all child frames too
@@ -765,7 +765,7 @@ bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
             break;
     }
 
-    if ( !m_iconized )
+    if ( m_showCmd != SW_MINIMIZE )
     {
 #if wxUSE_STATUSBAR
         PositionStatusBar();
diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 2d24bf92a5..8ad7391d09 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -95,8 +95,7 @@ wxEND_EVENT_TABLE()
 
 void wxTopLevelWindowMSW::Init()
 {
-    m_iconized =
-    m_maximizeOnShow = false;
+    m_showCmd = SW_SHOWNORMAL;
 
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
@@ -522,14 +521,6 @@ void wxTopLevelWindowMSW::DoShowWindow(int nShowCmd)
 {
     ::ShowWindow(GetHwnd(), nShowCmd);
 
-    // Hiding the window doesn't change its iconized state.
-    if ( nShowCmd != SW_HIDE )
-    {
-        // Otherwise restoring, maximizing or showing the window normally also
-        // makes it not iconized and only minimizing it does make it iconized.
-        m_iconized = nShowCmd == SW_MINIMIZE;
-    }
-
 #if wxUSE_TOOLTIPS
     // Don't leave a tooltip hanging around if TLW is hidden now.
     wxToolTip::UpdateVisibility();
@@ -541,7 +532,12 @@ void wxTopLevelWindowMSW::ShowWithoutActivating()
     if ( !wxWindowBase::Show(true) )
         return;
 
-    DoShowWindow(SW_SHOWNA);
+    // We can't show the window in a maximized state without activating it, so
+    // the sequence of hiding the window, calling Maximize() and this function
+    // will end up with the window not being maximized -- but this is arguably
+    // better than activating it and is compatible with the historical
+    // behaviour of this function.
+    DoShowWindow(m_showCmd == SW_MINIMIZE ? SW_SHOWMINNOACTIVE : SW_SHOWNA);
 }
 
 bool wxTopLevelWindowMSW::Show(bool show)
@@ -553,18 +549,10 @@ bool wxTopLevelWindowMSW::Show(bool show)
     int nShowCmd;
     if ( show )
     {
-        if ( m_maximizeOnShow )
+        // If we need to minimize or maximize the window, do it now.
+        if ( m_showCmd == SW_MAXIMIZE || m_showCmd == SW_MINIMIZE )
         {
-            // show and maximize
-            nShowCmd = SW_MAXIMIZE;
-
-            m_maximizeOnShow = false;
-        }
-        else if ( m_iconized )
-        {
-            // We were iconized while we were hidden, so now we need to show
-            // the window in iconized state.
-            nShowCmd = SW_MINIMIZE;
+            nShowCmd = m_showCmd;
         }
         else if ( ::IsIconic(GetHwnd()) )
         {
@@ -622,16 +610,19 @@ void wxTopLevelWindowMSW::Raise()
 
 void wxTopLevelWindowMSW::Maximize(bool maximize)
 {
+    // Update m_showCmd to ensure that the window is maximized when it's shown
+    // later even if it's currently hidden.
+    m_showCmd = maximize ? SW_MAXIMIZE : SW_RESTORE;
+
     if ( IsShown() )
     {
         // just maximize it directly
-        DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE);
+        DoShowWindow(m_showCmd);
     }
     else // hidden
     {
         // we can't maximize the hidden frame because it shows it as well,
-        // so just remember that we should do it later in this case
-        m_maximizeOnShow = maximize;
+        // so don't do anything other than updating m_showCmd for now
 
 #if wxUSE_DEFERRED_SIZING
         // after calling Maximize() the client code expects to get the frame
@@ -659,45 +650,66 @@ bool wxTopLevelWindowMSW::IsMaximized() const
 {
     return IsAlwaysMaximized() ||
            (::IsZoomed(GetHwnd()) != 0) ||
-           m_maximizeOnShow;
+           m_showCmd == SW_MAXIMIZE;
 }
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)
 {
-    if ( iconize == m_iconized )
+    if ( iconize == MSWIsIconized() )
     {
         // Do nothing, in particular don't restore non-iconized windows when
         // Iconize(false) is called as this would wrongly un-maximize them.
         return;
     }
 
+    // Note that we can't change m_showCmd yet as wxFrame WM_SIZE handler uses
+    // its value to determine whether the frame had been iconized before or not
+    // and this handler will be called from inside DoShowWindow() below.
+    const UINT showCmd = iconize ? SW_MINIMIZE : SW_RESTORE;
+
+    // We can't actually iconize the window if it's currently hidden, as this
+    // would also show it unexpectedly.
     if ( IsShown() )
     {
-        // change the window state immediately
-        DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
-    }
-    else // hidden
-    {
-        // iconizing the window shouldn't show it so just update the internal
-        // state (otherwise it's done by DoShowWindow() itself)
-        m_iconized = iconize;
+        DoShowWindow(showCmd);
     }
+
+    // Update the internal flag in any case, so that IsIconized() returns the
+    // correct value, for example. And if the window is currently hidden, this
+    // also ensures that the next call to Show() will show it in an iconized
+    // state instead of showing it normally.
+    m_showCmd = showCmd;
 }
 
 bool wxTopLevelWindowMSW::IsIconized() const
 {
     if ( !IsShown() )
-        return m_iconized;
+    {
+        // Hidden windows are never actually iconized at MSW level, but can be
+        // in wx, so use m_showCmd to determine our status.
+        return m_showCmd == SW_MINIMIZE;
+    }
 
-    // don't use m_iconized, it may be briefly out of sync with the real state
+    // don't use m_showCmd, it may be briefly out of sync with the real state
     // as it's only modified when we receive a WM_SIZE and we could be called
     // from an event handler from one of the messages we receive before it,
     // such as WM_MOVE
+    return MSWIsIconized();
+}
+
+bool wxTopLevelWindowMSW::MSWIsIconized() const
+{
     return ::IsIconic(GetHwnd()) != 0;
 }
 
 void wxTopLevelWindowMSW::Restore()
 {
+    // Forget any previous minimized/maximized status.
+    m_showCmd = SW_SHOW;
+
+    // And actually restore the window to its normal state. Note that here,
+    // unlike in Maximize() and Iconize(), we do it even if the window is
+    // currently hidden, i.e. Restore() is supposed to show it in this case.
     DoShowWindow(SW_RESTORE);
 }
 
@@ -1181,7 +1193,7 @@ void wxTopLevelWindowMSW::DoThaw()
 
 void wxTopLevelWindowMSW::DoSaveLastFocus()
 {
-    if ( m_iconized )
+    if ( MSWIsIconized() )
         return;
 
     // remember the last focused child if it is our child
@@ -1211,7 +1223,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
         // We get WM_ACTIVATE before being restored from iconized state, so we
         // can be still iconized here. In this case, avoid restoring the focus
         // as it doesn't work anyhow and we will do when we're really restored.
-        if ( m_iconized )
+        if ( MSWIsIconized() )
         {
             event.Skip();
             return;

From cf20a9ced531d502433b5acc25a3bd84505f5fe5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 22 Jun 2018 03:25:43 +0200
Subject: [PATCH 666/916] Fix bug with showing TLW in wxMSW when restoring its
 geometry

Since the changes of 6ae7aa444358cd2618a57e9ab29826f1714dbb4b, the
windows were shown when their geometry was restored as a side effect of
calling ::SetWindowPlacement(). This was unexpected and resulted in
flicker on startup, so fix this by explicitly passing SW_HIDE to
SetWindowPlacement() if the window is currently hidden and storing the
real show command inside wxTLW itself, where it will be used when it's
finally shown.
---
 include/wx/msw/private/tlwgeom.h | 24 ++++++++++++++++++++++--
 include/wx/msw/toplevel.h        |  3 +++
 src/msw/frame.cpp                |  6 ++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/include/wx/msw/private/tlwgeom.h b/include/wx/msw/private/tlwgeom.h
index 1142f94c6a..40e6a799bd 100644
--- a/include/wx/msw/private/tlwgeom.h
+++ b/include/wx/msw/private/tlwgeom.h
@@ -77,12 +77,20 @@ public:
         wxCopyRectToRECT(r, m_placement.rcNormalPosition);
 
         // Maximized/minimized state.
+        //
+        // Note the special case of SW_MINIMIZE: while GetWindowPlacement()
+        // returns SW_SHOWMINIMIZED when the window is iconized, we restore it
+        // as SW_MINIMIZE as this is what the code in wxTLW checks to determine
+        // whether the window is supposed to be iconized or not.
+        //
+        // Just to confuse matters further, note that SW_MAXIMIZE is exactly
+        // the same thing as SW_SHOWMAXIMIZED.
         int tmp;
         UINT& show = m_placement.showCmd;
         if ( ser.RestoreField(wxPERSIST_TLW_MAXIMIZED, &tmp) && tmp )
-            show = SW_SHOWMAXIMIZED;
+            show = SW_MAXIMIZE;
         else if ( ser.RestoreField(wxPERSIST_TLW_ICONIZED, &tmp) && tmp )
-            show = SW_SHOWMINIMIZED;
+            show = SW_MINIMIZE;
         else
             show = SW_SHOWNORMAL;
 
@@ -110,6 +118,18 @@ public:
 
     virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE
     {
+        // There is a subtlety here: if the window is currently hidden,
+        // restoring its geometry shouldn't show it, so we must use SW_HIDE as
+        // show command, but showing it later should restore it to the correct
+        // state, so we need to remember it in wxTLW itself. And even if it's
+        // currently shown, we still need to update its show command, so that
+        // it matches the real window state after SetWindowPlacement() call.
+        tlw->MSWSetShowCommand(m_placement.showCmd);
+        if ( !tlw->IsShown() )
+        {
+            m_placement.showCmd = SW_HIDE;
+        }
+
         if ( !::SetWindowPlacement(GetHwndOf(tlw), &m_placement) )
         {
             wxLogLastError(wxS("SetWindowPlacement"));
diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 3652cbbf0a..8e79013a5e 100644
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -116,6 +116,9 @@ public:
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
 
+    // This function is only for internal use.
+    void MSWSetShowCommand(WXUINT showCmd) { m_showCmd = showCmd; }
+
 protected:
     // common part of all ctors
     void Init();
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 742d928850..de176504f0 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -743,6 +743,12 @@ bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
 
 bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
 {
+    // We can get a WM_SIZE when restoring a hidden window using
+    // SetWindowPlacement(), don't do anything in this case as our state will
+    // be really updated later, when (and if) we're shown.
+    if ( !IsShown() )
+        return true;
+
     switch ( id )
     {
         case SIZE_RESTORED:

From bdad8c46193d7fe0855bf2fb4e9ad0fd8edacf16 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 21 Jun 2018 21:25:46 -0700
Subject: [PATCH 667/916] Remove garbage characters and trailing whitespace

---
 src/aui/auibar.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp
index 852630b6a7..b61db100b3 100644
--- a/src/aui/auibar.cpp
+++ b/src/aui/auibar.cpp
@@ -208,11 +208,10 @@ void wxAuiGenericToolBarArt::DrawBackground(
 {
     wxRect rect = _rect;
     rect.height++;
-    
+
     int startLightness = 150;
     int endLightness = 90;
-    
-    
+
     if ((m_baseColour.Red() < 75)
         && (m_baseColour.Green() < 75)
         && (m_baseColour.Blue() < 75))
@@ -223,7 +222,7 @@ void wxAuiGenericToolBarArt::DrawBackground(
     }
     wxColour startColour = m_baseColour.ChangeLightness(startLightness);
     wxColour endColour = m_baseColour.ChangeLightness(endLightness);
-    
+
     dc.GradientFillLinear(rect, startColour, endColour, wxSOUTH);
 }
 

From 6d40b7fce782b37d2d1b21489c7eb12123f00ae4 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 21 Jun 2018 21:28:34 -0700
Subject: [PATCH 668/916] Remove garbage characters and trailing whitespace

---
 src/aui/tabart.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/aui/tabart.cpp b/src/aui/tabart.cpp
index 9ced916ff6..dbf05ea9e3 100644
--- a/src/aui/tabart.cpp
+++ b/src/aui/tabart.cpp
@@ -272,8 +272,7 @@ void wxAuiGenericTabArt::DrawBackground(wxDC& dc,
         topLightness = 90;
         bottomLightness = 110;
     }
-    
-    
+
     wxColor top_color       = m_baseColour.ChangeLightness(topLightness);
     wxColor bottom_color   = m_baseColour.ChangeLightness(bottomLightness);
     wxRect r;
@@ -446,7 +445,7 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc,
             //dark mode, we go darker
             gradient = m_activeColour.ChangeLightness(70);
         }
-        
+
         dc.SetPen(wxPen(gradient));
         dc.SetBrush(wxBrush(gradient));
         dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4);
@@ -494,7 +493,7 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc,
             top_color = m_activeColour.ChangeLightness(70);
             bottom_color = m_baseColour;
         }
-        
+
         dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
 
         r.y += r.height;
@@ -1356,4 +1355,3 @@ void wxAuiSimpleTabArt::SetMeasuringFont(const wxFont& font)
 }
 
 #endif // wxUSE_AUI
-
\ No newline at end of file

From 5a877535a868991099550ecf8937a6e3aafeae3e Mon Sep 17 00:00:00 2001
From: Naser Buhamad <arabgb@gmail.com>
Date: Wed, 13 Jun 2018 23:53:58 +0200
Subject: [PATCH 669/916] Take menu bar into account for wxFrame client size in
 wxQt

Subtract the height of the menu bar too, just as we already did for the
status bar.
---
 src/qt/frame.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp
index 34572ba3df..fd23be2c56 100644
--- a/src/qt/frame.cpp
+++ b/src/qt/frame.cpp
@@ -178,6 +178,15 @@ void wxFrame::DoGetClientSize(int *width, int *height) const
         sb->GetSize(NULL, &sbh);
         *height -= sbh;
     }
+
+
+    // also for menubar , we must subtract it's height here
+    QMenuBar *qmb = GetQMainWindow()->menuBar();
+    if (height && qmb)
+    {
+        QRect geometry = qmb->geometry();
+        *height -= geometry.height();
+    }
 }
 
 QMainWindow *wxFrame::GetQMainWindow() const

From 175756506c46df986782dff2448998945e4aca6f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 22 Jun 2018 14:33:26 +0200
Subject: [PATCH 670/916] Minor cleanup of wxFrame::DoGetClientSize() in wxQt

Test whether height != NULL just once and make the code slightly more
compact.
---
 src/qt/frame.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp
index fd23be2c56..41322c3733 100644
--- a/src/qt/frame.cpp
+++ b/src/qt/frame.cpp
@@ -170,22 +170,19 @@ void wxFrame::DoGetClientSize(int *width, int *height) const
 {
     wxWindow::DoGetClientSize(width, height);
 
-    // for a status bar, we must subtract it's height here
-    wxStatusBar *sb = GetStatusBar();
-    if (height && sb)
+    // Adjust the height, taking the status and menu bars into account, if any:
+    if ( height )
     {
-        int sbh = 0;
-        sb->GetSize(NULL, &sbh);
-        *height -= sbh;
-    }
+        if ( wxStatusBar *sb = GetStatusBar() )
+        {
+            *height -= sb->GetSize().y;
+        }
 
 
-    // also for menubar , we must subtract it's height here
-    QMenuBar *qmb = GetQMainWindow()->menuBar();
-    if (height && qmb)
-    {
-        QRect geometry = qmb->geometry();
-        *height -= geometry.height();
+        if ( QMenuBar *qmb = GetQMainWindow()->menuBar() )
+        {
+            *height -= qmb->geometry().height();
+        }
     }
 }
 

From 89ecd814604ddfb47b9bdde1ae01b20f45ec969b Mon Sep 17 00:00:00 2001
From: mrX <mrsolo2000@gmail.com>
Date: Sun, 10 Jun 2018 23:33:10 +0200
Subject: [PATCH 671/916] Don't change wxTextCtrl colour automatically under
 macOS

When wxColourDialog is shown, any changes to the colour selected in it
apparently result in broadcast messages to all currently visible text
controls, which was unexpected.

Block the changeColor: message to prevent this from happening.

Closes https://github.com/wxWidgets/wxWidgets/pull/830
---
 include/wx/osx/cocoa/private.h | 1 +
 src/osx/cocoa/textctrl.mm      | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 73b93b4c86..694dc97ece 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -379,6 +379,7 @@ public:
     }
 
     - (void)textDidChange:(NSNotification *)aNotification;
+    - (void)changeColor:(id)sender;
 
     @end
 
diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 590815b108..18aa408e72 100644
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -436,6 +436,15 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
         impl->controlTextDidChange();
 }
 
+
+- (void)changeColor:(id)sender
+{
+   // Define this just to block the color change messages - these are sent from
+   // the shared color/font panel resulting in unwanted changes of color when
+   // shared color panel is used (as when using wxColourPickerCtrl for example).
+}
+
+
 - (void) setEnabled:(BOOL) flag
 {
     // from Technical Q&A QA1461

From fe6ebc528d4067f35537ece8f7ad530bf4bf7a84 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 23 Jun 2018 20:45:49 +0200
Subject: [PATCH 672/916] Transform trigonometric formulas to minimize the loss
 of precision

Closes #18142.
---
 src/common/graphcmn.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 817a4311e3..6e3e013bbf 100644
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -486,9 +486,9 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
     // Determine spatial relation between the vectors.
     bool drawClockwiseArc = v1.GetCrossProduct(v2) < 0;
 
-    alpha = wxDegToRad(alpha) / 2.0;
-    wxDouble distT = r / sin(alpha) * cos(alpha);
-    wxDouble distC = r / sin(alpha);
+    alpha = wxDegToRad(alpha);
+    wxDouble distT = r / (1.0 + cos(alpha)) * sin(alpha); // = r / tan(a/2) =  r / sin(a/2) * cos(a/2)
+    wxDouble distC = r / sin(alpha / 2.0);
     wxASSERT_MSG( distT <= v1Length && distT <= v2Length,
                   wxS("Radius is too big to fit the arc to given points") );
     // Calculate tangential points

From d1175c00e19350df4db655c226ada91eada3e7a4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 23 Jun 2018 23:46:10 +0200
Subject: [PATCH 673/916] Revert "Allow WM_SYSKEYDOWN to still be processed by
 MSWDefWindowProc, even if"

This reverts commit e771b7e4ac5c7f73a579f7329ce15e2d6710670d.

Don't always pass WM_SYSKEYDOWN to the system for processing as this can
be undesirable: e.g. inside a dialog, any Alt-X key presses with X not
being a mnemonic character result in a beep from IsDialogMessage().
Handle events for the system keys in the same way as for the normal
ones, i.e. let the system process them only if they're not handled by
the application.

This is incompatible with the previous wxMSW behaviour, but compatible
with the other ports and makes more sense, so it seems to be worth it,
on balance.
---
 docs/changes.txt   | 6 ++++++
 src/msw/window.cpp | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index f3fed53b77..1335ef9c92 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -42,6 +42,12 @@ Changes in behaviour not resulting in compilation errors
   anymore and GetOrCreateAccessible() may return NULL, indicating that native
   system-provided accessibility should be used.
 
+- wxMSW port doesn't always let the system process WM_SYSKEYDOWN events any
+  more, make sure to call event.Skip() in your wxEVT_KEY_DOWN and/or wxEVT_CHAR
+  event handlers if you want the standard key combinations such as Alt-Space or
+  Alt-F4 to work.
+
+
 Changes in behaviour which may result in build errors
 -----------------------------------------------------
 
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index cd7e253ebe..8c3c961446 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3258,8 +3258,6 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                             processed = HandleWindowEvent(event);
                 }
             }
-            if (message == WM_SYSKEYDOWN)  // Let Windows still handle the SYSKEYs
-                processed = false;
             break;
 
         case WM_SYSKEYUP:

From e753dc607214e5391a0d0a19e1f1bffd04a080cb Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 22 Jun 2018 13:19:03 +1200
Subject: [PATCH 674/916] Improve wxTreeCtrl::SetItemState() docs

Make it clear that the state parameter can be an index into the state
image list, not just one of the special values listed.

Closes #18152.
---
 interface/wx/treectrl.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h
index c7738861d4..246165055d 100644
--- a/interface/wx/treectrl.h
+++ b/interface/wx/treectrl.h
@@ -902,7 +902,8 @@ public:
                               wxTreeItemIcon which = wxTreeItemIcon_Normal);
 
     /**
-        Sets the specified item state. The value of @a state may be:
+        Sets the specified item state. The value of @a state may be an index
+        into the state image list, or one of the special values:
         - @c wxTREE_ITEMSTATE_NONE: to disable the item state (the state image will
             be not displayed).
         - @c wxTREE_ITEMSTATE_NEXT: to set the next item state.

From 107e66e725aebcc084adfc4182307f7b86f4f713 Mon Sep 17 00:00:00 2001
From: trivia21 <trivia21@trac.wxwidgets.org>
Date: Sun, 24 Jun 2018 00:25:21 +0200
Subject: [PATCH 675/916] Simplify and make more robust wxHtmlWindow layout
 logic

Rewrite CreateLayout() using SetVirtualSize() to avoid trying to detect
whether the vertical scrollbar is shown manually. This is simpler and
avoids the problem of entering infinite loop if the scrollbar size used
by this function (based on wxSystemSettings::GetMetric(wxSYS_VSCROLL_X))
wasn't correct, as used to be the case for wxGTK until the recent commit
900752b1523bb4bcb5cff48f7d2e6c69d4cb7ac8 and might still be the case in
the other ports.

Closes #18141.
---
 docs/changes.txt     |   1 +
 src/html/htmlwin.cpp | 106 ++++++++-----------------------------------
 2 files changed, 20 insertions(+), 87 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 1335ef9c92..e27130aec2 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -95,6 +95,7 @@ All (GUI):
 - Revert to left-aligning wxSpinCtrl contents by default.
 - Make wxRibbonButtonBar buttons more customizable (Max Maisel).
 - Add wxHtmlEasyPrinting::SetPromptMode() (pavel-t).
+- Fix possible infinite loop in wxHtmlWindow layout (trivia21).
 
 wxGTK:
 
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 54f416abbe..d3f06a38a8 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -351,6 +351,8 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
     SetPage(wxT("<html><body></body></html>"));
 
     SetInitialSize(size);
+    if ( !HasFlag(wxHW_SCROLLBAR_NEVER) )
+        SetScrollRate(wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP);
     return true;
 }
 
@@ -715,20 +717,9 @@ void wxHtmlWindow::OnSetTitle(const wxString& title)
 }
 
 
-// return scroll steps such that a) scrollbars aren't shown needlessly
-// and b) entire content is viewable (i.e. round up)
-static int ScrollSteps(int size, int available)
-{
-    if ( size <= available )
-        return 0;
-    else
-        return (size + wxHTML_SCROLL_STEP - 1) / wxHTML_SCROLL_STEP;
-}
-
-
 void wxHtmlWindow::CreateLayout()
 {
-    // SetScrollbars() results in size change events -- and thus a nested
+    // ShowScrollbars() results in size change events -- and thus a nested
     // CreateLayout() call -- on some platforms. Ignore nested calls, toplevel
     // CreateLayout() will do the right thing eventually.
     static wxRecursionGuardFlag s_flagReentrancy;
@@ -739,88 +730,29 @@ void wxHtmlWindow::CreateLayout()
     if (!m_Cell)
         return;
 
-    int clientWidth, clientHeight;
-    GetClientSize(&clientWidth, &clientHeight);
-
-    const int vscrollbar = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-    const int hscrollbar = wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
-
-    if ( HasScrollbar(wxHORIZONTAL) )
-        clientHeight += hscrollbar;
-
-    if ( HasScrollbar(wxVERTICAL) )
-        clientWidth += vscrollbar;
-
     if ( HasFlag(wxHW_SCROLLBAR_NEVER) )
     {
-        SetScrollbars(1, 1, 0, 0); // always off
-        m_Cell->Layout(clientWidth);
+        m_Cell->Layout(GetClientSize().GetWidth());
     }
-    else // !wxHW_SCROLLBAR_NEVER
+    else // Do show scrollbars if necessary.
     {
-        // Lay the content out with the assumption that it's too large to fit
-        // in the window (this is likely to be the case):
-        m_Cell->Layout(clientWidth - vscrollbar);
+        // Get client width if a vertical scrollbar is shown
+        // (which is usually the case).
+        ShowScrollbars(wxSHOW_SB_DEFAULT, wxSHOW_SB_ALWAYS);
+        const int widthWithVScrollbar = GetClientSize().GetWidth();
 
-        // If the layout is wider than the window, horizontal scrollbar will
-        // certainly be shown. Account for it here for subsequent computations.
-        if ( m_Cell->GetWidth() > clientWidth )
-            clientHeight -= hscrollbar;
+        // Let wxScrolledWindow decide whether it needs to show the vertical
+        // scrollbar for the given contents size.
+        ShowScrollbars(wxSHOW_SB_DEFAULT, wxSHOW_SB_DEFAULT);
+        m_Cell->Layout(widthWithVScrollbar);
+        SetVirtualSize(m_Cell->GetWidth(), m_Cell->GetHeight());
 
-        if ( m_Cell->GetHeight() <= clientHeight )
+        // Check if the vertical scrollbar was hidden.
+        const int newClientWidth = GetClientSize().GetWidth();
+        if ( newClientWidth != widthWithVScrollbar )
         {
-            // we fit into the window, hide vertical scrollbar:
-            SetScrollbars
-            (
-                wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
-                ScrollSteps(m_Cell->GetWidth(), clientWidth - vscrollbar),
-                0
-            );
-            // ...and redo the layout to use the extra space
-            m_Cell->Layout(clientWidth);
-        }
-        else
-        {
-            // If the content doesn't fit into the window by only a small
-            // margin, chances are that it may fit fully with scrollbar turned
-            // off. It's something worth trying but on the other hand, we don't
-            // want to waste too much time redoing the layout (twice!) for
-            // long -- and thus expensive to layout -- pages. The cut-off value
-            // is an arbitrary heuristics.
-            static const int SMALL_OVERLAP = 60;
-            if ( m_Cell->GetHeight() <= clientHeight + SMALL_OVERLAP )
-            {
-                m_Cell->Layout(clientWidth);
-
-                if ( m_Cell->GetHeight() <= clientHeight )
-                {
-                    // Great, we fit in. Hide the scrollbar.
-                    SetScrollbars
-                    (
-                        wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
-                        ScrollSteps(m_Cell->GetWidth(), clientWidth),
-                        0
-                    );
-                    return;
-                }
-                else
-                {
-                    // That didn't work out, go back to previous layout. Note
-                    // that redoing the layout once again here isn't as bad as
-                    // it looks -- thanks to the small cut-off value, it's a
-                    // reasonably small page.
-                    m_Cell->Layout(clientWidth - vscrollbar);
-                }
-            }
-            // else: the page is very long, it will certainly need scrollbar
-
-            SetScrollbars
-            (
-                wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
-                ScrollSteps(m_Cell->GetWidth(), clientWidth - vscrollbar),
-                ScrollSteps(m_Cell->GetHeight(), clientHeight),
-                m_xScrollPosition, m_yScrollPosition
-            );
+            m_Cell->Layout(newClientWidth);
+            SetVirtualSize(m_Cell->GetWidth(), m_Cell->GetHeight());
         }
     }
 }

From e2594c8bb9eaadb39cda7d3a844c9294460dbe74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Sun, 24 Jun 2018 19:46:58 +0300
Subject: [PATCH 676/916] Add QT5_CUSTOM_DIR as Qt root dir for install and lib
 subdirs

---
 configure.in        | 33 +++++++++++++++++++++++----------
 docs/qt/install.txt | 15 +++++++++++++++
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/configure.in b/configure.in
index e0f500ce93..2272f0f03d 100644
--- a/configure.in
+++ b/configure.in
@@ -3361,12 +3361,24 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
 
 
     if test "$wxUSE_QT" = 1; then
-        PKG_CHECK_MODULES(QT5,
+        TOOLKIT=QT
+        GUIDIST=QT_DIST
+        TOOLKIT_DIR="qt"
+
+        if test -n "$QT5_CUSTOM_DIR" ; then
+            dnl the name of the directory where the files for this toolkit live
+            TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} -I${QT5_CUSTOM_DIR}/include"
+            GUI_TK_LIBRARY="${GUI_TK_LIBRARY} -L${QT5_CUSTOM_DIR}/lib \
+                            -lQt5Core -lQt5Widgets -lQt5Gui -lQt5OpenGL -lQt5Test \
+                            -Wl,-rpath,${QT5_CUSTOM_DIR}/lib"
+
+        elif test -z "$PKG_CONFIG" ; then
+            AC_MSG_ERROR([specify QT5_CUSTOM_DIR or make sure pkg-config is available to search for Qt5 libraries])
+
+        else
+            PKG_CHECK_MODULES(QT5,
                           [Qt5Core Qt5Widgets Qt5Gui Qt5OpenGL Qt5Test],
-            [
-                TOOLKIT=QT
-                GUIDIST=QT_DIST
-                TOOLKIT_DIR="qt"
+                [
                 TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} ${QT5_CFLAGS}"
                 GUI_TK_LIBRARY="${GUI_TK_LIBRARY} ${QT5_LIBS}"
                 if `pkg-config --variable qt_config Qt5Core | grep "reduce_relocations" >/dev/null`; then
@@ -3374,11 +3386,12 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                     SAMPLES_CXXFLAGS="-fPIC $SAMPLES_CXXFLAGS"
                     WXCONFIG_CXXFLAGS="-fPIC $WXCONFIG_CXXFLAGS"
                 fi
-            ],
-            [
-                AC_MSG_ERROR([Qt5 libraries are not available])
-            ]
-        )
+                ],
+                [
+                    AC_MSG_ERROR([Qt5 libraries are not available])
+                ]
+            )
+        fi
     fi
     dnl the name of the directory where the files for this toolkit live
     TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'`
diff --git a/docs/qt/install.txt b/docs/qt/install.txt
index 3bed60b9a5..c3868ab6c7 100644
--- a/docs/qt/install.txt
+++ b/docs/qt/install.txt
@@ -91,6 +91,21 @@ cd tests
 make
 ./test_gui
 
+* Building wxQT, using qt-unified-XXX-online installer
+------------------------------------------------------
+
+Download qt-unified-XXX-online installer from the qt website.
+Install the Qt package of your choice (with the same minimum version
+restriction as above).
+The same build instructions apply, except that you need to explicitly pass
+to configure the Qt dir of the build intended to use as QT5_CUSTOM_DIR, i.e.
+
+# for Linux:
+../configure --with-qt --enable-debug QT5_CUSTOM_DIR=~/Qt/5.11.0/gcc_64
+
+# for Windows (ran from Git Bash, or any other Unix-like shell):
+../configure --with-qt --enable-debug QT5_CUSTOM_DIR=/c/Qt/5.11.0/mingw53_32
+
 * Building wxGT on Android
 --------------------------
 

From 6b0d920c3fa445ac79a01fc5a9f015af35fdc690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Sun, 24 Jun 2018 19:47:55 +0300
Subject: [PATCH 677/916] Fixes for mingw64 to allow configure to finish under
 MSW

---
 build/aclocal/bakefile.m4 | 6 +++---
 configure.in              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index efa98ae0d0..c45c736cc1 100644
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -377,7 +377,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
         fi
       ;;
 
-      *-*-cygwin* | *-*-mingw32* )
+      *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
         PIC_FLAG=""
         SHARED_LD_CC="\$(CC) -shared -o"
         SHARED_LD_CXX="\$(CXX) -shared -o"
@@ -578,7 +578,7 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
 
     LDFLAGS_GUI=
     case ${BAKEFILE_HOST} in
-        *-*-cygwin* | *-*-mingw32* )
+        *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
         LDFLAGS_GUI="-mwindows"
     esac
     AC_SUBST(LDFLAGS_GUI)
@@ -594,7 +594,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
 [
     case ${BAKEFILE_HOST} in
-        *-*-cygwin* | *-*-mingw32* )
+        *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
             dnl Check for win32 resources compiler:
             AC_CHECK_TOOL(WINDRES, windres)
          ;;
diff --git a/configure.in b/configure.in
index 2272f0f03d..cbd7392216 100644
--- a/configure.in
+++ b/configure.in
@@ -262,7 +262,7 @@ case "${host}" in
     AC_DEFINE(__UNIXWARE__)
   ;;
 
-  *-*-cygwin* | *-*-mingw32* )
+  *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
     dnl MBN: some of the defines have been moved after toolkit detection
     dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin
     dnl      USE_UNIX  must be set and not USE_WIN32
@@ -3712,7 +3712,7 @@ EOF
         HEADER_PAD_OPTION="-headerpad_max_install_names"
       ;;
 
-      *-*-cygwin* | *-*-mingw32* )
+      *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
         ;;
 
       *-*-hpux* )

From ca2860907e4b8bb1935401f688025032821fc155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Sun, 24 Jun 2018 19:48:18 +0300
Subject: [PATCH 678/916] Regenerated after Qt build changes

---
 configure | 46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 42edeae0c8..1b11ac5dc3 100755
--- a/configure
+++ b/configure
@@ -1040,6 +1040,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1460,6 +1461,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1712,6 +1714,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1849,7 +1860,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -2002,6 +2013,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -3991,7 +4003,7 @@ case "${host}" in
 
   ;;
 
-  *-*-cygwin* | *-*-mingw32* )
+  *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
                 PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
@@ -27002,6 +27014,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
     if test "$wxUSE_QT" = 1; then
+        TOOLKIT=QT
+        GUIDIST=QT_DIST
+        TOOLKIT_DIR="qt"
+
+        if test -n "$QT5_CUSTOM_DIR" ; then
+                        TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} -I${QT5_CUSTOM_DIR}/include"
+            GUI_TK_LIBRARY="${GUI_TK_LIBRARY} -L${QT5_CUSTOM_DIR}/lib \
+                            -lQt5Core -lQt5Widgets -lQt5Gui -lQt5OpenGL -lQt5Test \
+                            -Wl,-rpath,${QT5_CUSTOM_DIR}/lib"
+
+        elif test -z "$PKG_CONFIG" ; then
+            as_fn_error $? "specify QT5_CUSTOM_DIR or make sure pkg-config is available to search for Qt5 libraries" "$LINENO" 5
+
+        else
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5
@@ -27062,12 +27088,12 @@ fi
 	echo "$QT5_PKG_ERRORS" >&5
 
 
-                as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5
+                    as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5
 
 
 elif test $pkg_failed = untried; then
 
-                as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5
+                    as_fn_error $? "Qt5 libraries are not available" "$LINENO" 5
 
 
 else
@@ -27076,9 +27102,6 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-                TOOLKIT=QT
-                GUIDIST=QT_DIST
-                TOOLKIT_DIR="qt"
                 TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE} ${QT5_CFLAGS}"
                 GUI_TK_LIBRARY="${GUI_TK_LIBRARY} ${QT5_LIBS}"
                 if `pkg-config --variable qt_config Qt5Core | grep "reduce_relocations" >/dev/null`; then
@@ -27087,6 +27110,7 @@ $as_echo "yes" >&6; }
                 fi
 
 fi
+        fi
     fi
         TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'`
 
@@ -29855,7 +29879,7 @@ EOF
                                         HEADER_PAD_OPTION="-headerpad_max_install_names"
       ;;
 
-      *-*-cygwin* | *-*-mingw32* )
+      *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
         ;;
 
       *-*-hpux* )
@@ -39632,7 +39656,7 @@ fi
 
     LDFLAGS_GUI=
     case ${BAKEFILE_HOST} in
-        *-*-cygwin* | *-*-mingw32* )
+        *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
         LDFLAGS_GUI="-mwindows"
     esac
 
@@ -40066,7 +40090,7 @@ fi
         fi
       ;;
 
-      *-*-cygwin* | *-*-mingw32* )
+      *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
         PIC_FLAG=""
         SHARED_LD_CC="\$(CC) -shared -o"
         SHARED_LD_CXX="\$(CXX) -shared -o"
@@ -40311,7 +40335,7 @@ EOF
 
 
     case ${BAKEFILE_HOST} in
-        *-*-cygwin* | *-*-mingw32* )
+        *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
                         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2

From 1105361d80fa97f67f8da088119fbfffa7c0fd52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Sun, 24 Jun 2018 19:49:55 +0300
Subject: [PATCH 679/916] Use the correct include path for Qt headers

---
 src/common/utilscmn.cpp | 2 +-
 src/qt/apptraits.cpp    | 2 +-
 src/qt/clipbrd.cpp      | 4 ++--
 src/qt/cursor.cpp       | 4 ++--
 src/qt/dcscreen.cpp     | 4 ++--
 src/qt/listctrl.cpp     | 2 +-
 src/qt/toolbar.cpp      | 2 +-
 src/qt/uiaction.cpp     | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 6000660563..729c51da67 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -108,7 +108,7 @@
 #endif
 
 #if wxUSE_GUI && defined(__WXQT__)
-    #include <QtGlobal>       // for QT_VERSION_STR constants
+    #include <QtCore/QtGlobal>       // for QT_VERSION_STR constants
 #endif
 #if wxUSE_BASE
 
diff --git a/src/qt/apptraits.cpp b/src/qt/apptraits.cpp
index f196158be2..1f1553f6c0 100644
--- a/src/qt/apptraits.cpp
+++ b/src/qt/apptraits.cpp
@@ -15,7 +15,7 @@
 #include "wx/timer.h"
 #include "wx/qt/private/timer.h"
 
-#include <QtGlobal>
+#include <QtCore/QtGlobal>
 
 wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
 {
diff --git a/src/qt/clipbrd.cpp b/src/qt/clipbrd.cpp
index d692f6627e..5a39a623c2 100644
--- a/src/qt/clipbrd.cpp
+++ b/src/qt/clipbrd.cpp
@@ -12,8 +12,8 @@
     #pragma hdrstop
 #endif
 
-#include <QApplication>
-#include <QClipboard>
+#include <QtWidgets/QApplication>
+#include <QtGui/QClipboard>
 
 #include "wx/clipbrd.h"
 #include "wx/scopedarray.h"
diff --git a/src/qt/cursor.cpp b/src/qt/cursor.cpp
index 442e250458..880a2799fa 100644
--- a/src/qt/cursor.cpp
+++ b/src/qt/cursor.cpp
@@ -12,8 +12,8 @@
     #pragma hdrstop
 #endif
 
-#include <QApplication>
-#include <QBitmap>
+#include <QtWidgets/QApplication>
+#include <QtGui/QBitmap>
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
diff --git a/src/qt/dcscreen.cpp b/src/qt/dcscreen.cpp
index dd0e6f11b8..b42445ea3a 100644
--- a/src/qt/dcscreen.cpp
+++ b/src/qt/dcscreen.cpp
@@ -13,8 +13,8 @@
 
 #include <QtWidgets/QDesktopWidget>
 #include <QtGui/QScreen>
-#include <QApplication>
-#include <QPixmap>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPixmap>
 
 wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
 
diff --git a/src/qt/listctrl.cpp b/src/qt/listctrl.cpp
index 7c9c9940cd..7ddd3b8d79 100644
--- a/src/qt/listctrl.cpp
+++ b/src/qt/listctrl.cpp
@@ -12,7 +12,7 @@
     #pragma hdrstop
 #endif
 
-#include <QHeaderView>
+#include <QtWidgets/QHeaderView>
 
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
diff --git a/src/qt/toolbar.cpp b/src/qt/toolbar.cpp
index cad52f82cb..c6ec8adc5c 100644
--- a/src/qt/toolbar.cpp
+++ b/src/qt/toolbar.cpp
@@ -14,7 +14,7 @@
 
 #if wxUSE_TOOLBAR
 
-#include <QActionGroup>
+#include <QtWidgets/QActionGroup>
 #include <QtWidgets/QToolButton>
 
 #ifndef WX_PRECOMP
diff --git a/src/qt/uiaction.cpp b/src/qt/uiaction.cpp
index 6490cf35d9..0df9863b9c 100644
--- a/src/qt/uiaction.cpp
+++ b/src/qt/uiaction.cpp
@@ -16,8 +16,8 @@
 #include "wx/private/uiaction.h"
 
 #include <QtTest/QtTestGui>
-#include <QApplication>
-#include <QWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
 
 #include "wx/qt/defs.h"
 #include "wx/qt/private/utils.h"

From df4e2d3d6e490f45eb136399e5d8867232a0a148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Sun, 24 Jun 2018 19:52:46 +0300
Subject: [PATCH 680/916] Disable wxActivityIndicator if it can't draw itself

---
 include/wx/chkconf.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 106918e031..a1b0303f6c 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1721,6 +1721,11 @@
 #   endif
 #endif
 
+#if wxUSE_ACTIVITYINDICATOR && !wxUSE_GRAPHICS_CONTEXT
+#   undef wxUSE_ACTIVITYINDICATOR
+#   define wxUSE_ACTIVITYINDICATOR 0
+#endif /* wxUSE_ACTIVITYINDICATOR */
+
 #if wxUSE_GRAPHICS_CONTEXT && !wxUSE_GEOMETRY
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_GRAPHICS_CONTEXT requires wxUSE_GEOMETRY"

From fc7cae98258751589faa0cb4570000b65ed14966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinraceanu2@gmail.com>
Date: Sun, 24 Jun 2018 19:53:48 +0300
Subject: [PATCH 681/916] Fixed typo

---
 include/wx/chkconf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index a1b0303f6c..586680b307 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1742,7 +1742,7 @@
 #       undef wxUSE_DC_TRANSFORM_MATRIX
 #       define wxUSE_DC_TRANSFORM_MATRIX 0
 #   endif
-#endif /* wxUSE_GRAPHICS_CONTEXT */
+#endif /* wxUSE_DC_TRANSFORM_MATRIX */
 
 /* generic controls dependencies */
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)

From 0fa00b51599bc2adda8b22b0f1d33da126d41359 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Jun 2018 15:49:50 +0200
Subject: [PATCH 682/916] Don't do anything when ScrollWindow(0, 0) is called
 in wxMSW

This doesn't really change anything, but just skips executing some code
uselessly if we know in advance we are not going to do anything, which
is nice as ScrollWindow() actually ends up being called with 0 arguments
surprisingly often from wxScrollHelperBase::SetScrollRate().

This is also consistent with what wxGTK does.
---
 src/msw/window.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8c3c961446..434927ecaf 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1144,6 +1144,9 @@ void wxWindowMSW::SetScrollbar(int orient,
 
 void wxWindowMSW::ScrollWindow(int dx, int dy, const wxRect *prect)
 {
+    if ( !dx && !dy )
+        return;
+
     RECT rect;
     RECT *pr;
     if ( prect )

From cc931612eec2e3ea49200ebff45042135f3c3f9c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 26 Jun 2018 00:58:20 +0200
Subject: [PATCH 683/916] Fix a bug with layout of grandchildren in wxMSW
 wxScrolledWindow

Apparently changing the window scrollbars in the middle of a window
deferred repositioning operation is not allowed and confuses
EndDeferWindowPos() which doesn't update the position of _grand_
children correctly in this case.

This bug notably manifested itself when loading a wxScrolledWindow
containing wxStaticBox from XRC, as the parent window was initially
created with the default small size and then relaid out when it was
resized to its real size on first wxEVT_SIZE event which also updated
the scrollbars. As a result, the children of the wxStaticBox were
shifted downwards.

The fix simply flushes the current repositioning operation and starts
one anew in wxWindow::SetScrollbar().
---
 src/msw/window.cpp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 434927ecaf..52dbb45e08 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1105,6 +1105,39 @@ void wxWindowMSW::SetScrollbar(int orient,
                                int range,
                                bool refresh)
 {
+#if wxUSE_DEFERRED_SIZING
+    // Work around not documented, but reliably happening, at least under
+    // Windows 7, but with changing the scrollbars in the middle of a deferred
+    // positioning operation: the child windows of a window whose position is
+    // deferred after changing the scrollbar get offset compared to their
+    // correct position, somehow.
+    //
+    // Note that this scenario happens all the time with wxScrolledWindow as
+    // its HandleOnSize(), which calls AdjustScrollbars() and hence this method
+    // indirectly, gets called from WM_SIZE handler, which begins deferring
+    // window positions, and calls Layout() which continues doing it after the
+    // scrollbar update. So one way of reproducing the bug is to have a window
+    // with children, such as wxStaticBox, inside a wxScrolledWindow whose size
+    // gets changed.
+    //
+    // Fix this simply by "flushing" the pending windows positions and starting
+    // a new deferring operation.
+    if ( m_hDWP )
+    {
+        // Do reposition the children already moved.
+        EndRepositioningChildren();
+
+        // And restart another deferred positioning operation as any currently
+        // existing ChildrenRepositioningGuard objects would be confused if we
+        // just removed the HDWP from under them.
+        //
+        // Unfortunately we have to ignore BeginRepositioningChildren() return
+        // value here, there is not much that we can do if it fails (but this
+        // should never happen anyhow).
+        BeginRepositioningChildren();
+    }
+#endif // wxUSE_DEFERRED_SIZING
+
     // We have to set the variables here to make them valid in events
     // triggered by ::SetScrollInfo()
     *(orient == wxHORIZONTAL ? &m_xThumbSize : &m_yThumbSize) = pageSize;

From 616f0ca7f9310391929ffa5fe5610f5e44dd1626 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 27 Jun 2018 18:33:23 +0200
Subject: [PATCH 684/916] Fixing notebook drawing

Workaround for drawing problems under 10.14 as we do not draw the notebook ourselves, this should be ok on all system versions, for details see #18146
---
 include/wx/osx/cocoa/private.h | 8 +++++++-
 src/osx/cocoa/notebook.mm      | 2 +-
 src/osx/cocoa/window.mm        | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 694dc97ece..ed70b80794 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -418,7 +418,13 @@ public:
 
     @end
 
-    void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
+    // this enum declares which methods should not be overridden in the native view classes
+    enum wxOSXSkipOverrides {
+        wxOSXSKIP_NONE = 0x0,
+        wxOSXSKIP_DRAW = 0x1
+    };
+
+    void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c, wxOSXSkipOverrides skipFlags = wxOSXSKIP_NONE);
 
     /*
     We need this for ShowModal, as the sheet just disables the parent window and
diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm
index 0a3862ac24..853b810e49 100644
--- a/src/osx/cocoa/notebook.mm
+++ b/src/osx/cocoa/notebook.mm
@@ -87,7 +87,7 @@
     if (!initialized)
     {
         initialized = YES;
-        wxOSXCocoaClassAddWXMethods( self );
+        wxOSXCocoaClassAddWXMethods( self, wxOSXSKIP_DRAW );
     }
 }
 
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index d0f90d0545..ea145aafb3 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -2418,7 +2418,7 @@ void wxWidgetCocoaImpl::controlTextDidChange()
 
 #endif
 
-void wxOSXCocoaClassAddWXMethods(Class c)
+void wxOSXCocoaClassAddWXMethods(Class c, wxOSXSkipOverrides skipFlags)
 {
 
 #if OBJC_API_VERSION < 2
@@ -2465,7 +2465,9 @@ void wxOSXCocoaClassAddWXMethods(Class c)
 #if !wxOSX_USE_NATIVE_FLIPPED
     wxOSX_CLASS_ADD_METHOD(c, @selector(isFlipped), (IMP) wxOSX_isFlipped, "c@:" )
 #endif
-    wxOSX_CLASS_ADD_METHOD(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}" )
+        
+    if ( !(skipFlags & wxOSXSKIP_DRAW) )
+        wxOSX_CLASS_ADD_METHOD(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}" )
 
     wxOSX_CLASS_ADD_METHOD(c, @selector(controlAction:), (IMP) wxOSX_controlAction, "v@:@" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(controlDoubleAction:), (IMP) wxOSX_controlDoubleAction, "v@:@" )

From 689b9b78a3fe1d5269bf08246ae88d7d27cc519b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 27 Jun 2018 19:37:23 +0200
Subject: [PATCH 685/916] Document that SetStatusText() updates the display
 immediately

This is done by explicitly calling Update() in the generic version and
seems to also be done by the native MSW one, even if it's not documented
to do it.
---
 interface/wx/frame.h    | 6 +++++-
 interface/wx/statusbr.h | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/interface/wx/frame.h b/interface/wx/frame.h
index f2753026cb..06910df8f2 100644
--- a/interface/wx/frame.h
+++ b/interface/wx/frame.h
@@ -427,7 +427,11 @@ public:
     void SetStatusBarPane(int n);
 
     /**
-        Sets the status bar text and redraws the status bar.
+        Sets the status bar text and updates the status bar display.
+
+        This is a simple wrapper for wxStatusBar::SetStatusText() which doesn't
+        do anything if the frame has no status bar, i.e. GetStatusBar() returns
+        @NULL.
 
         @param text
             The text for the status field.
diff --git a/interface/wx/statusbr.h b/interface/wx/statusbr.h
index 0acf382f52..bdd39c5023 100644
--- a/interface/wx/statusbr.h
+++ b/interface/wx/statusbr.h
@@ -279,7 +279,9 @@ public:
     /**
         Sets the status text for the @a i-th field.
 
-        The given text will replace the current text.
+        The given text will replace the current text. The display of the status
+        bar is updated immediately, so there is no need to call
+        wxWindow::Update() after calling this function.
 
         Note that if PushStatusText() had been called before the new text will
         also replace the last saved value to make sure that the next call to

From 2842108e241f49c7e1e115cfe44d22bfaf68819f Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Mon, 25 Jun 2018 09:36:43 +0200
Subject: [PATCH 686/916] Fix typos in container classes descriptions

Closes https://github.com/wxWidgets/wxWidgets/pull/845
---
 docs/doxygen/mainpages/cat_classes.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/doxygen/mainpages/cat_classes.h b/docs/doxygen/mainpages/cat_classes.h
index 81c1dc06e3..ed38b1bc3e 100644
--- a/docs/doxygen/mainpages/cat_classes.h
+++ b/docs/doxygen/mainpages/cat_classes.h
@@ -632,13 +632,13 @@ these classes provide a subset or almost complete STL API.
 
 Related Overviews: @ref overview_container
 
-@li wxArray<T>: Legacy dynamic array, use srd::vector or wxVector instead.
+@li wxArray<T>: A legacy dynamic array, use std::vector or wxVector instead.
 @li wxArrayString: An efficient container for storing wxString objects
 @li wxHashMap<T>: A type-safe hash map implementation (macro based)
 @li wxHashSet<T>: A type-safe hash set implementation(macro based)
 @li wxHashTable: A simple hash table implementation (deprecated, use wxHashMap)
 @li wxList<T>: A type-safe linked list implementation (macro based)
-@li wxVector<T>: Template base vector implementation identical to std::vector.
+@li wxVector<T>: A template-based vector implementation identical to std::vector
 
 
 

From c716b59783637e3177bab5366cdc6200cb1435fc Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Wed, 27 Jun 2018 22:36:57 +0200
Subject: [PATCH 687/916] Fix swapped numerator and denominator in the equation

tan(a/2) = sin(a) / (1 + cos(a)), so 1/tan(a/2) = 1 / sin(a) * (1 + cos(a))

See #18142.
---
 src/common/graphcmn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 6e3e013bbf..a48d03c37d 100644
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -487,7 +487,7 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
     bool drawClockwiseArc = v1.GetCrossProduct(v2) < 0;
 
     alpha = wxDegToRad(alpha);
-    wxDouble distT = r / (1.0 + cos(alpha)) * sin(alpha); // = r / tan(a/2) =  r / sin(a/2) * cos(a/2)
+    wxDouble distT = r / sin(alpha) * (1.0 + cos(alpha)); // = r / tan(a/2) =  r / sin(a/2) * cos(a/2)
     wxDouble distC = r / sin(alpha / 2.0);
     wxASSERT_MSG( distT <= v1Length && distT <= v2Length,
                   wxS("Radius is too big to fit the arc to given points") );

From 60669e9b50fd4d314a50d9bcc3dcb7516f35c191 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Wed, 27 Jun 2018 22:38:14 +0200
Subject: [PATCH 688/916] Harmonize wxGraphicsPathData::AddArcToPoint()
 behaviour across all ports

AddArcToPoint() on macOS port is implemented with native API (CGPathAddArcToPoint) so its behaviour should be considered as a reference for generic implementation used in another ports.

Closes #18086.
---
 docs/doxygen/images/drawing-addarctopoint.png | Bin 0 -> 3386 bytes
 interface/wx/graphics.h                       |  11 ++++++++---
 src/common/graphcmn.cpp                       |   4 ----
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 docs/doxygen/images/drawing-addarctopoint.png

diff --git a/docs/doxygen/images/drawing-addarctopoint.png b/docs/doxygen/images/drawing-addarctopoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3aa71932a168a6e39f4fbe5be752d77934ed77e
GIT binary patch
literal 3386
zcmV-A4aM?_P)<h;3K|Lk000e1NJLTq00FoF009I90{{R3sO&tB0000mP)t-s76S{)
zk{NrDp!3_W!C4Zx)#gcHcK`qXVWi#z8F$x`V!~}7&as^mX|8@b3;VZc<_M6=000cd
zNkl<ZcwX(@VQ3u383y1%>B;9}8H+%R3I^k1U0d34#Yv8)MhLP^>O0Fdc6^gGCKxr^
zv(-BIZg1}uy7P*J+N)prCvAU~V2e{DI}IhO6FYHgYDWU6G=G}xuYxFUB12CoBoNf5
zv^$f%izHvPx8oDHJKW15j~4%V_;$aU+nYTRNF4cbZCo4I#<g*6TpI^y7V5;HQs9a<
zSe8xjxZ_bv3S6A44C3P4u@;d6w*r=)xDA%tcu@*m50+`sLZ9iLqj8hHa77B-H5k@1
z<se`zf)&Vv(<;z9qClU`e~UU;Ud0tE0S=464y)Q%@Up{0+;(t~0apR~YdFMzKEcMa
zRPGwI`?_j4<2jR$(IZK>H0)*GA+r-eb}QvL?3ZMo>p{`lL5MwS0oqo8jj<@t3Z*vE
zqF|9_g_5`7W+#BL3GifX3EveM?r(-E0ZxLnaY0NQ*T(&?J0UIZhuz&wCnZknc5=U@
zxNJ8Il@iC#%0F~}CMT|&=bH#;+PM1@QsO@5xY@@g?w0?a21*I(a3yB@763e`T-_@f
zj-Qv8DS&;miZU%3PW!m~{-=fj#+#Z4_DY1~$(=$iQ>hD7Djd`ps=1{osf1Lx^bl&%
zZp{Lq^59DEV^wqj%FILZz7uy^=T%8@ymcn!#Q{eEE%mvSIG&QCq%KH+`vK}jn^6vg
zAE&D^)aShejLsxNjdQ2E`Y9^PpXS4i%c&c-PUR<I#^Jj$Y{Z)eMsI``mp%cHJg6iu
zgcPR_dQN=rD$48O#DT&y+O26|Uqa$fd2X^rwXC>DW))>#P8{b=C4jvl!ySf?%%=Vl
zDx4Za<8fMNDyTT`sm{A~GF&1oIDL}BPjmpvr9?Pz=(XW9n$tSp3J0z*DAGEU;lSxC
zh5tMRl#-tW9*3h4%P6}aA?+rcBNvrNrNsf-G*G;hkP^p}SCpAVfN?q%EZlpyX0Fa$
zomCzWFs?TyBD*!ERFk^+=Swu8xWaD)Xv&(D)$a!sr>j)p{oU%MddtJf3xUL;Hv?aJ
zmw{%L<f}LK?%liZy^G3Y!)kfq_M4vv5mz_`AJO>5_U5W7Ks&Dvs|)07N{Sr}7*1DB
zpSIN62BMeCzf=g>t|$uQ1qz45K5fbMg7h%mcX5H-R-DWvLOY2w+gqrc(sOQmxq2g%
zINnPxc+U`5KM5i35pLTcxfyqsNPZF^97O{eQxxSjY?SLAxaIOvpVNTg(it?6DbE`W
z1@ce!PTl2QN(2ITW)R+aT2Yc-)woXhmN}QFyqahMPGqXn6h%qED+}AeQo2~}Ef2LE
zhq<9fPReO`rqEg2IZ)-@Xf^K4Des#mjcs$-v-%#c+d6Nw7Uz9qeM(?&pI&R7H(H8I
zQ_sS^27w5)&gSFbT{twF*t(4osV{i1CIX5Z_3`0&p#xaUtG3RWL?CgW`Y2q9#O^xu
zpIYk-9<Jo0aKNr@^%m8$RbDG_C3~X{DJe9b0s-ptX1x~G;yCdo*sQ->=L=g<FM9RP
zlIVVTah!hA++d%ZuU2rn1NDP_Vl#s{&U+i*O`m%(^|c+Pe(MzA3E(`p@#(WoeJtjP
z_@Y`IhYw<3c~+vS5noh`;|dwn%}vjCB6dSwpmmDlbkvQuIS*@9C%)u`R!-uh0()z6
z+XNQXt-w7fa8~9BJi}XOs>*8-Zc1Q7slE_HgS-uIx8zAz^Kg6WUUCWe&G@b@XfUOB
zU0%J1Oe@HnxH~H%xZJ6Fmt4|!-Jbl;iyZ>3)14XSF3*Dp*$LFm3KhUXjWy$v8yTmi
z?SLQNY^rv<<>{rR+jQ0UKUGk)jR(4%7hWQ!@oQq|$yO?WtFw)7%J)QYR;K`&7n>PU
zw+`N3TKX4w;*{g^wh@K%Dq3R^BdSFOD>tH2tc&kUZu~3&?56M;cTs(CX{lDac(rnQ
z3x>t4i-wJB0@qyqZG0sq<<mB9LMXg-a@@hCgVQyf#wyom!%@Wv=`w5#2v!b-p}Q8A
z2Ylk_y)CMjZnM%ozP5747dQ&sOXc+W_5H-xET@lCihGK-#PbnYiWvX{$TM7@&8@6*
zqPTnPC*#$+iRW#0$+<XfE3#$}`rXRqExf@iw@ig`;{D{w@uR3kkoo&1)-I>PV~{T7
z$@4A_{lw&zGYD-4PV>=EbUI?9mO~i`<%uO0x=CxxqidUGvSAya18O<F1wtt?TN0at
z(^au%sjs`<jBOChlrt4f`@o4$bx$<B<4|8~L#`8I(cfPBBQ^_{J|Qv_jAN}0rR_o7
zs-d5xtM8wDCU8!&=p=|ZoXf19=H^A`H<Ab<t}y6#nxjwNZNqUIM4Y~7H4ff+!3^c@
zbWKSLTyM=!pWPzd$mZK%a2!^eiYs~I^s{=+_KyV{o0=8c44huOJ9NPFoJ1`PX0r?S
zJh6}^T`=tGy^|*3dTAB+XybE$_950}{@!t2S{GhM+&1h!_ufe}aG3^hyZ7i=WdkZ$
z9b-!~F0~%VG&W(_?mO^0IN_<TxWUr0P(JU{>f=r~1-Eh}0xiOE1HLNfy^XK9LFK-u
zs=uSaCRc8m<C<DIq=!5!r<ThZY;NWH)|{3D&BC2I<ypD8vKqrCSB`a&{fL`x<(6qv
za2WKgTzYtLeLrmaHTO4SBTu4mD`ybe#7Vrk!MFA3<zHa4arP#zE%{U+8bf9r5O~}H
zIsaZkngS(RadR1lOUj8mqXL?&IH)FcB?ZyE6KLF1Lx7@C2!;e2ms5c$B>}N$+XIb5
zFU6<AUy7CM3^wj4a8r0wTcIP!IG!I1fAzxYNZ@gK;q}+`j{=VyRelDs?8*ckH*!pP
z7N1K59hV+b6lwp^S5BQ(=4Hh}eO7s0T3q^B<xy#IBhLzU6dD2?dc``5))@v|PV8Bi
zLMU*!DYO7PbYCcNMWKuCcqSCMlE_7;5gG~{M5ggVC&GZ^j|T4kHvHxKmXP3zso`OD
z4}7IG9}-;Ya#<}8Q%S#pyX;i1oRJe(Qkm|&q&SDB4iBR7XyL&XRJB|#52NwyiiHN3
zb7<<Y>Z8;oJh+nD>+hO7)QQmG(CbvL>|>%MAB6}vr#h8ud{%yDJ3@pjIhFIVr}uay
zOgJ3wJx?NNGzA(W9M1!O9@7jP?hLt4UYvfsvHq^L0QZuOJ`?_;Rj?{)t3@Awc;j|N
zVKjgnTO+8fK9(Co11XRe;9mX^##z5O_t-?^H(IrYZ7n!0cP^WKCVN1>2YDOUfIP7b
zXTWyLJFhH>VzIvq{Uib`?$`?KAT}!Qv8qn*^wJ$C6fLM+K4X~d0r@zMN3<w#1^;z$
z16sd{1(R>nTrlG%uhN1Yw?{3l3l+^h=B7kCyjIK^v;g-FEozwj0eSP`MQsAi$18US
z&P$8HFe@n9{IskfYsF2h&<fmR)uf5XSvLf<qH@^(jL9C5&)Yj+$y$tqJ{tq5FpNeB
zu`9^iyh;^}O~fhU9LJBj*^R#vD}eLdHN;=E<CL|GH&zUj;dtd-Tm-0AiQ^&+x4v?^
zO0ny!7yJ)rT7~ODal08e0d3nv{1D}w{FjxBa#Nl|v^A$CKjvm`XoH41M<T7ly#kGx
z>;ZXPwu*Pa8%oy7cX1rBA4QW_DFT3Xk-X)A-O5GQeH&l74p84kIuos{9Cn!KCnlE7
zu_yq8Sm=-Lba8nS<yFE$1gP|Pf&bS^?U<XBF#sUsS6Cl|bcADVS@C$1B27r=`dw5x
z<_$M)WDqR+a|F<jQ2@}6^)7rJEMdph+Q~6MBfNk)_D?`@;wk->tMohP=g~r(L}}y1
zb694aYD$bdHzYAGr%H^&2Qi6p=@Sy;N~**-m@?xKL|hx!#_2NSdgmp^r6(lDji^*!
z9C~euap@Bh<8+nEi^J~rBrXZ=N2r&d%7MEE02<i}mfE;S3Y-=N0D~G9c-(QEh7^~M
z)!78$e%e(X8)k5D;!|DL8k@kC>aLCfXi+{cTEW4IFTwIQ?y#z5Ic}MbS!~Q+fya6O
z{dmJhe3uEtO@RF@+I-B6;l!O8T!k}{-3s82dy+aZ%^8n{wsN{kS643Y;PMt&v`7yh
zhq!W>Gf_>^M*NVCE8sz85qz8t5KcU!7Aj-W(Fpj&jU5x<<DwL}F)M4~F}6X8<N7S{
zv0=)yLg8VfxQmKY8E_bYo2(6B*+uO{h;bu!{dWa-z=Opw;|eEU_`50V`#D`zCsisd
zZgNtcJRvErz$&LoiaY1fCMRt<aUVD|Rn5qWQ+efN#i^>il{?3}<z!4wT$)#o%84tT
zbaaD|6Nht7<zlkp^j`ISv=%3E+PF5ZjceoDxHhhhYvbCuHm;3p<0Q`i0e)3~M6f$E
QyZ`_I07*qoM6N<$f&n09UH||9

literal 0
HcmV?d00001

diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h
index 792821e61d..7361413c4b 100644
--- a/interface/wx/graphics.h
+++ b/interface/wx/graphics.h
@@ -50,9 +50,14 @@ public:
     //@}
 
     /**
-        Appends a an arc to two tangents connecting (current) to (@a x1,@a y1)
-        and (@a x1,@a y1) to (@a x2,@a y2), also a straight line from (current)
-        to (@a x1,@a y1).
+        Adds an arc (of a circle with radius @a r) that is tangent
+        to the line connecting current point and (@a x1, @a y1) and
+        to the line connecting (@a x1, @a y1) and (@a x2, @a y2).
+        If the current point and the starting point of the arc are different,
+        a straight line connecting these points is also appended.
+        After this call the current point will be at the ending point
+        of the arc.
+        @image html drawing-addarctopoint.png
     */
     virtual void AddArcToPoint(wxDouble x1, wxDouble y1, wxDouble x2,
                                wxDouble y2, wxDouble r);
diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index a48d03c37d..3d70b9a202 100644
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -479,7 +479,6 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
          alpha == 0 || alpha == 180 || r == 0 )
     {
         AddLineToPoint(p1.m_x, p1.m_y);
-        AddLineToPoint(p2.m_x, p2.m_y);
         return;
     }
 
@@ -489,8 +488,6 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
     alpha = wxDegToRad(alpha);
     wxDouble distT = r / sin(alpha) * (1.0 + cos(alpha)); // = r / tan(a/2) =  r / sin(a/2) * cos(a/2)
     wxDouble distC = r / sin(alpha / 2.0);
-    wxASSERT_MSG( distT <= v1Length && distT <= v2Length,
-                  wxS("Radius is too big to fit the arc to given points") );
     // Calculate tangential points
     v1.Normalize();
     v2.Normalize();
@@ -513,7 +510,6 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
 
     AddLineToPoint(t1.m_x, t1.m_y);
     AddArc(c.m_x, c.m_y, r, wxDegToRad(a1), wxDegToRad(a2), drawClockwiseArc);
-    AddLineToPoint(p2.m_x, p2.m_y);
 }
 
 //-----------------------------------------------------------------------------

From a824ee092db5dd28c907d36867b5281b151daca9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 23 Jun 2018 23:56:55 +0200
Subject: [PATCH 689/916] Change the return type of wxListCtrl::SetItem()
 overload to bool

For some reason lost in the depths of time (but probably just a typo)
(but probably just a typo) (but probably just a typo) (but probably just
a typo), SetItem() overload taking the column index returned "long" and
not "bool", even though the actual return value was always "true" or
"false" (or even just always "true" in the case of the generic version).

Change it to return "bool" for consistency with the other overload and
because this just makes more sense and shouldn't break any existing code
due to the implicit conversions between bool and long.

Also document the return value meaning.

Closes #18153.
---
 docs/changes.txt              | 4 ++++
 include/wx/generic/listctrl.h | 2 +-
 include/wx/msw/listctrl.h     | 2 +-
 interface/wx/listctrl.h       | 8 +++++++-
 src/generic/listctrl.cpp      | 2 +-
 src/msw/listctrl.cpp          | 2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index e27130aec2..850405d9ca 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -78,6 +78,10 @@ Changes in behaviour which may result in build errors
 - wxHtmlCell::AdjustPagebreak() has lost its "known_pagebreaks" argument,
   update your code if you override this method (you shouldn't be calling it).
 
+- wxListCtrl::SetItem() overload taking the column index now returns bool and
+  not long. Its return value hasn't changed, however, and is still always
+  either true or false, so normally the existing code should continue to work.
+
 
 3.1.2: (released 2018-??-??)
 ----------------------------
diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 6b71353fed..f1159daf9f 100644
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -72,7 +72,7 @@ public:
 
     bool GetItem( wxListItem& info ) const;
     bool SetItem( wxListItem& info ) ;
-    long SetItem( long index, int col, const wxString& label, int imageId = -1 );
+    bool SetItem( long index, int col, const wxString& label, int imageId = -1 );
     int  GetItemState( long item, long stateMask ) const;
     bool SetItemState( long item, long state, long stateMask);
     bool SetItemImage( long item, int image, int selImage = -1 );
diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 78010b212e..2c27e56b6a 100644
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -158,7 +158,7 @@ public:
     bool SetItem(wxListItem& info);
 
     // Sets a string field at a particular column
-    long SetItem(long index, int col, const wxString& label, int imageId = -1);
+    bool SetItem(long index, int col, const wxString& label, int imageId = -1);
 
     // Gets the item state
     int  GetItemState(long item, long stateMask) const;
diff --git a/interface/wx/listctrl.h b/interface/wx/listctrl.h
index bd6bbad11a..49bfdb85ef 100644
--- a/interface/wx/listctrl.h
+++ b/interface/wx/listctrl.h
@@ -1093,13 +1093,19 @@ public:
 
         Using the wxListItem's mask and state mask, you can change only selected
         attributes of a wxListCtrl item.
+
+        @return @true if the item was successfully updated or @false if the
+            update failed for some reason (e.g. an invalid item index).
     */
     bool SetItem(wxListItem& info);
 
     /**
         Sets an item string field at a particular column.
+
+        @return @true if the item was successfully updated or @false if the
+        update failed for some reason (e.g. an invalid item index).
     */
-    long SetItem(long index, int column, const wxString& label, int imageId = -1);
+    bool SetItem(long index, int column, const wxString& label, int imageId = -1);
 
     /**
         Sets the background colour for this item.
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index db4e1fd70a..f3e591d449 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -4913,7 +4913,7 @@ bool wxGenericListCtrl::SetItem( wxListItem &info )
     return true;
 }
 
-long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
+bool wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId )
 {
     wxListItem info;
     info.m_text = label;
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index ad763145ba..45041dcf6f 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -956,7 +956,7 @@ bool wxListCtrl::SetItem(wxListItem& info)
     return true;
 }
 
-long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)
+bool wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)
 {
     wxListItem info;
     info.m_text = label;

From 32db375e46643de7fbaf8c9c10fecd7b4e5be371 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 28 Jun 2018 10:38:14 -0700
Subject: [PATCH 690/916] Avoid assertion failure in wxGLContext ctor

Check for NULL pointers directly rather than making assumptions based
on a version check.
See #18155
---
 src/unix/glx11.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/unix/glx11.cpp b/src/unix/glx11.cpp
index a033237441..e7c2eeef72 100644
--- a/src/unix/glx11.cpp
+++ b/src/unix/glx11.cpp
@@ -494,9 +494,13 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
     GLXContext tempContext = glXCreateContext(dpy, vi, NULL, x11Direct);
     wxCHECK_RET(tempContext, "glXCreateContext failed" );
 
-    PFNGLXCREATECONTEXTATTRIBSARBPROC wx_glXCreateContextAttribsARB
-        = (PFNGLXCREATECONTEXTATTRIBSARBPROC)
-        glXGetProcAddress((GLubyte *)"glXCreateContextAttribsARB");
+    GLXFBConfig* const fbc = win->GetGLXFBConfig();
+    PFNGLXCREATECONTEXTATTRIBSARBPROC wx_glXCreateContextAttribsARB = 0;
+    if (fbc)
+    {
+        wx_glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)
+            glXGetProcAddress((GLubyte*)"glXCreateContextAttribsARB");
+    }
 
     glXDestroyContext( dpy, tempContext );
 
@@ -514,9 +518,6 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
 
     if ( wx_glXCreateContextAttribsARB )
     {
-        GLXFBConfig *fbc = win->GetGLXFBConfig();
-        wxCHECK_RET( fbc, "Invalid GLXFBConfig for OpenGL" );
-
         m_glContext = wx_glXCreateContextAttribsARB( dpy, fbc[0],
                                 other ? other->m_glContext : None,
                                 x11Direct, contextAttribs );
@@ -534,11 +535,8 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
     if ( !g_ctxErrorOccurred && !m_glContext )
     {
         // Old-way, without context atributes. Up to GL 2.1
-        if ( wxGLCanvas::GetGLXVersion() >= 13 )
+        if (fbc)
         {
-            GLXFBConfig *fbc = win->GetGLXFBConfig();
-            wxCHECK_RET( fbc, "Invalid GLXFBConfig for OpenGL" );
-
             m_glContext = glXCreateNewContext( dpy, fbc[0], renderType,
                                                other ? other->m_glContext : None,
                                                x11Direct );

From 17c7048f3659ad20ab15ae800bdb8f6a09ed9e06 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 29 Jun 2018 14:33:56 +0200
Subject: [PATCH 691/916] Fix crash when appending items of empty vector to
 wxItemContainer

Passing an empty std::vector<wxString> to Append() or Insert() methods
of any wxItemContainer-derived classes, such as e.g. wxComboBox,
resulted in undefined behaviour due to accessing the first element of an
empty vector.

Fix this by avoiding using it when the vector is empty.
---
 include/wx/arrstr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 5a19181524..23a73fefb8 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -494,7 +494,7 @@ public:
     wxArrayStringsAdapter(const std::vector<wxString>& strings)
         : m_type(wxSTRING_POINTER), m_size(strings.size())
     {
-        m_data.ptr = &strings[0];
+        m_data.ptr = m_size == 0 ? NULL : &strings[0];
     }
 #endif // wxUSE_STD_CONTAINERS_COMPATIBLY
 

From 24dbe9775c1901b24a514ead28923227922b30af Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 29 Jun 2018 15:40:23 +0200
Subject: [PATCH 692/916] Switching colorspace according to Apple's
 recommendation

---
 src/osx/utils_osx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp
index 20983f98de..bccc71b132 100644
--- a/src/osx/utils_osx.cpp
+++ b/src/osx/utils_osx.cpp
@@ -212,7 +212,7 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace()
 #if wxOSX_USE_IPHONE
         genericRGBColorSpace.reset( CGColorSpaceCreateDeviceRGB() );
 #else
-        genericRGBColorSpace.reset( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ) );
+        genericRGBColorSpace.reset( CGColorSpaceCreateWithName( kCGColorSpaceSRGB ) );
 #endif
     }
 

From 2ab430965c457de680d3a3ea37445b7dfa0090e0 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 30 Jun 2018 16:57:57 +0200
Subject: [PATCH 693/916] Fixing wxGLCanvas under 10.14, preparing for layer
 based drawing

see https://github.com/wxWidgets/wxWidgets/pull/846 , thanks to dkulp
---
 include/wx/osx/glcanvas.h                     |   2 -
 .../minimal_iphone.xcodeproj/project.pbxproj  | 265 ++++++++++++++++++
 src/osx/carbon/dcclient.cpp                   |   1 -
 src/osx/cocoa/glcanvas.mm                     |  27 +-
 src/osx/cocoa/window.mm                       | 136 +++++----
 src/osx/glcanvas_osx.cpp                      |   5 -
 6 files changed, 364 insertions(+), 72 deletions(-)
 create mode 100644 samples/aui/minimal_iphone.xcodeproj/project.pbxproj

diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h
index dda9ab2ed4..e1948c2f70 100644
--- a/include/wx/osx/glcanvas.h
+++ b/include/wx/osx/glcanvas.h
@@ -158,7 +158,6 @@ public:
     // implementation-only from now on
 
 protected:
-#if wxOSX_USE_IPHONE
     bool DoCreate(wxWindow *parent,
                               wxWindowID id,
                               const wxPoint& pos,
@@ -166,7 +165,6 @@ protected:
                               long style,
                   const wxString& name);
 
-#endif
     WXGLPixelFormat m_glFormat;
     wxGLAttributes m_GLAttrs;
 
diff --git a/samples/aui/minimal_iphone.xcodeproj/project.pbxproj b/samples/aui/minimal_iphone.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..d58c9ee111
--- /dev/null
+++ b/samples/aui/minimal_iphone.xcodeproj/project.pbxproj
@@ -0,0 +1,265 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
+		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
+		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
+		407A98E11370835D00E92356 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 407A98E01370835D00E92356 /* minimal.cpp */; };
+		407EE18312F04CD500D0F171 /* libwx_osx_iphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */; };
+		407EE18A12F04CF900D0F171 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 407EE18912F04CF900D0F171 /* AudioToolbox.framework */; };
+		40803704158A894A00EC5CA7 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40803703158A894A00EC5CA7 /* CoreText.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		4074F5E812ED969C00693A3F /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = B4DEA098A05736AE94F01926;
+			remoteInfo = static;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		1D6058910D05DD3D006BFB54 /* minimal_iphone.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal_iphone.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxiphone.xcodeproj; path = ../../build/osx/wxiPhone.xcodeproj; sourceTree = SOURCE_ROOT; };
+		404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxiphone.xcconfig; path = ../../build/osx/wxiphone.xcconfig; sourceTree = SOURCE_ROOT; };
+		407A98E01370835D00E92356 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = "<group>"; };
+		407A98FA137084FB00E92356 /* Info_iphone.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info_iphone.plist; sourceTree = "<group>"; };
+		407EE18912F04CF900D0F171 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		40803703158A894A00EC5CA7 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
+		409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxdebug.xcconfig; path = ../../build/osx/wxdebug.xcconfig; sourceTree = SOURCE_ROOT; };
+		409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = wxrelease.xcconfig; path = ../../build/osx/wxrelease.xcconfig; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
+				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
+				288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
+				407EE18312F04CD500D0F171 /* libwx_osx_iphone.a in Frameworks */,
+				407EE18A12F04CF900D0F171 /* AudioToolbox.framework in Frameworks */,
+				40803704158A894A00EC5CA7 /* CoreText.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				1D6058910D05DD3D006BFB54 /* minimal_iphone.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
+			isa = PBXGroup;
+			children = (
+				407A98FA137084FB00E92356 /* Info_iphone.plist */,
+				404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */,
+				409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */,
+				409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */,
+				404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */,
+				404BECD110EBDC6F0080E2B8 /* src */,
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = CustomTemplate;
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
+				1D30AB110D05D00D00671497 /* Foundation.framework */,
+				288765FC0DF74451002DB57D /* CoreGraphics.framework */,
+				407EE18912F04CF900D0F171 /* AudioToolbox.framework */,
+				40803703158A894A00EC5CA7 /* CoreText.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		404BECC610EBDB420080E2B8 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		404BECD110EBDC6F0080E2B8 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				407A98E01370835D00E92356 /* minimal.cpp */,
+			);
+			name = src;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		1D6058900D05DD3D006BFB54 /* static */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "static" */;
+			buildPhases = (
+				1D60588D0D05DD3D006BFB54 /* Resources */,
+				1D60588E0D05DD3D006BFB54 /* Sources */,
+				1D60588F0D05DD3D006BFB54 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = static;
+			productName = minimal_iphone;
+			productReference = 1D6058910D05DD3D006BFB54 /* minimal_iphone.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_iphone" */;
+			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 404BECC610EBDB420080E2B8 /* Products */;
+					ProjectRef = 404BECC510EBDB420080E2B8 /* wxiphone.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				1D6058900D05DD3D006BFB54 /* static */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		4074F5E912ED969C00693A3F /* libwx_osx_iphone.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libwx_osx_iphone.a;
+			remoteRef = 4074F5E812ED969C00693A3F /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXResourcesBuildPhase section */
+		1D60588D0D05DD3D006BFB54 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		1D60588E0D05DD3D006BFB54 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				407A98E11370835D00E92356 /* minimal.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		1D6058940D05DD3E006BFB54 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
+			buildSettings = {
+				OTHER_LDFLAGS = "";
+				PRODUCT_NAME = minimal_iphone;
+			};
+			name = Debug;
+		};
+		1D6058950D05DD3E006BFB54 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 404BEE0510EC7BF20080E2B8 /* wxiphone.xcconfig */;
+			buildSettings = {
+				PRODUCT_NAME = minimal_iphone;
+			};
+			name = Release;
+		};
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 409CBDC913B13C7100AB1F39 /* wxdebug.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				INFOPLIST_FILE = Info_iphone.plist;
+				PROVISIONING_PROFILE = "";
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Debug;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 409CBDCA13B13C7100AB1F39 /* wxrelease.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				INFOPLIST_FILE = Info_iphone.plist;
+				PROVISIONING_PROFILE = "";
+				WXROOT = "$(PROJECT_DIR)/../..";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "static" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1D6058940D05DD3E006BFB54 /* Debug */,
+				1D6058950D05DD3E006BFB54 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "minimal_iphone" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4F08A954540054247B /* Debug */,
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}
diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index 807ac1ace1..c05a31f9d7 100644
--- a/src/osx/carbon/dcclient.cpp
+++ b/src/osx/carbon/dcclient.cpp
@@ -152,7 +152,6 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
 wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
     wxWindowDCImpl( owner, window )
 {
-    wxASSERT_MSG( window->MacGetCGContextRef() != NULL, wxT("using wxPaintDC without being in a native paint event") );
     wxPoint origin = window->GetClientAreaOrigin() ;
     m_window->GetClientSize( &m_width , &m_height);
     SetDeviceOrigin( origin.x, origin.y );
diff --git a/src/osx/cocoa/glcanvas.mm b/src/osx/cocoa/glcanvas.mm
index 7afbc6c39e..cc889507e7 100644
--- a/src/osx/cocoa/glcanvas.mm
+++ b/src/osx/cocoa/glcanvas.mm
@@ -112,9 +112,8 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *GLAttrs,
     return [[NSOpenGLPixelFormat alloc] initWithAttributes:(NSOpenGLPixelFormatAttribute*) attribs];
 }
 
-@interface wxNSCustomOpenGLView : NSView
+@interface wxNSCustomOpenGLView : NSOpenGLView
 {
-    NSOpenGLContext* context;
 }
 
 @end
@@ -138,6 +137,30 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *GLAttrs,
 
 @end
 
+bool wxGLCanvas::DoCreate(wxWindow *parent,
+                          wxWindowID id,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          long style,
+                          const wxString& name)
+{
+
+    DontCreatePeer();
+    
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return false;
+
+    
+    NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
+    wxNSCustomOpenGLView* v = [[wxNSCustomOpenGLView alloc] initWithFrame:r];
+    
+    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( this, v, false, true );
+    SetPeer(c);
+    MacPostControlCreate(pos, size) ;
+    return true;
+}
+
+
 wxGLCanvas::~wxGLCanvas()
 {
     if ( m_glFormat )
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index ea145aafb3..c33cd56dba 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -2291,84 +2291,96 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd))
     wxpeer->GetUpdateRegion() = updateRgn;
 
     // setting up the drawing context
-    
+    // note that starting from 10.14 this may be NULL in certain views
     CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
-    CGContextSaveGState( context );
-    
-#if OSX_DEBUG_DRAWING
-    CGContextBeginPath( context );
-    CGContextMoveToPoint(context, 0, 0);
-    NSRect bounds = [slf bounds];
-    CGContextAddLineToPoint(context, 10, 0);
-    CGContextMoveToPoint(context, 0, 0);
-    CGContextAddLineToPoint(context, 0, 10);
-    CGContextMoveToPoint(context, bounds.size.width, bounds.size.height);
-    CGContextAddLineToPoint(context, bounds.size.width, bounds.size.height-10);
-    CGContextMoveToPoint(context, bounds.size.width, bounds.size.height);
-    CGContextAddLineToPoint(context, bounds.size.width-10, bounds.size.height);
-    CGContextClosePath( context );
-    CGContextStrokePath(context);
-#endif
-    
-    if ( ![slf isFlipped] )
-    {
-        CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
-        CGContextScaleCTM( context, 1, -1 );
-    }
-    
     wxpeer->MacSetCGContextRef( context );
+    if ( context != NULL )
+    {
+        CGContextSaveGState( context );
+        
+#if OSX_DEBUG_DRAWING
+        CGContextBeginPath( context );
+        CGContextMoveToPoint(context, 0, 0);
+        NSRect bounds = [slf bounds];
+        CGContextAddLineToPoint(context, 10, 0);
+        CGContextMoveToPoint(context, 0, 0);
+        CGContextAddLineToPoint(context, 0, 10);
+        CGContextMoveToPoint(context, bounds.size.width, bounds.size.height);
+        CGContextAddLineToPoint(context, bounds.size.width, bounds.size.height-10);
+        CGContextMoveToPoint(context, bounds.size.width, bounds.size.height);
+        CGContextAddLineToPoint(context, bounds.size.width-10, bounds.size.height);
+        CGContextClosePath( context );
+        CGContextStrokePath(context);
+#endif
+        
+        if ( ![slf isFlipped] )
+        {
+            CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
+            CGContextScaleCTM( context, 1, -1 );
+        }
+    }
 
     bool handled = wxpeer->MacDoRedraw( 0 );
-    CGContextRestoreGState( context );
-
-    CGContextSaveGState( context );
+    if ( context != NULL )
+    {
+        CGContextRestoreGState( context );
+        CGContextSaveGState( context );
+    }
+    
     if ( !handled )
     {
         // call super
         SEL _cmd = @selector(drawRect:);
         wxOSX_DrawRectHandlerPtr superimpl = (wxOSX_DrawRectHandlerPtr) [[slf superclass] instanceMethodForSelector:_cmd];
         superimpl(slf, _cmd, *(NSRect*)rect);
-        CGContextRestoreGState( context );
-        CGContextSaveGState( context );
-    }
-    // as we called restore above, we have to flip again if necessary
-    if ( ![slf isFlipped] )
-    {
-        CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
-        CGContextScaleCTM( context, 1, -1 );
-    }
-
-    if ( isTopLevel )
-    {
-        // We also need to explicitly draw the part of the top level window
-        // outside of its region with transparent colour to ensure that it is
-        // really transparent.
-        if ( clearRgn.IsOk() )
+        if ( context != NULL )
         {
-            wxMacCGContextStateSaver saveState(context);
-            wxWindowDC dc(wxpeer);
-            dc.SetBackground(wxBrush(wxTransparentColour));
-            dc.SetDeviceClippingRegion(clearRgn);
-            dc.Clear();
+            CGContextRestoreGState( context );
+            CGContextSaveGState( context );
         }
-
+    }
+    
+    if ( context != NULL )
+    {
+        // as we called restore above, we have to flip again if necessary
+        if ( ![slf isFlipped] )
+        {
+            CGContextTranslateCTM( context, 0,  [m_osxView bounds].size.height );
+            CGContextScaleCTM( context, 1, -1 );
+        }
+        
+        if ( isTopLevel )
+        {
+            // We also need to explicitly draw the part of the top level window
+            // outside of its region with transparent colour to ensure that it is
+            // really transparent.
+            if ( clearRgn.IsOk() )
+            {
+                wxMacCGContextStateSaver saveState(context);
+                wxWindowDC dc(wxpeer);
+                dc.SetBackground(wxBrush(wxTransparentColour));
+                dc.SetDeviceClippingRegion(clearRgn);
+                dc.Clear();
+            }
+            
 #if wxUSE_GRAPHICS_CONTEXT
-        // If the window shape is defined by a path, stroke the path to show
-        // the window border.
-        const wxGraphicsPath& path = tlwParent->GetShapePath();
-        if ( !path.IsNull() )
-        {
-            CGContextSetLineWidth(context, 1);
-            CGContextSetStrokeColorWithColor(context, wxLIGHT_GREY->GetCGColor());
-            CGContextAddPath(context, (CGPathRef) path.GetNativePath());
-            CGContextStrokePath(context);
-        }
+            // If the window shape is defined by a path, stroke the path to show
+            // the window border.
+            const wxGraphicsPath& path = tlwParent->GetShapePath();
+            if ( !path.IsNull() )
+            {
+                CGContextSetLineWidth(context, 1);
+                CGContextSetStrokeColorWithColor(context, wxLIGHT_GREY->GetCGColor());
+                CGContextAddPath(context, (CGPathRef) path.GetNativePath());
+                CGContextStrokePath(context);
+            }
 #endif // wxUSE_GRAPHICS_CONTEXT
+        }
+        
+        wxpeer->MacPaintChildrenBorders();
+        CGContextRestoreGState( context );
     }
-
-    wxpeer->MacPaintChildrenBorders();
     wxpeer->MacSetCGContextRef( NULL );
-    CGContextRestoreGState( context );
 }
 
 void wxWidgetCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender))
diff --git a/src/osx/glcanvas_osx.cpp b/src/osx/glcanvas_osx.cpp
index 66d4c3cd77..71d7dd02cf 100644
--- a/src/osx/glcanvas_osx.cpp
+++ b/src/osx/glcanvas_osx.cpp
@@ -501,13 +501,8 @@ bool wxGLCanvas::Create(wxWindow *parent,
     // Make a copy of attributes. Will use at wxGLContext ctor
     m_GLAttrs = dispAttrs;
 
-#if wxOSX_USE_IPHONE
     if ( !wxGLCanvas::DoCreate(parent,id,pos,size,style,name) )
         return false;
-#else
-    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
-        return false;
-#endif
     
     return true;
 }

From c369c792a355ec1e422bf6f423131af1444a8809 Mon Sep 17 00:00:00 2001
From: ikamakj <ikamakj@users.sourceforge.net>
Date: Sat, 30 Jun 2018 23:05:57 +0200
Subject: [PATCH 694/916] Fix selection event generation in wxMac wxListBox

Prevents deselecting the selected item in single-selection listbox.

Also generate correct events in the multi-selection case by reusing the
existing wxListBoxBase::CalcAndSendEvent() method.

Closes #15603.
---
 include/wx/osx/listbox.h |  6 ++++++
 src/osx/cocoa/listbox.mm | 40 +++++++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index e96b186d7a..f716bf1ae8 100644
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -125,6 +125,12 @@ public:
     bool MacGetBlockEvents() const { return m_blockEvents; }
 
     virtual void HandleLineEvent( unsigned int n, bool doubleClick );
+
+    // These are called by wxNSTableView
+    using wxListBoxBase::DoChangeSingleSelection;
+    using wxListBoxBase::CalcAndSendEvent;
+    int GetOldSelection() const { return m_oldSelections.empty() ? wxNOT_FOUND : m_oldSelections[0]; }
+
 protected:
     // callback for derived classes which may have to insert additional data
     // at a certain line - which cannot be predetermined for sorted list data
diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index 2078be5035..402de57c04 100644
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -297,24 +297,34 @@ protected:
 
     int row = [self selectedRow];
 
-    if (row == -1) 
-    {
-        // no row selected
-    } 
-    else 
-    {
-        wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
-        wxListBox *list = static_cast<wxListBox*> ( impl->GetWXPeer());
-        wxCHECK_RET( list != NULL , wxT("Listbox expected"));
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    wxListBox *list = static_cast<wxListBox*> ( impl->GetWXPeer());
+    wxCHECK_RET( list != NULL , wxT("Listbox expected"));
 
-        if ((row < 0) || (row > (int) list->GetCount()))  // OS X can select an item below the last item
-            return;
-
-        if ( !list->MacGetBlockEvents() )
-            list->HandleLineEvent( row, false );
+    // Correct notification events for multiselection list, like in Carbon version
+    if (list->HasMultipleSelection() && !list->MacGetBlockEvents())
+    {
+        list->CalcAndSendEvent();
+        return;
     }
 
-} 
+    if ( !list->MacGetBlockEvents() )
+    {
+        // OS X can select an item below the last item. In that case keep the old selection because
+        // in wxWidgets API there is no notification event for removing the selection from a single-selection list box.
+        // Otherwise call DoChangeSingleSelection so GetOldSelection() will return the correct value if row < 0 later.
+        if ((row < 0) || (row > (int) list->GetCount()))
+        {
+            int oldsel = list->GetOldSelection();
+            if (oldsel >= 0)
+                list->SetSelection(oldsel);
+            return;
+        }
+        if ( !list->DoChangeSingleSelection(row) )
+            return ;
+        list->HandleLineEvent( row, false );
+    }
+}
 
 - (void)setFont:(NSFont *)aFont
 {

From 0084fb94beab7e45caeb2a069a5b678c686758f1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Jun 2018 23:09:06 +0200
Subject: [PATCH 695/916] Use wxDynamicCast() instead of static_cast<>

This is safer as it really checks if the pointer is of the correct type.
---
 src/osx/cocoa/listbox.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index 402de57c04..7e0b32cd7e 100644
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -298,7 +298,7 @@ protected:
     int row = [self selectedRow];
 
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
-    wxListBox *list = static_cast<wxListBox*> ( impl->GetWXPeer());
+    wxListBox* const list = wxDynamicCast(impl->GetWXPeer(), wxListBox);
     wxCHECK_RET( list != NULL , wxT("Listbox expected"));
 
     // Correct notification events for multiselection list, like in Carbon version

From 1eee7a8a3c414c6b9dda291f37f611c4d2e2aaf4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Jun 2018 23:10:02 +0200
Subject: [PATCH 696/916] Slightly improve the assertion failure message

Also remove the unnecessary wxT().
---
 src/osx/cocoa/listbox.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index 7e0b32cd7e..1fe0d48499 100644
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -299,7 +299,7 @@ protected:
 
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
     wxListBox* const list = wxDynamicCast(impl->GetWXPeer(), wxListBox);
-    wxCHECK_RET( list != NULL , wxT("Listbox expected"));
+    wxCHECK_RET( list != NULL , "Associated control should be a wxListBox" );
 
     // Correct notification events for multiselection list, like in Carbon version
     if (list->HasMultipleSelection() && !list->MacGetBlockEvents())

From dde6f662fcf537e6f3efcb309446ce3db9aba32f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Jun 2018 23:13:33 +0200
Subject: [PATCH 697/916] Move wxListBox selection event generation to
 wxListBox itself

This allows to avoid making DoChangeSingleSelection() and
CalcAndSendEvent() public.

No real changes, this is just a refactoring.
---
 include/wx/osx/listbox.h |  6 ++----
 src/osx/cocoa/listbox.mm | 24 +-----------------------
 src/osx/listbox_osx.cpp  | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index f716bf1ae8..2b84ad463c 100644
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -126,10 +126,8 @@ public:
 
     virtual void HandleLineEvent( unsigned int n, bool doubleClick );
 
-    // These are called by wxNSTableView
-    using wxListBoxBase::DoChangeSingleSelection;
-    using wxListBoxBase::CalcAndSendEvent;
-    int GetOldSelection() const { return m_oldSelections.empty() ? wxNOT_FOUND : m_oldSelections[0]; }
+    // This is called by wxNSTableView
+    void MacHandleSelectionChange(int row);
 
 protected:
     // callback for derived classes which may have to insert additional data
diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index 1fe0d48499..d8847e5ae3 100644
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -301,29 +301,7 @@ protected:
     wxListBox* const list = wxDynamicCast(impl->GetWXPeer(), wxListBox);
     wxCHECK_RET( list != NULL , "Associated control should be a wxListBox" );
 
-    // Correct notification events for multiselection list, like in Carbon version
-    if (list->HasMultipleSelection() && !list->MacGetBlockEvents())
-    {
-        list->CalcAndSendEvent();
-        return;
-    }
-
-    if ( !list->MacGetBlockEvents() )
-    {
-        // OS X can select an item below the last item. In that case keep the old selection because
-        // in wxWidgets API there is no notification event for removing the selection from a single-selection list box.
-        // Otherwise call DoChangeSingleSelection so GetOldSelection() will return the correct value if row < 0 later.
-        if ((row < 0) || (row > (int) list->GetCount()))
-        {
-            int oldsel = list->GetOldSelection();
-            if (oldsel >= 0)
-                list->SetSelection(oldsel);
-            return;
-        }
-        if ( !list->DoChangeSingleSelection(row) )
-            return ;
-        list->HandleLineEvent( row, false );
-    }
+    list->MacHandleSelectionChange(row);
 }
 
 - (void)setFont:(NSFont *)aFont
diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index f824848ec0..75b1ad9750 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -420,6 +420,36 @@ void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
     HandleWindowEvent(event);
 }
 
+void wxListBox::MacHandleSelectionChange(int row)
+{
+    // Correct notification events for multiselection list, like in Carbon version
+    if ( HasMultipleSelection() && !MacGetBlockEvents() )
+    {
+        CalcAndSendEvent();
+        return;
+    }
+
+    if ( !MacGetBlockEvents() )
+    {
+        // OS X can select an item below the last item. In that case keep the old selection because
+        // in wxWidgets API there is no notification event for removing the selection from a single-selection list box.
+        // Otherwise call DoChangeSingleSelection so GetOldSelection() will return the correct value if row < 0 later.
+        if ((row < 0) || (row > (int) GetCount()))
+        {
+            if ( !m_oldSelections.empty() )
+            {
+                const int oldsel = m_oldSelections[0];
+                if (oldsel >= 0)
+                    SetSelection(oldsel);
+            }
+            return;
+        }
+        if ( !DoChangeSingleSelection(row) )
+            return ;
+        HandleLineEvent( row, false );
+    }
+}
+
 //
 // common list cell value operations
 //

From eadcd93bf9326dcd61e8c5586d4392715c8f4c3e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Jun 2018 23:14:36 +0200
Subject: [PATCH 698/916] Remove wxListBox::MacGetBlockEvents()

Just test m_blockEvents directly, there doesn't seem to be any gain in
using an accessor here.

Also test it only once instead of doing it twice in
MacHandleSelectionChange().
---
 include/wx/osx/listbox.h |  2 --
 src/osx/listbox_osx.cpp  | 32 ++++++++++++++++----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index 2b84ad463c..2882c2eff9 100644
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -122,8 +122,6 @@ public:
 
     wxListWidgetImpl* GetListPeer() const;
 
-    bool MacGetBlockEvents() const { return m_blockEvents; }
-
     virtual void HandleLineEvent( unsigned int n, bool doubleClick );
 
     // This is called by wxNSTableView
diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 75b1ad9750..51cd293ca6 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -422,32 +422,32 @@ void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 
 void wxListBox::MacHandleSelectionChange(int row)
 {
+    if ( m_blockEvents )
+        return;
+
     // Correct notification events for multiselection list, like in Carbon version
-    if ( HasMultipleSelection() && !MacGetBlockEvents() )
+    if ( HasMultipleSelection() )
     {
         CalcAndSendEvent();
         return;
     }
 
-    if ( !MacGetBlockEvents() )
+    // OS X can select an item below the last item. In that case keep the old selection because
+    // in wxWidgets API there is no notification event for removing the selection from a single-selection list box.
+    // Otherwise call DoChangeSingleSelection so GetOldSelection() will return the correct value if row < 0 later.
+    if ((row < 0) || (row > (int) GetCount()))
     {
-        // OS X can select an item below the last item. In that case keep the old selection because
-        // in wxWidgets API there is no notification event for removing the selection from a single-selection list box.
-        // Otherwise call DoChangeSingleSelection so GetOldSelection() will return the correct value if row < 0 later.
-        if ((row < 0) || (row > (int) GetCount()))
+        if ( !m_oldSelections.empty() )
         {
-            if ( !m_oldSelections.empty() )
-            {
-                const int oldsel = m_oldSelections[0];
-                if (oldsel >= 0)
-                    SetSelection(oldsel);
-            }
-            return;
+            const int oldsel = m_oldSelections[0];
+            if (oldsel >= 0)
+                SetSelection(oldsel);
         }
-        if ( !DoChangeSingleSelection(row) )
-            return ;
-        HandleLineEvent( row, false );
+        return;
     }
+    if ( !DoChangeSingleSelection(row) )
+        return ;
+    HandleLineEvent( row, false );
 }
 
 //

From f51cb52004d0d72fe253712867363163b0f2faaf Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Jun 2018 23:17:03 +0200
Subject: [PATCH 699/916] Reformat comments and code in
 MacHandleSelectionChange()

No real changes, just trying to make the code more clear.
---
 src/osx/listbox_osx.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 51cd293ca6..01b6ef7f0d 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -425,17 +425,21 @@ void wxListBox::MacHandleSelectionChange(int row)
     if ( m_blockEvents )
         return;
 
-    // Correct notification events for multiselection list, like in Carbon version
+    // Correct notification events for multiselection list.
     if ( HasMultipleSelection() )
     {
         CalcAndSendEvent();
         return;
     }
 
-    // OS X can select an item below the last item. In that case keep the old selection because
-    // in wxWidgets API there is no notification event for removing the selection from a single-selection list box.
-    // Otherwise call DoChangeSingleSelection so GetOldSelection() will return the correct value if row < 0 later.
-    if ((row < 0) || (row > (int) GetCount()))
+    // OS X can select an item below the last item. In that case keep the old
+    // selection because in wxWidgets API there is no notification event for
+    // removing the selection from a single-selection list box.
+    //
+    // Otherwise call DoChangeSingleSelection so GetOldSelection() will return
+    // the correct value if row < 0 later.
+    const int count = static_cast<int>(GetCount());
+    if ( row < 0 || row > count )
     {
         if ( !m_oldSelections.empty() )
         {
@@ -443,11 +447,11 @@ void wxListBox::MacHandleSelectionChange(int row)
             if (oldsel >= 0)
                 SetSelection(oldsel);
         }
-        return;
     }
-    if ( !DoChangeSingleSelection(row) )
-        return ;
-    HandleLineEvent( row, false );
+    else if ( DoChangeSingleSelection(row) )
+    {
+        HandleLineEvent( row, false );
+    }
 }
 
 //

From 30c798b70a96636f865b38d896787342150cec3b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Jun 2018 23:17:37 +0200
Subject: [PATCH 700/916] Fix row validity check in MacHandleSelectionChange()

Valid indices must be in [0, count[ half-open interval.
---
 src/osx/listbox_osx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 01b6ef7f0d..b00514c94f 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -439,7 +439,7 @@ void wxListBox::MacHandleSelectionChange(int row)
     // Otherwise call DoChangeSingleSelection so GetOldSelection() will return
     // the correct value if row < 0 later.
     const int count = static_cast<int>(GetCount());
-    if ( row < 0 || row > count )
+    if ( row < 0 || row >= count )
     {
         if ( !m_oldSelections.empty() )
         {

From c53524a59ba39871269dfacbcee2187ab8776d69 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Jun 2018 23:18:28 +0200
Subject: [PATCH 701/916] Also check the old selection index for validity

It's not totally clear if the old selection is always guaranteed to be
valid so prefer to check it explicitly.
---
 src/osx/listbox_osx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index b00514c94f..ff41b53a37 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -444,7 +444,7 @@ void wxListBox::MacHandleSelectionChange(int row)
         if ( !m_oldSelections.empty() )
         {
             const int oldsel = m_oldSelections[0];
-            if (oldsel >= 0)
+            if ( oldsel >= 0 && oldsel < count )
                 SetSelection(oldsel);
         }
     }

From fc53007ab4996d0fc657b5c5f1a0b944b0caa641 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 2 Jul 2018 20:08:29 +0200
Subject: [PATCH 702/916] Add unit test for current point of wxGraphicsPath

Verify that last point is properly positioned after the operations
on wxGraphicsPath.

See #18111.
---
 tests/Makefile.in              |   4 +
 tests/graphics/graphpath.cpp   | 401 +++++++++++++++++++++++++++++++++
 tests/makefile.bcc             |   4 +
 tests/makefile.gcc             |   4 +
 tests/makefile.vc              |   4 +
 tests/test.bkl                 |   1 +
 tests/test_gui.vcxproj         |   1 +
 tests/test_gui.vcxproj.filters |   3 +
 tests/test_vc7_test_gui.vcproj |   3 +
 tests/test_vc8_test_gui.vcproj |   4 +
 tests/test_vc9_test_gui.vcproj |   4 +
 11 files changed, 433 insertions(+)
 create mode 100644 tests/graphics/graphpath.cpp

diff --git a/tests/Makefile.in b/tests/Makefile.in
index bc37e442f9..951b321f93 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -183,6 +183,7 @@ TEST_GUI_OBJECTS =  \
 	test_gui_boundingbox.o \
 	test_gui_clippingbox.o \
 	test_gui_graphmatrix.o \
+	test_gui_graphpath.o \
 	test_gui_config.o \
 	test_gui_bitmapcomboboxtest.o \
 	test_gui_bitmaptogglebuttontest.o \
@@ -818,6 +819,9 @@ test_gui_clippingbox.o: $(srcdir)/graphics/clippingbox.cpp $(TEST_GUI_ODEP)
 test_gui_graphmatrix.o: $(srcdir)/graphics/graphmatrix.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/graphmatrix.cpp
 
+test_gui_graphpath.o: $(srcdir)/graphics/graphpath.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/graphics/graphpath.cpp
+
 test_gui_config.o: $(srcdir)/config/config.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/config/config.cpp
 
diff --git a/tests/graphics/graphpath.cpp b/tests/graphics/graphpath.cpp
new file mode 100644
index 0000000000..7cd9a2a999
--- /dev/null
+++ b/tests/graphics/graphpath.cpp
@@ -0,0 +1,401 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/graphics/grsppsth.cpp
+// Purpose:     graphics path unit tests
+// Author:      Artur Wieczorek
+// Created:     2018-07-01
+// Copyright:   (c) 2018 wxWidgets development team
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_GRAPHICS_CONTEXT
+
+#include "wx/bitmap.h"
+#include "wx/dcmemory.h"
+#include "wx/dcgraph.h"
+#include "wx/scopedptr.h"
+
+static void DoAllTests(wxGraphicsContext* gc);
+
+// For MSW we have individual test cases for each graphics renderer
+// so we don't need to execute tests with default renderer.
+#ifndef __WXMSW__
+
+TEST_CASE("GraphicsPathTestCase", "[path]")
+{
+    wxBitmap bmp(500, 500);
+    wxMemoryDC mdc(bmp);
+    wxScopedPtr<wxGraphicsContext> gc(wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(mdc));
+    REQUIRE(gc);
+    DoAllTests(gc.get());
+}
+
+#else
+
+#if wxUSE_GRAPHICS_GDIPLUS
+TEST_CASE("GraphicsPathTestCaseGDIPlus", "[path][gdi+]")
+{
+    wxBitmap bmp(500, 500);
+    wxMemoryDC mdc(bmp);
+    wxScopedPtr<wxGraphicsContext> gc(wxGraphicsRenderer::GetGDIPlusRenderer()->CreateContext(mdc));
+    REQUIRE(gc);
+    DoAllTests(gc.get());
+}
+#endif // wxUSE_GRAPHICS_GDIPLUS
+
+#if wxUSE_GRAPHICS_DIRECT2D
+TEST_CASE("GraphicsPathTestCaseDirect2D", "[path][d2d]")
+{
+    wxBitmap bmp(500, 500);
+    wxMemoryDC mdc(bmp);
+    wxScopedPtr<wxGraphicsContext> gc(wxGraphicsRenderer::GetDirect2DRenderer()->CreateContext(mdc));
+    REQUIRE(gc);
+    DoAllTests(gc.get());
+}
+#endif // wxUSE_GRAPHICS_DIRECT2D
+
+#endif // __WXMSW__ / !__WXMSW__
+
+#if wxUSE_CAIRO
+TEST_CASE("GraphicsPathTestCaseCairo", "[path][cairo]")
+{
+    wxBitmap bmp(500, 500);
+    wxMemoryDC mdc(bmp);
+    wxScopedPtr<wxGraphicsContext> gc(wxGraphicsRenderer::GetCairoRenderer()->CreateContext(mdc));
+    REQUIRE(gc);
+    DoAllTests(gc.get());
+}
+#endif // wxUSE_CAIRO
+
+#define WX_CHECK_POINT(p1, p2, tolerance)      \
+    CHECK(fabs(p1.m_x - p2.m_x) <= tolerance); \
+    CHECK(fabs(p1.m_y - p2.m_y) <= tolerance)
+
+static void TestCurrentPoint(wxGraphicsContext* gc)
+{
+    // No current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        // Should return (0, 0) if current point is not yet set.
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(0, 0), 0);
+    }
+    // MoveToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        wxPoint2DDouble pt(27, 35);
+        path.MoveToPoint(pt);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, pt, 1E-3);
+    }
+    // AddLineToPoint - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        wxPoint2DDouble pt(27, 35);
+        path.AddLineToPoint(pt);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, pt, 1E-3);
+    }
+    // AddLineToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(10, 18);
+        wxPoint2DDouble pt(37, 45);
+        path.AddLineToPoint(pt);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, pt, 1E-3);
+    }
+    // AddArc - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble r = 40;
+        path.AddArc(x, y, r, 0, M_PI/2, true);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x, y + r), 1E-3);
+    }
+    // AddArc
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(20, 38);
+        const wxDouble x = 200;
+        const wxDouble y = 50;
+        const wxDouble r = 40;
+        path.AddArc(x, y, r, 0, M_PI / 2, true);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x, y + r), 1E-3);
+    }
+    // AddArcToPoint - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x1 = 80;
+        const wxDouble y1 = 80;
+        const wxDouble x2 = -30;
+        const wxDouble y2 = y1;
+        const wxDouble r = 20;
+        wxASSERT(x1 == y1 && y2 == y1); // alpha = 45 deg
+        double d = r / tan(45 / 180.0 * M_PI / 2.0);
+        path.AddArcToPoint(x1, y1, x2, y2, r);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x1 - d, y2), 1E-3);
+    }
+    // AddArcToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 20;
+        const wxDouble y0 = 20;
+        path.MoveToPoint(x0, y0);
+        const wxDouble x1 = 80;
+        const wxDouble y1 = 80;
+        const wxDouble x2 = 140;
+        const wxDouble y2 = y1;
+        const wxDouble r = 20;
+        wxASSERT(x0 == y0 && x1 == y1 && y2 == y1); // alpha = 135 deg
+        double d = r / tan(135 / 180.0 * M_PI / 2.0);
+        path.AddArcToPoint(x1, y1, x2, y2, r);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x1 + d, y2), 1E-3);
+    }
+    // AddCurveToPoint - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x1 = 102;
+        const wxDouble y1 = 230;
+        const wxDouble x2 = 153;
+        const wxDouble y2 = 25;
+        const wxDouble x3 = 230;
+        const wxDouble y3 = 128;
+        path.AddCurveToPoint(x1, y1, x2, y2, x3, y3);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x3, y3), 1E-3);
+    }
+    // AddCurveToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 25;
+        const wxDouble y0 = 128;
+        path.MoveToPoint(x0, y0);
+        const wxDouble x1 = 102;
+        const wxDouble y1 = 230;
+        const wxDouble x2 = 153;
+        const wxDouble y2 = 25;
+        const wxDouble x3 = 230;
+        const wxDouble y3 = 128;
+        path.AddCurveToPoint(x1, y1, x2, y2, x3, y3);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x3, y3), 1E-3);
+    }
+    // AddQuadCurveToPoint - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x1 = 200;
+        const wxDouble y1 = 200;
+        const wxDouble x2 = 300;
+        const wxDouble y2 = 100;
+        path.AddQuadCurveToPoint(x1, y1, x2, y2);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x2, y2), 1E-3);
+    }
+    // AddQuadCurveToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 20;
+        const wxDouble y0 = 100;
+        path.MoveToPoint(x0, y0);
+        const wxDouble x1 = 200;
+        const wxDouble y1 = 200;
+        const wxDouble x2 = 300;
+        const wxDouble y2 = 100;
+        path.AddQuadCurveToPoint(x1, y1, x2, y2);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x2, y2), 1E-3);
+    }
+    // AddCircle - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble r = 30;
+        path.AddCircle(x, y, r);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x + r, y), 1E-3);
+    }
+    // AddCircle
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 80);
+        const wxDouble x = 100;
+        const wxDouble y = 140;
+        const wxDouble r = 40;
+        path.AddCircle(x, y, r);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x + r, y), 1E-3);
+    }
+    // AddEllipse - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddEllipse(x, y, w, h);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x + w, y + h / 2), 1E-3);
+    }
+    // AddEllipse
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddEllipse(x, y, w, h);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x + w, y + h / 2), 1E-3);
+    }
+    // AddRectangle - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        path.AddRectangle(x, y, 40, 20);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x, y), 1E-3);
+    }
+    // AddRectangle
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        path.AddRectangle(x, y, 50, 30);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x, y), 1E-3);
+    }
+    // AddRoundedRectangle - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddRoundedRectangle(x, y, w, h, 5);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x + w, y + h / 2), 1E-3);
+    }
+    // AddRoundedRectangle - no current point, radius = 0
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        path.AddRoundedRectangle(x, y, 40, 20, 0); // Should behave like AddRectangle
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x, y), 1E-3);
+    }
+    // AddRoundedRectangle
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddRoundedRectangle(x, y, w, h, 5);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x + w, y + h / 2), 1E-3);
+    }
+    // AddRoundedRectangle - radius = 0
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 50;
+        const wxDouble y0 = 60;
+        path.MoveToPoint(x0, y0);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddRoundedRectangle(x, y, w, h, 0); // Should behave like AddRectangle
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x, y), 1E-3);
+    }
+    // CloseSubpath - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 50;
+        const wxDouble y0 = 80;
+        path.AddLineToPoint(x0, y0);
+        path.AddArcToPoint(100, 160, 50, 200, 30);
+        path.CloseSubpath();
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x0, y0), 1E-3);
+    }
+    // CloseSubpath
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 10;
+        const wxDouble y0 = 20;
+        path.MoveToPoint(x0, y0);
+        path.AddLineToPoint(50, 80);
+        path.AddArcToPoint(100, 160, 50, 200, 30);
+        path.CloseSubpath();
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, wxPoint2DDouble(x0, y0), 1E-3);
+    }
+    // AddPath - no current point
+    {
+        // Path to be added
+        wxGraphicsPath path2 = gc->CreatePath();
+        path2.AddArcToPoint(100, 160, 50, 200, 30);
+        path2.AddLineToPoint(50, 80);
+        path2.CloseSubpath();
+        wxPoint2DDouble cp2 = path2.GetCurrentPoint();
+        // Main path
+        wxGraphicsPath path = gc->CreatePath();
+        path.AddLineToPoint(50, 80);
+        const wxDouble x = 100;
+        const wxDouble y = 140;
+        path.AddRectangle(x, y, 50, 200);
+        path.AddPath(path2);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, cp2, 1E-3);
+    }
+    // AddPath
+    {
+        // Path to be added
+        wxGraphicsPath path2 = gc->CreatePath();
+        path2.AddArcToPoint(100, 160, 50, 200, 30);
+        path2.AddLineToPoint(50, 80);
+        path2.CloseSubpath();
+        wxPoint2DDouble cp2 = path2.GetCurrentPoint();
+        // Main path
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(15, 35);
+        path.AddLineToPoint(50, 80);
+        const wxDouble x = 100;
+        const wxDouble y = 140;
+        const wxDouble r = 20;
+        path.AddCircle(x, y, r);
+        wxPoint2DDouble cp0 = path.GetCurrentPoint();
+        path.AddPath(path2);
+        wxPoint2DDouble cp = path.GetCurrentPoint();
+        WX_CHECK_POINT(cp, cp2, 1E-3);
+    }
+}
+
+static void DoAllTests(wxGraphicsContext* gc)
+{
+    gc->DisableOffset();
+    TestCurrentPoint(gc);
+}
+
+#endif //  wxUSE_GRAPHICS_CONTEXT
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 69ff216d07..7e7fa64007 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -169,6 +169,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_boundingbox.obj \
 	$(OBJS)\test_gui_clippingbox.obj \
 	$(OBJS)\test_gui_graphmatrix.obj \
+	$(OBJS)\test_gui_graphpath.obj \
 	$(OBJS)\test_gui_config.obj \
 	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
 	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
@@ -871,6 +872,9 @@ $(OBJS)\test_gui_clippingbox.obj: .\graphics\clippingbox.cpp
 $(OBJS)\test_gui_graphmatrix.obj: .\graphics\graphmatrix.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\graphmatrix.cpp
 
+$(OBJS)\test_gui_graphpath.obj: .\graphics\graphpath.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\graphpath.cpp
+
 $(OBJS)\test_gui_config.obj: .\config\config.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 9855000899..b5a1f1843c 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -164,6 +164,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_boundingbox.o \
 	$(OBJS)\test_gui_clippingbox.o \
 	$(OBJS)\test_gui_graphmatrix.o \
+	$(OBJS)\test_gui_graphpath.o \
 	$(OBJS)\test_gui_config.o \
 	$(OBJS)\test_gui_bitmapcomboboxtest.o \
 	$(OBJS)\test_gui_bitmaptogglebuttontest.o \
@@ -848,6 +849,9 @@ $(OBJS)\test_gui_clippingbox.o: ./graphics/clippingbox.cpp
 $(OBJS)\test_gui_graphmatrix.o: ./graphics/graphmatrix.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_gui_graphpath.o: ./graphics/graphpath.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_config.o: ./config/config.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 60ecf9ff0c..abbc0c4998 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -175,6 +175,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_boundingbox.obj \
 	$(OBJS)\test_gui_clippingbox.obj \
 	$(OBJS)\test_gui_graphmatrix.obj \
+	$(OBJS)\test_gui_graphpath.obj \
 	$(OBJS)\test_gui_config.obj \
 	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
 	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
@@ -1050,6 +1051,9 @@ $(OBJS)\test_gui_clippingbox.obj: .\graphics\clippingbox.cpp
 $(OBJS)\test_gui_graphmatrix.obj: .\graphics\graphmatrix.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\graphmatrix.cpp
 
+$(OBJS)\test_gui_graphpath.obj: .\graphics\graphpath.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\graphpath.cpp
+
 $(OBJS)\test_gui_config.obj: .\config\config.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
 
diff --git a/tests/test.bkl b/tests/test.bkl
index 4db76b86cb..2df7aef927 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -182,6 +182,7 @@
             graphics/boundingbox.cpp
             graphics/clippingbox.cpp
             graphics/graphmatrix.cpp
+            graphics/graphpath.cpp
             config/config.cpp
             controls/bitmapcomboboxtest.cpp
             controls/bitmaptogglebuttontest.cpp
diff --git a/tests/test_gui.vcxproj b/tests/test_gui.vcxproj
index d7710c370f..cab7296bce 100644
--- a/tests/test_gui.vcxproj
+++ b/tests/test_gui.vcxproj
@@ -530,6 +530,7 @@
     <ClCompile Include="graphics\boundingbox.cpp" />
     <ClCompile Include="graphics\clippingbox.cpp" />
     <ClCompile Include="graphics\graphmatrix.cpp" />
+    <ClCompile Include="graphics\graphpath.cpp" />
     <ClCompile Include="graphics\colour.cpp" />
     <ClCompile Include="graphics\ellipsization.cpp" />
     <ClCompile Include="graphics\measuring.cpp" />
diff --git a/tests/test_gui.vcxproj.filters b/tests/test_gui.vcxproj.filters
index bd3fbfdc4d..a8a252cac3 100644
--- a/tests/test_gui.vcxproj.filters
+++ b/tests/test_gui.vcxproj.filters
@@ -293,6 +293,9 @@
     <ClCompile Include="graphics\graphmatrix.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="graphics\graphpath.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="html\htmprint.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index eade1cba94..44e695495c 100644
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -418,6 +418,9 @@
 			<File
 				RelativePath=".\graphics\graphmatrix.cpp">
 			</File>
+			<File
+				RelativePath=".\graphics\graphpath.cpp">
+			</File>
 			<File
 				RelativePath=".\sizers\gridsizer.cpp">
 			</File>
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 8ab1a7002d..170871ff8d 100644
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -1026,6 +1026,10 @@
 				RelativePath=".\graphics\graphmatrix.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\graphics\graphpath.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\sizers\gridsizer.cpp"
 				>
diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 6852c292ab..c4cfee6991 100644
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -998,6 +998,10 @@
 				RelativePath=".\graphics\graphmatrix.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\graphics\graphpath.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\sizers\gridsizer.cpp"
 				>

From f258dc4c643f179f5cdcca3f578be2324737cc7b Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 2 Jul 2018 20:24:43 +0200
Subject: [PATCH 703/916] Fix setting current point of wxGraphicsPath (GDI+)

After executing native operations on the graphics path, the native
current point is updated properly and should be used instead
of manually maintained logical point.

See #18111.
---
 src/msw/graphics.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index 9e87c937d1..f7c014d9d4 100644
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -1280,9 +1280,6 @@ void wxGDIPlusPathData::AddLineToPoint( wxDouble x , wxDouble y )
     if ( m_logCurrentPointSet )
     {
         start = m_logCurrentPoint;
-        // After calling AddLine() the native current point
-        // will be updated and can be used.
-        m_logCurrentPointSet = false;
     }
     else
     {
@@ -1296,6 +1293,8 @@ void wxGDIPlusPathData::AddLineToPoint( wxDouble x , wxDouble y )
         }
     }
     m_path->AddLine(start.X, start.Y, (REAL)x, (REAL)y);
+    // After calling AddLine() the native current point will be updated and can be used.
+    m_logCurrentPointSet = false;
 }
 
 void wxGDIPlusPathData::CloseSubpath()
@@ -1326,9 +1325,6 @@ void wxGDIPlusPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx
     if ( m_logCurrentPointSet )
     {
         start = m_logCurrentPoint;
-        // After calling AddBezier() the native current point
-        // will be updated and can be used.
-        m_logCurrentPointSet = false;
     }
     else
     {
@@ -1339,6 +1335,8 @@ void wxGDIPlusPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx
         }
     }
     m_path->AddBezier(start,c1,c2,end);
+    // After calling AddBezier() the native current point will be updated and can be used.
+    m_logCurrentPointSet = false;
 }
 
 // gets the last point of the current path, (0,0) if not yet set
@@ -1450,11 +1448,15 @@ void wxGDIPlusPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDoub
 void wxGDIPlusPathData::AddCircle(wxDouble x, wxDouble y, wxDouble r)
 {
     m_path->AddEllipse((REAL)(x-r), (REAL)(y-r), (REAL)(2.0*r), (REAL)(2.0*r));
+    // After calling AddEllipse() the native current point will be updated and can be used.
+    m_logCurrentPointSet = false;
 }
 
 void wxGDIPlusPathData::AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h)
 {
     m_path->AddEllipse((REAL)x, (REAL)y, (REAL)w, (REAL)h);
+    // After calling AddEllipse() the native current point will be updated and can be used.
+    m_logCurrentPointSet = false;
 }
 
 void wxGDIPlusPathData::AddPath( const wxGraphicsPathData* path )

From 8349c4bf7f5ac28d6b35569f6fd889cc99aae3c4 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 2 Jul 2018 20:32:29 +0200
Subject: [PATCH 704/916] Fix AddLineToPoint() if no current point is set
 (macOS)

AddLineToPoint() should behave as MoveToPoint() if there is no current point.

See #18111.
---
 src/osx/carbon/graphics.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 699e483512..a77b9f7b19 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1164,7 +1164,16 @@ void wxMacCoreGraphicsPathData::MoveToPoint( wxDouble x1 , wxDouble y1 )
 
 void wxMacCoreGraphicsPathData::AddLineToPoint( wxDouble x1 , wxDouble y1 )
 {
-    CGPathAddLineToPoint( m_path , NULL , (CGFloat) x1 , (CGFloat) y1 );
+    // This function should behave as MoveToPoint if current point is not yet set
+    // (CGPathAddLineToPoint requires non-empty path).
+    if ( CGPathIsEmpty(m_path) )
+    {
+        MoveToPoint(x1, y1);
+    }
+    else
+    {
+        CGPathAddLineToPoint( m_path , NULL , (CGFloat) x1 , (CGFloat) y1 );
+    }
 }
 
 void wxMacCoreGraphicsPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )

From 534b8840d2b8b4edb8e7a888b3fdf064ed013a87 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 2 Jul 2018 20:36:45 +0200
Subject: [PATCH 705/916] Fix AddCurveToPoint and AddQuadCurveToPoint if no
 current point is set (macOS)

If current point is not yet set, these functions should behave
as if they were preceded by a call to MoveToPoint(cx1, cy1).

Closes #18111.
---
 src/osx/carbon/graphics.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index a77b9f7b19..147e237e35 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1178,11 +1178,23 @@ void wxMacCoreGraphicsPathData::AddLineToPoint( wxDouble x1 , wxDouble y1 )
 
 void wxMacCoreGraphicsPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
 {
+    // This function should be preceded by MoveToPoint(cx1, cy1)
+    // if current point is not yet set (CGPathAddCurveToPoint requires non-empty path).
+    if ( CGPathIsEmpty(m_path) )
+    {
+        MoveToPoint(cx1, cy1);
+    }
     CGPathAddCurveToPoint( m_path , NULL , (CGFloat) cx1 , (CGFloat) cy1 , (CGFloat) cx2, (CGFloat) cy2, (CGFloat) x , (CGFloat) y );
 }
 
 void wxMacCoreGraphicsPathData::AddQuadCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble x, wxDouble y )
 {
+    // This function should be preceded by MoveToPoint(cx1, cy1)
+    // if current point is not yet set (CGPathAddQuadCurveToPoint requires non-empty path).
+    if ( CGPathIsEmpty(m_path) )
+    {
+        MoveToPoint(cx1, cy1);
+    }
     CGPathAddQuadCurveToPoint( m_path , NULL , (CGFloat) cx1 , (CGFloat) cy1 , (CGFloat) x , (CGFloat) y );
 }
 

From fd5576a3262e6251d5d488c3fa0f37346293ac96 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 2 Jul 2018 20:50:44 +0200
Subject: [PATCH 706/916] Explicitly return (0,0) if no current point is set
 for graphics path (macOS)

This is to suppress a harmless warning displayed in the console
if CGPathGetCurrentPoint() is called when no current point is set.
---
 src/osx/carbon/graphics.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 147e237e35..f3d6137ea1 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1240,7 +1240,15 @@ void wxMacCoreGraphicsPathData::CloseSubpath()
 // gets the last point of the current path, (0,0) if not yet set
 void wxMacCoreGraphicsPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const
 {
-    CGPoint p = CGPathGetCurrentPoint( m_path );
+    CGPoint p;
+    if ( CGPathIsEmpty(m_path) )
+    {
+        p.x = p.y = 0;
+    }
+    else
+    {
+        p = CGPathGetCurrentPoint(m_path);
+    }
     *x = p.x;
     *y = p.y;
 }

From 9acb2fe3a0a59c1e0664c4694a286a1a6412c380 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Mon, 2 Jul 2018 18:10:06 +0200
Subject: [PATCH 707/916] Fix AddArcToPoint when no current point is set on
 wxGraphicsPath

Current behavior of AddArcToPoint() when there is no current point is not
documented and moreover it is not the same in native macOS and in generic
implementation. Under macOS nothing is done and "no current point" error
is raised but under other ports (generic implementation) only arc
is drawn (without initial line).
When there is no current point, in similar functions AddCurveToPoint(),
AddQuadCurveToPoint() it is initially set to the some known control point
of the curve but this approach cannot be applied to AddArcToPoint().
The only well defined fallback point seems to be (0, 0) and this option
is implemented here.

See #18086.
---
 docs/doxygen/images/drawing-addarctopoint.png | Bin 3386 -> 3242 bytes
 interface/wx/graphics.h                       |   2 ++
 src/common/graphcmn.cpp                       |   6 ++++++
 src/osx/carbon/graphics.cpp                   |   6 ++++++
 4 files changed, 14 insertions(+)

diff --git a/docs/doxygen/images/drawing-addarctopoint.png b/docs/doxygen/images/drawing-addarctopoint.png
index e3aa71932a168a6e39f4fbe5be752d77934ed77e..96570d4b08db3f0f7639f11efd4fd38a780904f4 100644
GIT binary patch
literal 3242
zcmV;b3{~@qP)<h;3K|Lk000e1NJLTq00CeC007Vg0{{R3%krka0000mP)t-sBM=tN
zkT8LhsOr(Sw^$d<)!jf<dH?_atFpQ<Icdg|Y`btcWpRV#vw&JQC|^-g9^73n00009
za7bBm000XU000XU0RWnu7ytkaAW1|)RCwC$oqtRl=NZRQ|Crh-B0^=VmX@hvf}>S8
z))2&x1Ss2WtLhakQ1^9#U<t{l?eb52d-YfcH!?bMS;ra)$<6-grjk-8lq78!n^H`q
zipiK}Zc=_NNfB+7rif}4jnL>=6s3FbY`}o+d(WKldz;@sY;2$L$B)17^FHtMKKEV*
zn5<=_fz!Zg;FJK{Ha_oS9C$#vsY2l=@d*$EOaluZa^t=(ho7w65qgGQV5vodQt=f|
z!3IH|xC8J*rh&ykQ(h3N6bm<SZ5&<%SY#TwffK%Pz%z=4#g+zHk@RWAGH|;LPsmWF
zSXfxfNAMK^X4=B79DE*tCbiQo4uB#FFWVY!5kFXlCIk}zAA3{*4>0Z}%240_>)${G
zv+_86Cu14rnFhvTJjMH#sl81&&h|)mB6KGa6<<?<4{>Y*Ti2c`4cQv84V(@y)4<Vz
zg^Ch$0gq>8m6!=w%F4>R-%P-d6W}Z}0V}+$YvO+Zc-BO~;|j2k#6o5PK16tPiU9VW
zDKZDJK!BCNy`1;GX^w%TF6aIuN?a+td=i8r#6B=-uCbL-WN>KG48S<J@<&C_Q>KX4
zx>l8dNmxHKi&zI<-)4OL6?4VIbst?J{m)bZJOa^jVUlIw+D#p?eDG<Of%BtG@rwb5
zri&Q`cKM?oIzBj5!X_{dMs;QQz_<)T35%WXNQ|@(iQ@MA&XlkR?9PjMyzpz^1(W3^
zglWLD)5tu)iZuEyL&!|PAXH?RfWQ*4Th@MSgXN79W`Jw`+HaM5d_QFd7$2m0bKNvR
zP7xa#K0=v+7Y2P75DUPr=V|}LEE%vdO1+mTpm%Zrdv{Hiq#9V4%?|Wi?oTza&Y`5@
zBnaE$<qTUgz*dR3<fIZ9chbWa&Gz(UXZd)(sJJ+Fz|FKWuIPD?4>!w0BXY_lafI%p
zg>heqRlW6k`)5-HT<f43?Xn4`Z)moNw2FS;i!WZv<j>Tl1USY_X@eXHukXyNa7(?x
ze`RFwmgMDY<9Ue=M8&%<nrOWE``+uB%9ohjeqilHyfn!3Z>;-TWRSMj-&NG?+cmk}
zz}o#So3~6y6?VVc1<y?)rhxGbZ;4?=_wBa^733_#V~qH~9dTcMoaiA|u$MVq^pWbF
z&l#K+hz}gs6$^v>`Is*r-k~HuRVy2t$%qdeccwJOKOIM+xBji%mY-9Hlbm9-J;3;2
z><`+{TjE)+(H{=udK5ET44X-5bh@sXIUu1orhwN6)VQ=q9k~tiavH#{m{YrYzM58=
zxb7_#`P^jkfn&F9{-o9+d7C1n>Pc&=fXjK!H8K2UWCy4Vd%4--lmO!?Z3E+nm(~w|
zvnq1+)&e6<U^j{$L{KbxwC&h5^Bd%e&+z4xBoVkVsw>{Ze~aRu-`ZUHf8arNFd0gC
zAzRzR&Cz~s-a_+%_Gmt)C=_MvN-!|e)^N0>mB{~yO6e&2lyzJkOLirc7SINcwx%?*
z#r529lyUA1N`{vhixT#1d7WP<R~@q@r`UMl%~m+X|C#dNAC04z*?v_SI=x&%et0jn
zA}+;^Ps4%HuA*cE_gZL=JRCohk1P6BVGM0DfcUv%3&0yfHi4&IDtG7Kt10H5by3Dj
ztPzB(8^@~S)WEoTql6!z<ULyZC56if1x7=}G2@w<P|PYUDPydFUMg_!Mz&M%(gdo1
z4N+V8F>Zr|=^UulZG~Gjj;pRbJLKicYie$)>QK&(v&)V0TtQQFU9gawd(6?$O%J>w
zX*E?%<vy)S`m>A9(^@N3$6T|pu<)cBh7j%BQ3LuJG;v};4BUVLsfAv{IDg%v?5FAU
zpf8VEL86SB1%5&8&?2F$lI?Yi#Li;opZtrkEF9P2CA!wBpC<6ZR;)KxCoW@wnE0mp
z8GhviN;{e-*lk1}^ZG2jK52DGI}|3rab5zkjim4{sGaT(6x-#u<wb%mc?5F5EO`?3
z!_QFkIoy%RTu7+7dGqE!LxJ9cLs}>#7PiZ9c8=T+zyg;b@RatjVa2QZJ*-E`y`<C4
z8#B^H1O?fek&i9n=pUTa0o*`Le9{=;h@_QfEQ|{x^k84o)9-p~wCY`GfgAJIW*a}&
zngvGoxAsqUc?!*(7A^2v(n`y#*$UQuX4}1BXru0Qt1~4rzE`szU2h|Is(@W9>x`{&
zgJB!mu+X4mebQLqRgTtpNlP2WLXIBCeBOWnes3IL6xIW-Gl*NAPnK;JI2H`H$>EoN
zc`$Elptz_2;fYS@6b=;NK7V4s;YzESm}yq)s()yYh({Bu7IV)PI$R%&qQ&;^_pN6O
z5(91vebGJ92f7Y~Y^$bkjfnU^P6&8OSUQFpxcSyVE0?Gw!eRVO)bJhWc18fVM<mtW
zO9WVQ2us&cBe&Qd5EBLtuRZrhwQzlKB*K41TKJuWEbI`LkCBPed@Gr7l%WJW-Lopj
zR8-)u;mD=*cFq6`e}dWqi|t(Ek_eZEO;tw)_68xkg<nqy_#V+=mye<Oc249f6SZ(C
zKM~!+u8U(a-gGM=;1}nRaCZsDL;@^+u_Zq|^;FbOHxbL(y_cAVjZ0O{RO>r_cVZeg
z4tNh$@_nlf83T;T*s-^IJAlC;;ARvz_+buM3F8}hUBE^czUl;aIWz+J&Heqelmg>X
zGN;osafi0l0z)kUen8I~bWQV<0E|K4|Dxv&Kli5=SV^SlI=AlOD=7!g*0o62SCVSr
zj^F4Sn~y@Ofsgd^1{*EOz-^cH`L&b-<IB_ww`>4ImmW89lmTG(Aawy4;5i0>;dk`C
z&h<?efJOST?ztrvfCah&8g<Idu>cIcmQuPB2fPz80ldd@I!KqNJ_SqwOShfgiz%Af
zB?Rmao*q6en+RA84hQeNX(Hgp(Z2`16dM#5B1VAgZwG_7wPzBpovZ-6Fa9DJoYp+-
zl}}lb1SSU7KC^0V$LN#;!^^?ZuQY+}_b}7x0C$|q(9|%N*#TArnv5QmOyJrKId#BZ
zBvD3H`&P}0-;ZzMLOF@R@3gq%Ewx7MMck-RhN>WI;{w~0r5F{sZ&~!?mpe<rrffje
zA={9EO0T+iqf)i%Q7IxU-pxVjDda{kb)fyBDoDVwzoq+@Kbevk7?uKJ?qV5w7X?A;
zK4C|8t5Wr7Jy9snJ?1DUfNzi7z$fwpc6shm&%RI<BnbD#6w=`xN!9Q`rOkf~RoUgU
z)-m{%jO}s*`T{D$RgX_9HF=}xn&=Rg?eYycAFj~@_<m-r-@Oqf6?jDK4t)6e-2U%g
z{M(YUSNSJspS%dqtyDcKOFCXCYYYGZ4nI~}2fh^5kV)NbB4lCwC9yCF-QQ~tKqUe@
zs#2;RQAE|F7p~O@@Ul`3xl#oQM`XMlt&bMABpdhyyzZ}(ZTKghUvtpPmD=S#wTMvi
zVAZ0;E4+)ml1FmbS01Z=Lg`q-#<>#y&wVG8Zegelh<BHv4}BW}Uhssg9#KTqqxY^y
zd1Q~Mf&}a&zr8!Nd%Xfa%*=yi15>o9R|<HRSQr2H`p(sLK&1w(qXd`*cB_`I{hEw`
zBe^mNm+xjKmsSU`EnZkg{BA~u2k_3X3lJ;78qI1|iYBew5WxMv?E~+UO$OZPHyJPv
znhcnF6E0?eU1KH##(5?KHk(^Z18)QHHmleGVCqe{Sdql`x?%%>T@I50Q*FY<l$Yo*
zwOiY~BNt*DSh-4=@aPI;?S#=+2{Rg4O|8`D{vrHu;1O;mi@_9d?&@D^Y8Jy^SL8r&
zKVuMh%@vC+WwJMPNlClh<_F0GcNhd-+k~r?6aPq5aYOktP%o1kgD)>>4Dj0UtXy7_
z15pu%<S0YXhnNIjJIA%1gD1GqRRr<!Lm(^zo51eX6EHcU+aoQh8%20M>cw4$nRaVZ
zi(MYBT)c{gmFr>RnnybgzJRCEz=FpH#k+G05Ya*t2f4YO_%o(~SFSHA1pq?l5J>?x
zfnA-UrHzOaWB#GuwlNw@)Q*f6z&14FEc}AgnP(>8M&}F8=gkECh|~G%tH?yaqeK!;
z*+jrjr^$fxUvR$qnwccgMLJ!xnL3@@X)?D)Ogw^21-vb*bm{zX8aNG{22KN~fz!Zg
c;H|a)0@=iMC0&1orvLx|07*qoM6N<$f{6(jf&c&j

literal 3386
zcmV-A4aM?_P)<h;3K|Lk000e1NJLTq00FoF009I90{{R3sO&tB0000mP)t-s76S{)
zk{NrDp!3_W!C4Zx)#gcHcK`qXVWi#z8F$x`V!~}7&as^mX|8@b3;VZc<_M6=000cd
zNkl<ZcwX(@VQ3u383y1%>B;9}8H+%R3I^k1U0d34#Yv8)MhLP^>O0Fdc6^gGCKxr^
zv(-BIZg1}uy7P*J+N)prCvAU~V2e{DI}IhO6FYHgYDWU6G=G}xuYxFUB12CoBoNf5
zv^$f%izHvPx8oDHJKW15j~4%V_;$aU+nYTRNF4cbZCo4I#<g*6TpI^y7V5;HQs9a<
zSe8xjxZ_bv3S6A44C3P4u@;d6w*r=)xDA%tcu@*m50+`sLZ9iLqj8hHa77B-H5k@1
z<se`zf)&Vv(<;z9qClU`e~UU;Ud0tE0S=464y)Q%@Up{0+;(t~0apR~YdFMzKEcMa
zRPGwI`?_j4<2jR$(IZK>H0)*GA+r-eb}QvL?3ZMo>p{`lL5MwS0oqo8jj<@t3Z*vE
zqF|9_g_5`7W+#BL3GifX3EveM?r(-E0ZxLnaY0NQ*T(&?J0UIZhuz&wCnZknc5=U@
zxNJ8Il@iC#%0F~}CMT|&=bH#;+PM1@QsO@5xY@@g?w0?a21*I(a3yB@763e`T-_@f
zj-Qv8DS&;miZU%3PW!m~{-=fj#+#Z4_DY1~$(=$iQ>hD7Djd`ps=1{osf1Lx^bl&%
zZp{Lq^59DEV^wqj%FILZz7uy^=T%8@ymcn!#Q{eEE%mvSIG&QCq%KH+`vK}jn^6vg
zAE&D^)aShejLsxNjdQ2E`Y9^PpXS4i%c&c-PUR<I#^Jj$Y{Z)eMsI``mp%cHJg6iu
zgcPR_dQN=rD$48O#DT&y+O26|Uqa$fd2X^rwXC>DW))>#P8{b=C4jvl!ySf?%%=Vl
zDx4Za<8fMNDyTT`sm{A~GF&1oIDL}BPjmpvr9?Pz=(XW9n$tSp3J0z*DAGEU;lSxC
zh5tMRl#-tW9*3h4%P6}aA?+rcBNvrNrNsf-G*G;hkP^p}SCpAVfN?q%EZlpyX0Fa$
zomCzWFs?TyBD*!ERFk^+=Swu8xWaD)Xv&(D)$a!sr>j)p{oU%MddtJf3xUL;Hv?aJ
zmw{%L<f}LK?%liZy^G3Y!)kfq_M4vv5mz_`AJO>5_U5W7Ks&Dvs|)07N{Sr}7*1DB
zpSIN62BMeCzf=g>t|$uQ1qz45K5fbMg7h%mcX5H-R-DWvLOY2w+gqrc(sOQmxq2g%
zINnPxc+U`5KM5i35pLTcxfyqsNPZF^97O{eQxxSjY?SLAxaIOvpVNTg(it?6DbE`W
z1@ce!PTl2QN(2ITW)R+aT2Yc-)woXhmN}QFyqahMPGqXn6h%qED+}AeQo2~}Ef2LE
zhq<9fPReO`rqEg2IZ)-@Xf^K4Des#mjcs$-v-%#c+d6Nw7Uz9qeM(?&pI&R7H(H8I
zQ_sS^27w5)&gSFbT{twF*t(4osV{i1CIX5Z_3`0&p#xaUtG3RWL?CgW`Y2q9#O^xu
zpIYk-9<Jo0aKNr@^%m8$RbDG_C3~X{DJe9b0s-ptX1x~G;yCdo*sQ->=L=g<FM9RP
zlIVVTah!hA++d%ZuU2rn1NDP_Vl#s{&U+i*O`m%(^|c+Pe(MzA3E(`p@#(WoeJtjP
z_@Y`IhYw<3c~+vS5noh`;|dwn%}vjCB6dSwpmmDlbkvQuIS*@9C%)u`R!-uh0()z6
z+XNQXt-w7fa8~9BJi}XOs>*8-Zc1Q7slE_HgS-uIx8zAz^Kg6WUUCWe&G@b@XfUOB
zU0%J1Oe@HnxH~H%xZJ6Fmt4|!-Jbl;iyZ>3)14XSF3*Dp*$LFm3KhUXjWy$v8yTmi
z?SLQNY^rv<<>{rR+jQ0UKUGk)jR(4%7hWQ!@oQq|$yO?WtFw)7%J)QYR;K`&7n>PU
zw+`N3TKX4w;*{g^wh@K%Dq3R^BdSFOD>tH2tc&kUZu~3&?56M;cTs(CX{lDac(rnQ
z3x>t4i-wJB0@qyqZG0sq<<mB9LMXg-a@@hCgVQyf#wyom!%@Wv=`w5#2v!b-p}Q8A
z2Ylk_y)CMjZnM%ozP5747dQ&sOXc+W_5H-xET@lCihGK-#PbnYiWvX{$TM7@&8@6*
zqPTnPC*#$+iRW#0$+<XfE3#$}`rXRqExf@iw@ig`;{D{w@uR3kkoo&1)-I>PV~{T7
z$@4A_{lw&zGYD-4PV>=EbUI?9mO~i`<%uO0x=CxxqidUGvSAya18O<F1wtt?TN0at
z(^au%sjs`<jBOChlrt4f`@o4$bx$<B<4|8~L#`8I(cfPBBQ^_{J|Qv_jAN}0rR_o7
zs-d5xtM8wDCU8!&=p=|ZoXf19=H^A`H<Ab<t}y6#nxjwNZNqUIM4Y~7H4ff+!3^c@
zbWKSLTyM=!pWPzd$mZK%a2!^eiYs~I^s{=+_KyV{o0=8c44huOJ9NPFoJ1`PX0r?S
zJh6}^T`=tGy^|*3dTAB+XybE$_950}{@!t2S{GhM+&1h!_ufe}aG3^hyZ7i=WdkZ$
z9b-!~F0~%VG&W(_?mO^0IN_<TxWUr0P(JU{>f=r~1-Eh}0xiOE1HLNfy^XK9LFK-u
zs=uSaCRc8m<C<DIq=!5!r<ThZY;NWH)|{3D&BC2I<ypD8vKqrCSB`a&{fL`x<(6qv
za2WKgTzYtLeLrmaHTO4SBTu4mD`ybe#7Vrk!MFA3<zHa4arP#zE%{U+8bf9r5O~}H
zIsaZkngS(RadR1lOUj8mqXL?&IH)FcB?ZyE6KLF1Lx7@C2!;e2ms5c$B>}N$+XIb5
zFU6<AUy7CM3^wj4a8r0wTcIP!IG!I1fAzxYNZ@gK;q}+`j{=VyRelDs?8*ckH*!pP
z7N1K59hV+b6lwp^S5BQ(=4Hh}eO7s0T3q^B<xy#IBhLzU6dD2?dc``5))@v|PV8Bi
zLMU*!DYO7PbYCcNMWKuCcqSCMlE_7;5gG~{M5ggVC&GZ^j|T4kHvHxKmXP3zso`OD
z4}7IG9}-;Ya#<}8Q%S#pyX;i1oRJe(Qkm|&q&SDB4iBR7XyL&XRJB|#52NwyiiHN3
zb7<<Y>Z8;oJh+nD>+hO7)QQmG(CbvL>|>%MAB6}vr#h8ud{%yDJ3@pjIhFIVr}uay
zOgJ3wJx?NNGzA(W9M1!O9@7jP?hLt4UYvfsvHq^L0QZuOJ`?_;Rj?{)t3@Awc;j|N
zVKjgnTO+8fK9(Co11XRe;9mX^##z5O_t-?^H(IrYZ7n!0cP^WKCVN1>2YDOUfIP7b
zXTWyLJFhH>VzIvq{Uib`?$`?KAT}!Qv8qn*^wJ$C6fLM+K4X~d0r@zMN3<w#1^;z$
z16sd{1(R>nTrlG%uhN1Yw?{3l3l+^h=B7kCyjIK^v;g-FEozwj0eSP`MQsAi$18US
z&P$8HFe@n9{IskfYsF2h&<fmR)uf5XSvLf<qH@^(jL9C5&)Yj+$y$tqJ{tq5FpNeB
zu`9^iyh;^}O~fhU9LJBj*^R#vD}eLdHN;=E<CL|GH&zUj;dtd-Tm-0AiQ^&+x4v?^
zO0ny!7yJ)rT7~ODal08e0d3nv{1D}w{FjxBa#Nl|v^A$CKjvm`XoH41M<T7ly#kGx
z>;ZXPwu*Pa8%oy7cX1rBA4QW_DFT3Xk-X)A-O5GQeH&l74p84kIuos{9Cn!KCnlE7
zu_yq8Sm=-Lba8nS<yFE$1gP|Pf&bS^?U<XBF#sUsS6Cl|bcADVS@C$1B27r=`dw5x
z<_$M)WDqR+a|F<jQ2@}6^)7rJEMdph+Q~6MBfNk)_D?`@;wk->tMohP=g~r(L}}y1
zb694aYD$bdHzYAGr%H^&2Qi6p=@Sy;N~**-m@?xKL|hx!#_2NSdgmp^r6(lDji^*!
z9C~euap@Bh<8+nEi^J~rBrXZ=N2r&d%7MEE02<i}mfE;S3Y-=N0D~G9c-(QEh7^~M
z)!78$e%e(X8)k5D;!|DL8k@kC>aLCfXi+{cTEW4IFTwIQ?y#z5Ic}MbS!~Q+fya6O
z{dmJhe3uEtO@RF@+I-B6;l!O8T!k}{-3s82dy+aZ%^8n{wsN{kS643Y;PMt&v`7yh
zhq!W>Gf_>^M*NVCE8sz85qz8t5KcU!7Aj-W(Fpj&jU5x<<DwL}F)M4~F}6X8<N7S{
zv0=)yLg8VfxQmKY8E_bYo2(6B*+uO{h;bu!{dWa-z=Opw;|eEU_`50V`#D`zCsisd
zZgNtcJRvErz$&LoiaY1fCMRt<aUVD|Rn5qWQ+efN#i^>il{?3}<z!4wT$)#o%84tT
zbaaD|6Nht7<zlkp^j`ISv=%3E+PF5ZjceoDxHhhhYvbCuHm;3p<0Q`i0e)3~M6f$E
QyZ`_I07*qoM6N<$f&n09UH||9

diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h
index 7361413c4b..2e1bd40477 100644
--- a/interface/wx/graphics.h
+++ b/interface/wx/graphics.h
@@ -55,6 +55,8 @@ public:
         to the line connecting (@a x1, @a y1) and (@a x2, @a y2).
         If the current point and the starting point of the arc are different,
         a straight line connecting these points is also appended.
+        If there is no current point before the call to AddArcToPoint() this
+        function will behave as if preceded by a call to MoveToPoint(0, 0).
         After this call the current point will be at the ending point
         of the arc.
         @image html drawing-addarctopoint.png
diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 3d70b9a202..fc0e6ab894 100644
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -455,6 +455,12 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
 {
     wxPoint2DDouble current;
     GetCurrentPoint(&current.m_x, &current.m_y);
+    if ( current == wxPoint(0, 0) )
+    {
+        // (0, 0) is returned by GetCurrentPoint() also when the last point is not yet actually set,
+        // so we should reposition it to (0, 0) to be sure that a last point is initially set.
+        MoveToPoint(0, 0);
+    }
     wxPoint2DDouble p1(x1, y1);
     wxPoint2DDouble p2(x2, y2);
 
diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index f3d6137ea1..cf292a26e4 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1223,6 +1223,12 @@ void wxMacCoreGraphicsPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDo
 
 void wxMacCoreGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
 {
+    // This function should be preceded by MoveToPoint(0, 0)
+    // if current point is not yet set (CGPathAddArcToPoint requires non-empty path).
+    if ( CGPathIsEmpty(m_path) )
+    {
+        MoveToPoint(0, 0);
+    }
     CGPathAddArcToPoint( m_path, NULL , (CGFloat) x1, (CGFloat) y1, (CGFloat) x2, (CGFloat) y2, (CGFloat) r);
 }
 

From 99ea06203aec0ebb1f8978cb34a50483e0fa746c Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Tue, 3 Jul 2018 13:33:03 +0300
Subject: [PATCH 708/916] Fix clobbering warning

---
 src/common/imagpng.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 11b63b58fa..0644d0c82d 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -256,7 +256,9 @@ wxPNGHandler::LoadFile(wxImage *image,
     // VZ: as this function uses setjmp() the only fool-proof error handling
     //     method is to use goto (setjmp is not really C++ dtors friendly...)
 
-    unsigned char **lines = NULL;
+    // allocate the lines pointer dynamically to avoid clobbering by longjmp
+    unsigned char *** const lines_p = new unsigned char ** (NULL);
+    unsigned char ** &lines = *lines_p;
     png_infop info_ptr = (png_infop) NULL;
     wxPNGInfoStruct wxinfo;
 
@@ -400,6 +402,7 @@ wxPNGHandler::LoadFile(wxImage *image,
     for ( i = 0; i < height; i++ )
         free( lines[i] );
     free( lines );
+    delete lines_p;
 
     return true;
 
@@ -421,6 +424,7 @@ error:
 
         free( lines );
     }
+    delete lines_p;
 
     if ( png_ptr )
     {

From 5e5f878db0541dcb679c8127bc28c249385bc5d2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 3 Jul 2018 18:54:19 +0200
Subject: [PATCH 709/916] Improve wxWindow::FindWindowByName() documentation

Mention that the "name" is interpreted as the label if no window with
such name is found.

Also document that both this and FindWindowByLabel() functions do
recurse into child TLWs, unlike FindWindow().
---
 interface/wx/window.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 6cdd4974c8..9d47f7246c 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -3825,7 +3825,9 @@ public:
         or panel item label. If @a parent is @NULL, the search will start from all
         top-level frames and dialog boxes; if non-@NULL, the search will be
         limited to the given window hierarchy.
-        The search is recursive in both cases.
+
+        The search is recursive in both cases and, unlike with FindWindow(),
+        recurses into top level child windows too.
 
         @see FindWindow()
 
@@ -3842,10 +3844,14 @@ public:
         and dialog boxes; if non-@NULL, the search will be limited to the given
         window hierarchy.
 
-        The search is recursive in both cases. If no window with such name is found,
-        FindWindowByLabel() is called.
+        The search is recursive in both cases and, unlike FindWindow(),
+        recurses into top level child windows too.
 
-        @see FindWindow()
+        If no window with such name is found, FindWindowByLabel() is called,
+        i.e. the name is interpreted as (internal) name first but if this
+        fails, it's internal as (user-visible) label. As this behaviour may be
+        confusing, it is usually better to use either the FindWindow() overload
+        taking the name or FindWindowByLabel() directly.
 
         @return Window with the given @a name or @NULL if not found.
     */

From 6d02c458676de4ebf3c5cd7a716a9c0d375e8b42 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 4 Jul 2018 20:09:49 +0200
Subject: [PATCH 710/916] Don't write spurious </font> to wxRichText HTML
 output

The opening <font> tag was only written to the output if the style had a
non-default font, but the matching closing tag wasn't guarded by the
same check.

Do add the check now to ensure that the tags are always balanced.

Closes #18157.
---
 src/richtext/richtexthtml.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index af3d8f7ff9..56261546e7 100644
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -166,7 +166,8 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
 
         CloseLists(-1, str);
 
-        str << wxT("</font>");
+        if (currentParaStyle.HasFont())
+            str << wxT("</font>");
 
         if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
             str << wxT("</body></html>");

From 9121b906e83d3038a772b24de2cbf979b99ff04f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 5 Jul 2018 19:38:21 +0200
Subject: [PATCH 711/916] Restore initial wxEVT_SIZE generation for hidden
 frames in wxMSW

Changes of commit cf20a9ced531d502433b5acc25a3bd84505f5fe5 suppressed
the generation of the initial wxEVT_SIZE for hidden wxFrames, as the
initial WM_SIZE was ignored. This went unnoticed for "normal" frames,
which got another WM_SIZE when they were shown in any case, but broke
frames with wxFRAME_TOOL_WINDOW style as they're shown using SW_SHOWNA
command and in addition to suppressing activation, it also suppresses
the generation of WM_SIZE, so such frames didn't get any wxEVT_SIZE at
all and appeared without being laid out properly, as could be seen, for
example, in the splash sample.

Fix this by continuing to generate the size events even for hidden
frames, just as we did before, while still skipping all the other stuff
which is not necessary for the hidden windows.

See https://github.com/wxWidgets/wxWidgets/pull/842

Closes #18161.
---
 src/msw/frame.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index de176504f0..951b2e447c 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -744,10 +744,11 @@ bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
 bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
 {
     // We can get a WM_SIZE when restoring a hidden window using
-    // SetWindowPlacement(), don't do anything in this case as our state will
-    // be really updated later, when (and if) we're shown.
+    // SetWindowPlacement(), don't do anything here in this case as our state
+    // will be really updated later, when (and if) we're shown. Still let the
+    // base class generate wxEVT_SIZE and perform the layout, however.
     if ( !IsShown() )
-        return true;
+        return false;
 
     switch ( id )
     {

From c93ccda035c3400c0f0ede71c2b117b12d24857f Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Fri, 6 Jul 2018 12:33:59 +0200
Subject: [PATCH 712/916] Fix building docview sample with CMake

Should have been part of 64fc4dc
---
 build/cmake/samples/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index 39f4df2ca3..b59b698f63 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -28,7 +28,7 @@ wx_add_sample(dialup nettest.cpp LIBRARIES net DEPENDS wxUSE_DIALUP_MANAGER)
 wx_add_sample(display DEPENDS wxUSE_DISPLAY)
 wx_add_sample(dnd dnd.cpp RES dnd.rc DATA wxwin.png DEPENDS wxUSE_DRAG_AND_DROP)
 wx_add_sample(docview docview.cpp doc.cpp view.cpp docview.h doc.h view.h
-    RES docview.rc DEPENDS wxUSE_DOC_VIEW_ARCHITECTURE)
+    RES docview.rc LIBRARIES aui DEPENDS wxUSE_DOC_VIEW_ARCHITECTURE)
 wx_add_sample(dragimag dragimag.cpp dragimag.h RES dragimag.rc
     DATA backgrnd.png shape01.png shape02.png shape03.png
     DEPENDS wxUSE_DRAGIMAGE)

From 57662803113247619921dcfb414736e09529ef87 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 6 Jul 2018 18:58:00 +0200
Subject: [PATCH 713/916] Fix recent regression in wxMSW
 wxTopLevelWindow::IsMaximized()

Recent 3518f1a7d8b27877183b0aa2338a59dec836ae3c broke IsMaximized()
return value when the window was visible and had been previously
maximized by calling Maximize(), but wasn't actually maximized any
longer because it started to always return true when m_showCmd was set
to SW_MAXIMIZE.

Fix this by only using m_showCmd when the window is hidden, as it
shouldn't matter what it is when it's shown. Also simplify/optimize the
logic of IsMaximized() to use either ::IsZoomed() or m_showCmd depending
on whether the window is shown or not, but not both.

See https://github.com/wxWidgets/wxWidgets/pull/842

Closes #18163.
---
 src/msw/toplevel.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 8ad7391d09..a7d4bac9b6 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -648,9 +648,14 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
 
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
-    return IsAlwaysMaximized() ||
-           (::IsZoomed(GetHwnd()) != 0) ||
-           m_showCmd == SW_MAXIMIZE;
+    if ( IsAlwaysMaximized() )
+        return true;
+
+    // If the window is shown, just ask Windows if it's maximized. But hidden
+    // windows are not really maximized, even after Maximize() is called on
+    // them, so for them we check if we're scheduled to maximize the window
+    // when it's shown instead.
+    return IsShown() ? ::IsZoomed(GetHwnd()) != 0 : m_showCmd == SW_MAXIMIZE;
 }
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)

From 858b5e72220c084c9c56f5aad37eb6512818af52 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Fri, 6 Jul 2018 22:56:55 +0200
Subject: [PATCH 714/916] Prevent losing the focus by active editor when error
 dialog box is closed

Displaying error dialog can cause on some platforms native focus changes
what triggers unwanted focus change events in wxPG and disturbs expected
sequence of events. To prevent this from happening (regardless of platform),
we need to save focused window before dialog box is displayed and restore
it after closing the dialog.

Closes #18046.
---
 src/propgrid/propgrid.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index d2509b993a..0c00b79ee1 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3280,12 +3280,22 @@ bool wxPropertyGrid::DoOnValidationFailure( wxPGProperty* property, wxVariant& W
         }
     #endif
 
+        // Displaying error dialog box can cause (native) focus changes
+        // so let's preserve the current focus in order to restore it afterwards.
+        wxWindow* focusedWnd = wxWindow::FindFocus();
+
         if ( vfb & wxPG_VFB_SHOW_MESSAGE )
             DoShowPropertyError(property, msg);
 
         if ( vfb & wxPG_VFB_SHOW_MESSAGEBOX )
             /* TRANSLATORS: Caption of message box displaying any property error */
             ::wxMessageBox(msg, _("Property Error"));
+
+        // Restore the focus
+        if ( focusedWnd )
+        {
+            focusedWnd->SetFocus();
+        }
     }
 
     return (vfb & wxPG_VFB_STAY_IN_PROPERTY) ? false : true;

From 81cac4e46b5b7b92be91f6dfdb960fddfd8bc516 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Fri, 6 Jul 2018 22:57:53 +0200
Subject: [PATCH 715/916] Simplify getting current wxPG editor control

We can just return the pointer, whether it is NULL or not.
---
 src/propgrid/editors.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 4d79629af7..6d4fcbd8fa 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -1776,12 +1776,7 @@ wxPGCheckBoxEditor::~wxPGCheckBoxEditor()
 
 wxWindow* wxPropertyGrid::GetEditorControl() const
 {
-    wxWindow* ctrl = m_wndEditor;
-
-    if ( !ctrl )
-        return ctrl;
-
-    return ctrl;
+    return  m_wndEditor;
 }
 
 // -----------------------------------------------------------------------

From df4d1d456f38fdda6e998b8a3f57bb621aaaf6f6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Jul 2018 00:52:26 +0200
Subject: [PATCH 716/916] Make wxSearchCtrl margins proportional to DPI

Use FromDIP() in wxSearchCtrl implementation to make the margins of the
same size, proportionally, at any DPI.
---
 src/generic/srchctlg.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 0bc04c38e0..e5ad2a05d6 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -130,7 +130,7 @@ protected:
         // can't use wxBORDER_NONE to calculate a good height, in which case we just have to
         // assume a border in the code above and then subtract the space that would be taken up
         // by a themed border (the thin blue border and the white internal border).
-        size.y -= 4;
+        size.y -= FromDIP(4);
 
         self->SetWindowStyleFlag(flags);
 
@@ -436,15 +436,15 @@ wxSize wxSearchCtrl::DoGetBestClientSize() const
     if ( m_searchButtonVisible || HasMenu() )
     {
         sizeSearch = m_searchButton->GetBestSize();
-        searchMargin = MARGIN;
+        searchMargin = FromDIP(MARGIN);
     }
     if ( m_cancelButtonVisible )
     {
         sizeCancel = m_cancelButton->GetBestSize();
-        cancelMargin = MARGIN;
+        cancelMargin = FromDIP(MARGIN);
     }
 
-    int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
+    int horizontalBorder = FromDIP(1) + ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
 
     // buttons are square and equal to the height of the text control
     int height = sizeText.y;
@@ -470,7 +470,7 @@ void wxSearchCtrl::LayoutControls()
 
     wxSize sizeText = m_text->GetBestSize();
     // make room for the search menu & clear button
-    int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
+    int horizontalBorder = FromDIP(1) + ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
     int x = horizontalBorder;
     width -= horizontalBorder*2;
     if (width < 0) width = 0;
@@ -482,12 +482,12 @@ void wxSearchCtrl::LayoutControls()
     if ( m_searchButtonVisible || HasMenu() )
     {
         sizeSearch = m_searchButton->GetBestSize();
-        searchMargin = MARGIN;
+        searchMargin = FromDIP(MARGIN);
     }
     if ( m_cancelButtonVisible )
     {
         sizeCancel = m_cancelButton->GetBestSize();
-        cancelMargin = MARGIN;
+        cancelMargin = FromDIP(MARGIN);
     }
     m_searchButton->Show( m_searchButtonVisible || HasMenu() );
     m_cancelButton->Show( m_cancelButtonVisible );
@@ -499,7 +499,7 @@ void wxSearchCtrl::LayoutControls()
         searchMargin = 0;
         cancelMargin = 0;
     }
-    wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - 1;
+    wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - FromDIP(1);
     if (textWidth < 0) textWidth = 0;
 
     // position the subcontrols inside the client area
@@ -514,7 +514,7 @@ void wxSearchCtrl::LayoutControls()
     // of the white border that's part of the theme border. We can also remove a pixel from
     // the height to fit the text control in, because the padding in EDIT_HEIGHT_FROM_CHAR_HEIGHT
     // is already generous.
-    int textY = 1;
+    int textY = FromDIP(1);
 #else
     int textY = 0;
 #endif
@@ -1167,7 +1167,7 @@ void wxSearchCtrl::RecalcBitmaps()
     }
     wxSize sizeText = m_text->GetBestSize();
 
-    int bitmapHeight = sizeText.y - 4;
+    int bitmapHeight = sizeText.y - FromDIP(4);
     int bitmapWidth  = sizeText.y * 20 / 14;
 
     if ( !m_searchBitmapUser )

From 6ed3865925c3571167e572823d1d786178101c69 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Jul 2018 00:54:30 +0200
Subject: [PATCH 717/916] Remove commented out stream operations in
 wxSearchCtrl

Just remove unused and unnecessary declarations.
---
 include/wx/generic/srchctlg.h | 17 -----------------
 src/generic/srchctlg.cpp      | 17 -----------------
 2 files changed, 34 deletions(-)

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index 188a92aa2e..a8d2aab843 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -172,23 +172,6 @@ public:
     virtual bool DoAutoCompleteFileNames(int flags) wxOVERRIDE;
     virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE;
 
-#if 0
-
-    // override streambuf method
-#if wxHAS_TEXT_WINDOW_STREAM
-    int overflow(int i);
-#endif // wxHAS_TEXT_WINDOW_STREAM
-
-    // stream-like insertion operators: these are always available, whether we
-    // were, or not, compiled with streambuf support
-    wxTextCtrl& operator<<(const wxString& s);
-    wxTextCtrl& operator<<(int i);
-    wxTextCtrl& operator<<(long i);
-    wxTextCtrl& operator<<(float f);
-    wxTextCtrl& operator<<(double d);
-    wxTextCtrl& operator<<(wxChar c);
-#endif
-
     // do the window-specific processing after processing the update event
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE;
 
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index e5ad2a05d6..eefc469fb9 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -883,23 +883,6 @@ void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
     }
 }
 
-#if 0
-
-// override streambuf method
-#if wxHAS_TEXT_WINDOW_STREAM
-int overflow(int i);
-#endif // wxHAS_TEXT_WINDOW_STREAM
-
-// stream-like insertion operators: these are always available, whether we
-// were, or not, compiled with streambuf support
-wxTextCtrl& operator<<(const wxString& s);
-wxTextCtrl& operator<<(int i);
-wxTextCtrl& operator<<(long i);
-wxTextCtrl& operator<<(float f);
-wxTextCtrl& operator<<(double d);
-wxTextCtrl& operator<<(const wxChar c);
-#endif
-
 // Note that overriding DoSetValue() is currently insufficient because the base
 // class ChangeValue() only updates m_hintData of this object (which is null
 // anyhow), instead of updating m_text->m_hintData, see #16998.

From 18899ce4bca3036144ad32ca4ddbe211572dc2da Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Jul 2018 00:55:35 +0200
Subject: [PATCH 718/916] Replace WXMAX() macro in wxSearchCtrl code with
 wxMax()

Don't invent yet another std::max-macro. We probably could just use the
standard function instead but for now use wxMax(), for consistency with
the rest of the code base.

No real changes.
---
 src/generic/srchctlg.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index eefc469fb9..6659dc6bd3 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -28,8 +28,7 @@
 #if !wxUSE_NATIVE_SEARCH_CONTROL
 
 #include "wx/image.h"
-
-#define WXMAX(a,b) ((a)>(b)?(a):(b))
+#include "wx/utils.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -1013,7 +1012,7 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
     mem.SetPen( wxPen(fg) );
     mem.SetBrush( wxBrush(fg) );
     int handleCornerShift = penWidth * 707 / 1000 / 2; // 707 / 1000 = 0.707 = 1/sqrt(2);
-    handleCornerShift = WXMAX( handleCornerShift, 1 );
+    handleCornerShift = wxMax( handleCornerShift, 1 );
     int handleBase = 4 * x / 20;
     int handleLength = 2*handleBase+1;
     wxPoint handlePolygon[] =
@@ -1112,7 +1111,7 @@ wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y )
     mem.SetPen( wxPen(bg) );
     mem.SetBrush( wxBrush(bg) );
     int handleCornerShift = penWidth/2;
-    handleCornerShift = WXMAX( handleCornerShift, 1 );
+    handleCornerShift = wxMax( handleCornerShift, 1 );
     wxPoint handlePolygon[] =
     {
         wxPoint(-handleCornerShift,+handleCornerShift),

From 03b7491beaca148aaa25f66348da08ad6e84fd3f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Jul 2018 00:57:44 +0200
Subject: [PATCH 719/916] Remove unnecessary DoUpdateWindowUI() override in
 wxSearchCtrl

There is no need to override this virtual method just to call the base
class version.
---
 include/wx/generic/srchctlg.h | 3 ---
 src/generic/srchctlg.cpp      | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index a8d2aab843..7ac2878698 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -172,9 +172,6 @@ public:
     virtual bool DoAutoCompleteFileNames(int flags) wxOVERRIDE;
     virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE;
 
-    // do the window-specific processing after processing the update event
-    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE;
-
     virtual bool ShouldInheritColours() const wxOVERRIDE;
 
     // wxWindow overrides
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 6659dc6bd3..3eba2795d5 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -905,12 +905,6 @@ bool wxSearchCtrl::DoSaveFile(const wxString& file, int fileType)
     return m_text->DoSaveFile(file, fileType);
 }
 
-// do the window-specific processing after processing the update event
-void wxSearchCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
-{
-    wxSearchCtrlBase::DoUpdateWindowUI(event);
-}
-
 bool wxSearchCtrl::ShouldInheritColours() const
 {
     return true;

From 0ee25cce3aa5e00b7426534f74d2b2c41f86f917 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 7 Jul 2018 20:28:11 +0200
Subject: [PATCH 720/916] Don't use external flag to determine if wxPG header
 is visible

Check if wxPG header really exists and is visible prior to any operation.

Closes #18128.
---
 src/propgrid/manager.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 40e5ca82cb..8ddd16cce5 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -812,7 +812,7 @@ bool wxPropertyGridManager::DoSelectPage( int index )
 #endif
 
 #if wxUSE_HEADERCTRL
-    if ( m_showHeader )
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
         m_pHeaderCtrl->OnPageChanged(nextPage);
 #endif
 
@@ -929,7 +929,7 @@ void wxPropertyGridManager::SetColumnCount( int colCount, int page )
     GetGrid()->Refresh();
 
 #if wxUSE_HEADERCTRL
-    if ( m_showHeader )
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
         m_pHeaderCtrl->OnPageUpdated();
 #endif
 }
@@ -1347,7 +1347,7 @@ void wxPropertyGridManager::RecalculatePositions( int width, int height )
 
     // Header comes after the tool bar
 #if wxUSE_HEADERCTRL
-    if ( m_showHeader )
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
     {
         m_pHeaderCtrl->SetSize(0, propgridY, width, wxDefaultCoord);
         propgridY += m_pHeaderCtrl->GetSize().y;
@@ -1900,7 +1900,7 @@ void wxPropertyGridManager::SetSplitterLeft( bool subProps, bool allPages )
     }
 
 #if wxUSE_HEADERCTRL
-    if ( m_showHeader )
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
         m_pHeaderCtrl->OnColumWidthsChanged();
 #endif
 }
@@ -1920,7 +1920,7 @@ void wxPropertyGridManager::SetPageSplitterLeft(int page, bool subProps)
         SetPageSplitterPosition( page, maxW );
 
 #if wxUSE_HEADERCTRL
-        if ( m_showHeader )
+        if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
             m_pHeaderCtrl->OnColumWidthsChanged();
 #endif
     }
@@ -1966,10 +1966,8 @@ void
 wxPropertyGridManager::OnPGColDrag( wxPropertyGridEvent& WXUNUSED(event) )
 {
 #if wxUSE_HEADERCTRL
-    if ( !m_showHeader )
-        return;
-
-    m_pHeaderCtrl->OnColumWidthsChanged();
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
+        m_pHeaderCtrl->OnColumWidthsChanged();
 #endif
 }
 
@@ -2005,7 +2003,7 @@ void wxPropertyGridManager::OnResize( wxSizeEvent& WXUNUSED(event) )
     }
 
 #if wxUSE_HEADERCTRL
-    if ( m_showHeader )
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
         m_pHeaderCtrl->OnColumWidthsChanged();
 #endif
 }
@@ -2148,7 +2146,7 @@ void wxPropertyGridManager::SetSplitterPosition( int pos, int splitterColumn )
     }
 
 #if wxUSE_HEADERCTRL
-    if ( m_showHeader )
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
         m_pHeaderCtrl->OnColumWidthsChanged();
 #endif
 }
@@ -2162,7 +2160,7 @@ void wxPropertyGridManager::SetPageSplitterPosition( int page,
     GetPage(page)->DoSetSplitterPosition( pos, column );
 
 #if wxUSE_HEADERCTRL
-    if ( m_showHeader )
+    if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
         m_pHeaderCtrl->OnColumWidthsChanged();
 #endif
 }

From 54c5584c65e6e400261414ebd4f1bb3d7bbcca78 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 7 Jul 2018 20:29:37 +0200
Subject: [PATCH 721/916] Don't set column title if wxPG header is going to be
 hidden

wxPropertyGridManager::SetColumnTitle() shouldn't be called when we going
to hide the header because it makes the header visible.
---
 samples/propgrid/propgrid.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 4638bac948..5112f5a7e3 100644
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -2703,8 +2703,12 @@ void FormMain::OnEnableLabelEditing(wxCommandEvent& event)
 #if wxUSE_HEADERCTRL
 void FormMain::OnShowHeader( wxCommandEvent& event )
 {
-    m_pPropGridManager->ShowHeader(event.IsChecked());
-    m_pPropGridManager->SetColumnTitle(2, wxT("Units"));
+    bool show = event.IsChecked();
+    m_pPropGridManager->ShowHeader(show);
+    if ( show )
+    {
+        m_pPropGridManager->SetColumnTitle(2, wxT("Units"));
+    }
 }
 #endif // wxUSE_HEADERCTRL
 

From 42932d46709810737be151167419b0908f1518aa Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 7 Jul 2018 20:30:38 +0200
Subject: [PATCH 722/916] Limit the scope of a temporary variable

---
 src/propgrid/manager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index 8ddd16cce5..67edffed93 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -1630,11 +1630,10 @@ void wxPropertyGridManager::RecreateControls()
 #if wxUSE_HEADERCTRL
     if ( m_showHeader )
     {
-        wxPGHeaderCtrl* hc;
 
         if ( !m_pHeaderCtrl )
         {
-            hc = new wxPGHeaderCtrl(this);
+            wxPGHeaderCtrl* hc = new wxPGHeaderCtrl(this);
             hc->Create(this, wxID_ANY);
             m_pHeaderCtrl = hc;
         }

From 7f1d08d5bd5681d1a79ea2f0e2a7fa3c8fa10b1b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 00:36:15 +0200
Subject: [PATCH 723/916] Ignore all changes to g++ ABI version since 1002

Checking for the exact match of __GXX_ABI_VERSION created more problems
(including for both Fedora and Debian packagers, see
https://github.com/wxWidgets/wxWidgets/pull/828) than it solved
(approximately 0), so relax it and assume that future g++ versions will
remain broadly compatible with the current ABI, which seems like a safe
assumption so far.

It's not really clear if there is any value in having this ABI check at
all, or if we should remove CheckBuildOptions() and all the code calling
it entirely, as it seems that there is no way to trigger this check
during run-time without getting a link error first. But keep it for now,
just because it's simpler to keep it than to remove it.
---
 include/wx/build.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/wx/build.h b/include/wx/build.h
index 82c38a29b5..43f43cbf68 100644
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -52,17 +52,18 @@
 // GCC and Intel C++ share same C++ ABI (and possibly others in the future),
 // check if compiler versions are compatible:
 #if defined(__GXX_ABI_VERSION)
-    // The changes between ABI versions 1002 through 1011 (documented at
-    // https://gcc.gnu.org/onlinedocs/gcc/C_002b_002b-Dialect-Options.html
-    // under -fabi-version) don't affect wxWidgets, so we allow a library
-    // and an application to differ within that range.
-    #if ((__GXX_ABI_VERSION >= 1002) && (__GXX_ABI_VERSION <= 1011))
-        #define wxGXX_EFFECTIVE_ABI_VERSION 1002
+    // All the changes since ABI version 1002 so far have been insignificant,
+    // so just check for this value, first used for g++ 3.4 and used by default
+    // by all g++ 4 versions, as checking for the exact ABI version simply
+    // results in run-time breakage whenever a new gcc version is released,
+    // even if there are no real problems.
+    #if __GXX_ABI_VERSION >= 1002
+        #define __WX_BO_COMPILER \
+                ",compiler with C++ ABI compatible with gcc 4"
     #else
-        #define wxGXX_EFFECTIVE_ABI_VERSION __GXX_ABI_VERSION
+        #define __WX_BO_COMPILER \
+                ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
     #endif
-    #define __WX_BO_COMPILER \
-            ",compiler with C++ ABI " __WX_BO_STRINGIZE(wxGXX_EFFECTIVE_ABI_VERSION)
 #elif defined(__GNUG__)
     #define __WX_BO_COMPILER ",GCC " \
             __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)

From 587e0d8e64e08d745f8acddaca6050879f2dd243 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 14:37:43 +0200
Subject: [PATCH 724/916] Fix search button height in generic wxSearchCtrl

Make this button of exactly the bitmap size instead of using the full
control height for it, even if/when the bitmap is smaller.

This fixes some random junk being shown in the bottom two pixels of the
search button sometimes: this was due to only redrawing the part covered
by the bitmap in wxSearchButton::OnPaint(), leaving the rest of the
button unpainted (because wxSearchButton uses wxBG_STYLE_PAINT).
---
 src/generic/srchctlg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 3eba2795d5..c9ea71e5d2 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -504,7 +504,7 @@ void wxSearchCtrl::LayoutControls()
     // position the subcontrols inside the client area
 
     m_searchButton->SetSize(x, (height - sizeSearch.y) / 2,
-                            sizeSearch.x, height);
+                            sizeSearch.x, sizeSearch.y);
     x += sizeSearch.x;
     x += searchMargin;
 

From ed8ac7059c65bf60f9fff07f7a3a209168273faf Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 16:50:10 +0200
Subject: [PATCH 725/916] Use more descriptive symbolic constants in
 wxSearchCtrl code

Replace LIGHT_STEP macro and 20 magic number with
SEARCH_BITMAP_LIGHTNESS and CANCEL_BITMAP_LIGHTNESS constants which are
a bit more clear, hopefully.

No real changes.
---
 src/generic/srchctlg.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index c9ea71e5d2..9482c1e3c1 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -37,7 +37,10 @@
 // the margin between the text control and the search/cancel buttons
 static const wxCoord MARGIN = 2;
 
-#define LIGHT_STEP 160
+// arguments to wxColour::ChangeLightness() for making the search/cancel
+// bitmaps foreground colour, respectively
+static const int SEARCH_BITMAP_LIGHTNESS = 140; // slightly lighter
+static const int CANCEL_BITMAP_LIGHTNESS = 160; // a bit more lighter
 
 // ----------------------------------------------------------------------------
 // wxSearchTextCtrl: text control used by search control
@@ -952,7 +955,7 @@ static void RescaleBitmap(wxBitmap& bmp, const wxSize& sizeNeeded)
 wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
 {
     wxColour bg = GetBackgroundColour();
-    wxColour fg = GetForegroundColour().ChangeLightness(LIGHT_STEP-20);
+    wxColour fg = GetForegroundColour().ChangeLightness(SEARCH_BITMAP_LIGHTNESS);
 
     //===============================================================================
     // begin drawing code
@@ -1055,7 +1058,7 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
 wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y )
 {
     wxColour bg = GetBackgroundColour();
-    wxColour fg = GetForegroundColour().ChangeLightness(LIGHT_STEP);
+    wxColour fg = GetForegroundColour().ChangeLightness(CANCEL_BITMAP_LIGHTNESS);
 
     //===============================================================================
     // begin drawing code

From 67bceedfdab3b9ad8163d0ad75fdbae5163b69fd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 17:12:02 +0200
Subject: [PATCH 726/916] Get rid of m_searchButtonVisible and
 m_cancelButtonVisible

There doesn't seem to be any reason to have these flags, which duplicate
the visibility state of m_searchButton and m_cancelButton respectively.

Also update the buttons visibility immediately in ShowSearchButton() and
ShowCancelButton() instead of doing it in LayoutControls() as before,
which was confusing as laying out is not supposed to show/hide anything.

Finally, return true, not false, from IsSearchButtonVisible() if the
button is actually visible because there is an associated menu, even if
ShowSearchButton(false) had been called. This seems more logical and
makes the code simpler, but we need to check whether the native Mac
version also behaves like this or not.

No other changes in behaviour.
---
 include/wx/generic/srchctlg.h |  3 --
 src/generic/srchctlg.cpp      | 61 ++++++++++++++++++++++-------------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index 7ac2878698..996f4e8560 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -237,9 +237,6 @@ private:
     wxMenu *m_menu;
 #endif // wxUSE_MENUS
 
-    bool m_searchButtonVisible;
-    bool m_cancelButtonVisible;
-
     bool m_searchBitmapUser;
     bool m_cancelBitmapUser;
 #if wxUSE_MENUS
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 9482c1e3c1..455dd1efa6 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -284,9 +284,6 @@ void wxSearchCtrl::Init()
     m_menu = NULL;
 #endif // wxUSE_MENUS
 
-    m_searchButtonVisible = true;
-    m_cancelButtonVisible = false;
-
     m_searchBitmapUser = false;
     m_cancelBitmapUser = false;
 #if wxUSE_MENUS
@@ -313,9 +310,6 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
     m_searchButton = new wxSearchButton(this,
                                         wxEVT_SEARCH,
                                         m_searchBitmap);
-    m_cancelButton = new wxSearchButton(this,
-                                        wxEVT_SEARCH_CANCEL,
-                                        m_cancelBitmap);
 
     SetBackgroundColour( m_text->GetBackgroundColour() );
     m_text->SetBackgroundColour(wxColour());
@@ -354,13 +348,14 @@ void wxSearchCtrl::SetMenu( wxMenu* menu )
 
     if ( m_menu && !hadMenu )
     {
+        m_searchButton->Show();
         m_searchButton->SetBitmapLabel(m_searchMenuBitmap);
         m_searchButton->Refresh();
     }
     else if ( !m_menu && hadMenu )
     {
         m_searchButton->SetBitmapLabel(m_searchBitmap);
-        if ( m_searchButtonVisible )
+        if ( m_searchButton->IsShown() )
         {
             m_searchButton->Refresh();
         }
@@ -377,15 +372,23 @@ wxMenu* wxSearchCtrl::GetMenu()
 
 void wxSearchCtrl::ShowSearchButton( bool show )
 {
-    if ( m_searchButtonVisible == show )
+    if ( show == IsSearchButtonVisible() )
     {
         // no change
         return;
     }
-    m_searchButtonVisible = show;
-    if ( m_searchButtonVisible )
+    if ( show )
     {
         RecalcBitmaps();
+
+        m_searchButton->Show();
+    }
+    else // Requested to hide it.
+    {
+        // Only hide the button if we don't need it for the menu, otherwise it
+        // needs to remain shown.
+        if ( !HasMenu() )
+            m_searchButton->Hide();
     }
 
     LayoutControls();
@@ -393,25 +396,36 @@ void wxSearchCtrl::ShowSearchButton( bool show )
 
 bool wxSearchCtrl::IsSearchButtonVisible() const
 {
-    return m_searchButtonVisible;
+    return m_searchButton->IsShown() || HasMenu();
 }
 
 
 void wxSearchCtrl::ShowCancelButton( bool show )
 {
-    if ( m_cancelButtonVisible == show )
+    if ( show == IsCancelButtonVisible() )
     {
         // no change
         return;
     }
-    m_cancelButtonVisible = show;
+
+    // This button is not shown initially, so create it on demand if necessary,
+    // i.e. if it's the first time we show it.
+    if ( !m_cancelButton )
+    {
+        m_cancelButton = new wxSearchButton(this,
+                                            wxEVT_SEARCH_CANCEL,
+                                            m_cancelBitmap);
+        RecalcBitmaps();
+    }
+
+    m_cancelButton->Show(show);
 
     LayoutControls();
 }
 
 bool wxSearchCtrl::IsCancelButtonVisible() const
 {
-    return m_cancelButtonVisible;
+    return m_cancelButton && m_cancelButton->IsShown();
 }
 
 void wxSearchCtrl::SetDescriptiveText(const wxString& text)
@@ -435,12 +449,12 @@ wxSize wxSearchCtrl::DoGetBestClientSize() const
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;
-    if ( m_searchButtonVisible || HasMenu() )
+    if ( IsSearchButtonVisible() )
     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = FromDIP(MARGIN);
     }
-    if ( m_cancelButtonVisible )
+    if ( IsCancelButtonVisible() )
     {
         sizeCancel = m_cancelButton->GetBestSize();
         cancelMargin = FromDIP(MARGIN);
@@ -481,18 +495,16 @@ void wxSearchCtrl::LayoutControls()
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;
-    if ( m_searchButtonVisible || HasMenu() )
+    if ( IsSearchButtonVisible() )
     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = FromDIP(MARGIN);
     }
-    if ( m_cancelButtonVisible )
+    if ( IsCancelButtonVisible() )
     {
         sizeCancel = m_cancelButton->GetBestSize();
         cancelMargin = FromDIP(MARGIN);
     }
-    m_searchButton->Show( m_searchButtonVisible || HasMenu() );
-    m_cancelButton->Show( m_cancelButtonVisible );
 
     if ( sizeSearch.x + sizeCancel.x > width )
     {
@@ -525,8 +537,11 @@ void wxSearchCtrl::LayoutControls()
     x += textWidth;
     x += cancelMargin;
 
-    m_cancelButton->SetSize(x, (height - sizeCancel.y) / 2,
-                            sizeCancel.x, height);
+    if ( m_cancelButton )
+    {
+        m_cancelButton->SetSize(x, (height - sizeCancel.y) / 2,
+                                sizeCancel.x, height);
+    }
 }
 
 wxWindowList wxSearchCtrl::GetCompositeWindowParts() const
@@ -1185,7 +1200,7 @@ void wxSearchCtrl::RecalcBitmaps()
     }
 #endif // wxUSE_MENUS
 
-    if ( !m_cancelBitmapUser )
+    if ( m_cancelButton && !m_cancelBitmapUser )
     {
         if (
             !m_cancelBitmap.IsOk() ||

From c713bee7ea726a46a19f6d6c7676f19f0157bcb6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 17:54:09 +0200
Subject: [PATCH 727/916] Remove unnecessary wxSearchCtrl::DoMoveWindow()
 override

There is no need to override this virtual function, if the control size
changes, a wxEVT_SIZE event is generated in any case, resulting in a
call to LayoutControls() without explicitly calling it from here.
---
 include/wx/generic/srchctlg.h | 1 -
 src/generic/srchctlg.cpp      | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index 996f4e8560..79151ea5af 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -194,7 +194,6 @@ protected:
 
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
-    virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
 
     virtual void RecalcBitmaps();
 
diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 455dd1efa6..15a99c0927 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -468,13 +468,6 @@ wxSize wxSearchCtrl::DoGetBestClientSize() const
                   height);
 }
 
-void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height)
-{
-    wxSearchCtrlBase::DoMoveWindow(x, y, width, height);
-
-    LayoutControls();
-}
-
 void wxSearchCtrl::LayoutControls()
 {
     if ( !m_text )

From 9f04318720729dec8ca875a1fbd04c0805a2774a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 20:24:58 +0200
Subject: [PATCH 728/916] Fix MSW EDIT_HEIGHT_FROM_CHAR_HEIGHT() for high DPI

Apply DPI scaling to the extra vertical margin added by this macro to
the font height.

This makes sense and results in wxTextCtrl (and other controls, e.g.
wxSearchCtrl) having the same height as native ones when using high DPI
too.

Note that this required adding wxGetEditHeightFromCharHeight() function
as one of the existing uses of EDIT_HEIGHT_FROM_CHAR_HEIGHT() wasn't
inside a wxWindow-derived class method and also adding wxUSE_GUI guard
around these GUI-only definitions as a function, unlike a macro, can't
be compiled without full wxWindow declaration in scope.
---
 include/wx/msw/private.h | 22 +++++++++++++++++++---
 src/msw/anybutton.cpp    |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 8e10ccd170..9b47c6f528 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -82,19 +82,35 @@ WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
 // misc macros
 // ---------------------------------------------------------------------------
 
+#if wxUSE_GUI
+
 #define MEANING_CHARACTER '0'
 #define DEFAULT_ITEM_WIDTH  100
 #define DEFAULT_ITEM_HEIGHT 80
 
-// Scale font to get edit control height
-//#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (3*(cy)/2)
-#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (cy+8)
+// Return the height of a native text control corresponding to the given
+// character height (as returned by GetCharHeight() or wxGetCharSize()).
+//
+// The wxWindow parameter must be valid and used for getting the DPI.
+inline int wxGetEditHeightFromCharHeight(int cy, const wxWindow* w)
+{
+    // The value 8 here is empiric, i.e. it's not necessarily correct, but
+    // seems to work relatively well.
+    return cy + w->FromDIP(8);
+}
+
+// Compatibility macro used in the existing code. It assumes that it's called
+// from a method of wxWindow-derived object.
+#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) \
+    wxGetEditHeightFromCharHeight((cy), this)
 
 // Generic subclass proc, for panel item moving/sizing and intercept
 // EDIT control VK_RETURN messages
 extern LONG APIENTRY
   wxSubclassedGenericControlProc(WXHWND hWnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
+#endif // wxUSE_GUI
+
 // ---------------------------------------------------------------------------
 // useful macros and functions
 // ---------------------------------------------------------------------------
diff --git a/src/msw/anybutton.cpp b/src/msw/anybutton.cpp
index 85a7a79062..a589aed3d7 100644
--- a/src/msw/anybutton.cpp
+++ b/src/msw/anybutton.cpp
@@ -441,7 +441,7 @@ wxSize wxMSWButton::IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size
         // so make them as high as it.
         int yText;
         wxGetCharSize(GetHwndOf(btn), NULL, &yText, btn->GetFont());
-        yText = EDIT_HEIGHT_FROM_CHAR_HEIGHT(yText);
+        yText = wxGetEditHeightFromCharHeight(yText, btn);
 
         sizeBtn.IncTo(wxSize(-1, yText));
     }

From 50aee9a0b32d313eefb0cd666240ed2000b2e1eb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 20:35:42 +0200
Subject: [PATCH 729/916] Fix default size for wxSpinCtrl in high DPI

DEFAULT_ITEM_WIDTH is a constant, use FromDIP() around it to avoid
creating too narrow controls when using high DPI.
---
 src/msw/spinctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 1e4e09cd46..fbb9e2b387 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -726,7 +726,7 @@ int wxSpinCtrl::GetOverlap() const
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
-    return DoGetSizeFromTextSize(DEFAULT_ITEM_WIDTH);
+    return DoGetSizeFromTextSize(FromDIP(DEFAULT_ITEM_WIDTH));
 }
 
 wxSize wxSpinCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const

From a38176c67a63ce925a591f3d8514f45eccc4d27b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 20:36:16 +0200
Subject: [PATCH 730/916] Make wxTextCtrl horizontal margins proportional to
 DPI

Add more FromDIP() calls.
---
 src/msw/textctrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 7005edc332..ec96a10635 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -2429,7 +2429,7 @@ wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
-    DWORD wText = 1;
+    DWORD wText = FromDIP(1);
     ::SystemParametersInfo(SPI_GETCARETWIDTH, 0, &wText, 0);
     wText += xlen;
 
@@ -2464,7 +2464,7 @@ wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
     // stand out).
     if ( !HasFlag(wxBORDER_NONE) )
     {
-        wText += 9; // borders and inner margins
+        wText += FromDIP(9); // borders and inner margins
 
         // we have to add the adjustments for the control height only once, not
         // once per line, so do it after multiplication above

From 4d4e95849a0f973f5827e65807bf643da3ac2d57 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 20:50:22 +0200
Subject: [PATCH 731/916] Fix size of wxSearchCtrl in the widgets sample in
 high DPI

Add missing FromDIP(), without it the control was too small.
---
 samples/widgets/searchctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index 623d2b92e3..a4607cafa7 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -178,7 +178,7 @@ void SearchCtrlWidgetsPage::CreateControl()
     long style = GetAttrs().m_defaultFlags;
 
     m_srchCtrl = new wxSearchCtrl(this, -1, wxEmptyString, wxDefaultPosition,
-                                  wxSize(150, -1), style);
+                                  FromDIP(wxSize(150, -1)), style);
 
     m_srchCtrl->Bind(wxEVT_SET_FOCUS, &SearchCtrlWidgetsPage::OnSetFocus, this);
     m_srchCtrl->Bind(wxEVT_KILL_FOCUS, &SearchCtrlWidgetsPage::OnKillFocus, this);

From 42ab122912ce2a04c754f97367e706b28898a01e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 20:50:48 +0200
Subject: [PATCH 732/916] Shift the text control another pixel down in MSW
 wxSearchCtrl

It was too high otherwise, which was especially noticeable in high DPI.

This is still not perfect, as the default search bitmap is not centered
neither and is a couple of pixels too high, but better than before.
---
 src/generic/srchctlg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 15a99c0927..e6cc4b1977 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -521,7 +521,7 @@ void wxSearchCtrl::LayoutControls()
     // of the white border that's part of the theme border. We can also remove a pixel from
     // the height to fit the text control in, because the padding in EDIT_HEIGHT_FROM_CHAR_HEIGHT
     // is already generous.
-    int textY = FromDIP(1);
+    int textY = FromDIP(2);
 #else
     int textY = 0;
 #endif

From 24820a5a672cc1472a8600791e6aa9b4ba98d5c6 Mon Sep 17 00:00:00 2001
From: Anil <anilkumar8753@gmail.com>
Date: Tue, 10 Jul 2018 11:31:54 +0530
Subject: [PATCH 733/916] Invalidate "hover" column index in wxHeaderCtrl if
 necessary

Don't leave "m_hover" invalid if the number of columns in wxHeaderCtrl
is reduced, as this would result in a crash later when it is used.

This notably fixes a crash after removing the last column from generic
wxDataViewCtrl.

Closes https://github.com/wxWidgets/wxWidgets/pull/852
---
 src/generic/headerctrlg.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index e723d677b3..7382fb47ad 100644
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -93,6 +93,11 @@ void wxHeaderCtrl::DoSetCount(unsigned int count)
 
     m_numColumns = count;
 
+    // don't leave the column index invalid, this would cause a crash later if
+    // it is used from OnMouse()
+    if ( m_hover >= count )
+        m_hover = COL_NONE;
+
     InvalidateBestSize();
     Refresh();
 }

From a1e780f1b4dd55053df8f1bb6dd4c9c41978b897 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Jul 2018 12:42:51 +0200
Subject: [PATCH 734/916] Remove mention of wxEVENTS_COMPATIBILITY_2_8 from the
 docs

This macro doesn't exist any more since almost 10 years (see commit
890d70ebeaf39ee13012d22751d64d8de070275c).
---
 interface/wx/event.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/interface/wx/event.h b/interface/wx/event.h
index 7272ace498..b58fdc4a3c 100644
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -4762,14 +4762,12 @@ wxEventType wxNewEventType();
 /**
     Helper macro for definition of custom event table macros.
 
-    This macro must only be used if wxEVENTS_COMPATIBILITY_2_8 is 1, otherwise
-    it is better and more clear to just use the address of the function
-    directly as this is all this macro does in this case. However it needs to
-    explicitly cast @a func to @a functype, which is the type of wxEvtHandler
-    member function taking the custom event argument when
-    wxEVENTS_COMPATIBILITY_2_8 is 0.
+    This macro casts the given event handler to the given function type using
+    @c static_cast to ensure that the actual handler is indeed compatible with
+    it, before (unsafely) casting it to a generic function pointer used by the
+    event tables.
 
-    See wx__DECLARE_EVT0 for an example of use.
+    See wx__DECLARE_EVT1 for an example of use.
 
     @see @ref overview_events_custom_ownclass
  */

From b6fde56e2e72f2fed345aa100162ecaf28e06978 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Jul 2018 14:37:31 +0200
Subject: [PATCH 735/916] Allow "hint" property for wxSearchCtrl in the XRC
 schema

This should have been part of 652b4eb8ed940f1a57e38d4b9d949b34e886d53d
---
 misc/schema/xrc_schema.rnc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index c9c3f0d69e..aecec55134 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -1446,7 +1446,8 @@ wxSearchCtrl =
         attribute class { "wxSearchCtrl" } &
         stdObjectNodeAttributes &
         stdWindowProperties &
-        [xrc:p="o"] element value {_, t_text }*
+        [xrc:p="o"] element value {_, t_text }* &
+        [xrc:p="o"] element hint      {_, t_text }*
     }
 
 

From cf966718e6ca7ce52593393237a04db9dc896b78 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Jul 2018 14:38:29 +0200
Subject: [PATCH 736/916] Add "hint" property support to XRC for wxComboBox too

It supports hints, as any/most wxTextEntry-derived classes.
---
 docs/changes.txt           | 1 +
 misc/schema/xrc_schema.rnc | 1 +
 src/xrc/xh_combo.cpp       | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index 850405d9ca..4762e4888a 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -100,6 +100,7 @@ All (GUI):
 - Make wxRibbonButtonBar buttons more customizable (Max Maisel).
 - Add wxHtmlEasyPrinting::SetPromptMode() (pavel-t).
 - Fix possible infinite loop in wxHtmlWindow layout (trivia21).
+- Add "hint" property support to XRC for wxComboBox and wxSearchCtrl.
 
 wxGTK:
 
diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
index aecec55134..c0d60d10ef 100644
--- a/misc/schema/xrc_schema.rnc
+++ b/misc/schema/xrc_schema.rnc
@@ -829,6 +829,7 @@ wxComboBox =
         stdWindowProperties &
         [xrc:p="o"] element selection {_, t_integer }* &
         [xrc:p="o"] element value     {_, t_string }* &
+        [xrc:p="o"] element hint      {_, t_text }* &
         element content {
             platform,
             element item {_, t_text }*
diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index e0f672ebe4..ceda6f003e 100644
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -67,6 +67,10 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
 
         SetupWindow(control);
 
+        const wxString hint = GetText(wxS("hint"));
+        if ( !hint.empty() )
+            control->SetHint(hint);
+
         strList.Clear();    // dump the strings
 
         return control;

From a0298f3149284df19087eb4f2e5394956626881f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 4 Jul 2018 19:38:10 +0200
Subject: [PATCH 737/916] Only drain all pending events when exiting outermost
 wxEventLoop

This is especially important under MSW, where the modality of the nested
event loops actually ends as soon as wxModalEventLoop::Exit() is called,
and so we must avoid dispatching any events in the current loop after it
happens or we risk reentering the same loop again, which could result in
e.g. parent modal dialog being closed before the child event loop
returns (because the event closing the former was dispatched from the
latter) and other unexpected sequences of events.

To prevent this from happening, only dispatch pending events after the
loop exit if it's the outermost loop, as there should be no danger in
doing it in this case. Conversely, we don't lose anything by not doing
this in nested event loops as the outer loop will take care of any
remaining pending events anyhow.

To make this work in an ABI-compatible way, add a global counter of the
currently existing event loops which is used to check if there is more
than one event loop currently running.

Closes #11273, #11573, #11269.
---
 include/wx/evtloop.h      |  5 +----
 src/common/evtloopcmn.cpp | 44 ++++++++++++++++++++++++++++++---------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index bd50999509..5d6f7cf65b 100644
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -63,11 +63,8 @@
 class WXDLLIMPEXP_BASE wxEventLoopBase
 {
 public:
-    // trivial, but needed (because of wxEventLoopBase) ctor
     wxEventLoopBase();
-
-    // dtor
-    virtual ~wxEventLoopBase() { }
+    virtual ~wxEventLoopBase();
 
     // use this to check whether the event loop was successfully created before
     // using it
diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index 572c29626a..561a0d174f 100644
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -24,6 +24,13 @@
 #include "wx/scopeguard.h"
 #include "wx/apptrait.h"
 #include "wx/private/eventloopsourcesmanager.h"
+
+// Counts currently existing event loops.
+//
+// As wxEventLoop can be only used from the main thread, there is no need to
+// protect accesses to this variable.
+static int gs_eventLoopCount = 0;
+
 // ----------------------------------------------------------------------------
 // wxEventLoopBase
 // ----------------------------------------------------------------------------
@@ -32,12 +39,19 @@ wxEventLoopBase *wxEventLoopBase::ms_activeLoop = NULL;
 
 wxEventLoopBase::wxEventLoopBase()
 {
+    gs_eventLoopCount++;
+
     m_isInsideRun = false;
     m_shouldExit = false;
     m_yieldLevel = 0;
     m_eventsToProcessInsideYield = wxEVT_CATEGORY_ALL;
 }
 
+wxEventLoopBase::~wxEventLoopBase()
+{
+    gs_eventLoopCount--;
+}
+
 bool wxEventLoopBase::IsMain() const
 {
     if (wxTheApp)
@@ -254,32 +268,42 @@ int wxEventLoopManual::DoRun()
                 OnNextIteration();
 
                 // generate and process idle events for as long as we don't
-                // have anything else to do
+                // have anything else to do, but stop doing this if Exit() is
+                // called by one of the idle handlers
                 while ( !m_shouldExit && !Pending() && ProcessIdle() )
                     ;
 
+                // if Exit() was called, don't dispatch any more events here
                 if ( m_shouldExit )
-
                     break;
 
                 // a message came or no more idle processing to do, dispatch
                 // all the pending events and call Dispatch() to wait for the
                 // next message
-                if ( !ProcessEvents() )
-                {
-                    // we got WM_QUIT
+                if ( !ProcessEvents() || m_shouldExit )
                     break;
-                }
             }
 
-            // Process the remaining queued messages, both at the level of the
-            // underlying toolkit level (Pending/Dispatch()) and wx level
-            // (Has/ProcessPendingEvents()).
+            // If we exit the outermost loop, process the remaining queued
+            // messages, both at the level of the underlying toolkit level
+            // (Pending/Dispatch()) and wx level (Has/ProcessPendingEvents()).
             //
-            // We do run the risk of never exiting this loop if pending event
+            // Note that we must not do this for nested modal event loops as,
+            // at least in wxMSW, the modality has already been undone when
+            // Exit() was called, and so we could end up with reentrancies such
+            // as starting another modal event loop before exiting this one.
+            // To avoid this we must not dispatch any events after calling
+            // Exit() and, for the nested loops, there is no real reason to do
+            // it anyhow, as the outer loop will still dispatch them.
+            //
+            // Finally, even when doing this in the outermost loop, there is
+            // still the risk of never exiting this loop if pending event
             // handlers endlessly generate new events but they shouldn't do
             // this in a well-behaved program and we shouldn't just discard the
             // events we already have, they might be important.
+            if ( gs_eventLoopCount != 1 )
+                break;
+
             for ( ;; )
             {
                 bool hasMoreEvents = false;

From 8ebcfebc5c20ca576b6bc7d7b1b256449c5c7412 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 00:00:27 +0200
Subject: [PATCH 738/916] Fix wxGTK 1 build after gtk/gtk.h wrapper header
 addition

Changes of c0b0562533609e453b2b0dae25c0780e477b768b to common code broke
wxGTK1 build, as wx/gtk/private/wrapgtk.h is for wxGTK 2+ only.

Fix this by handling wxGTK 1 separately and including gtk/gtk.h directly
for it.

Hopefully this code will be removed, together with the rest of wxGTK1
support, in some not so distant future.
---
 include/wx/gtk1/private/addremovectrl.h | 80 +++++++++++++++++++++++++
 include/wx/private/addremovectrl.h      |  4 +-
 src/aui/dockart.cpp                     |  7 ++-
 src/common/popupcmn.cpp                 |  5 +-
 src/common/utilscmn.cpp                 | 14 +++--
 src/generic/graphicc.cpp                |  4 ++
 src/unix/taskbarx11.cpp                 |  6 +-
 src/unix/utilsx11.cpp                   |  5 ++
 8 files changed, 116 insertions(+), 9 deletions(-)
 create mode 100644 include/wx/gtk1/private/addremovectrl.h

diff --git a/include/wx/gtk1/private/addremovectrl.h b/include/wx/gtk1/private/addremovectrl.h
new file mode 100644
index 0000000000..bce4061df5
--- /dev/null
+++ b/include/wx/gtk1/private/addremovectrl.h
@@ -0,0 +1,80 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/addremovectrl.h
+// Purpose:     GTK specific wxAddRemoveImpl implementation
+// Author:      Vadim Zeitlin
+// Created:     2015-02-05
+// Copyright:   (c) 2015 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_ADDREMOVECTRL_H_
+#define _WX_GTK_PRIVATE_ADDREMOVECTRL_H_
+
+#include "wx/artprov.h"
+#include "wx/bmpbuttn.h"
+#include "wx/toolbar.h"
+
+#include <gtk/gtk.h>
+
+// ----------------------------------------------------------------------------
+// wxAddRemoveImpl
+// ----------------------------------------------------------------------------
+
+class wxAddRemoveImpl : public wxAddRemoveImplBase
+{
+public:
+    wxAddRemoveImpl(wxAddRemoveAdaptor* adaptor,
+                    wxAddRemoveCtrl* parent,
+                    wxWindow* ctrlItems)
+        : wxAddRemoveImplBase(adaptor, parent, ctrlItems),
+          m_tbar(new wxToolBar(parent, wxID_ANY))
+    {
+        m_tbar->AddTool(wxID_ADD, wxString(), GetNamedBitmap("list-add"));
+        m_tbar->AddTool(wxID_REMOVE, wxString(), GetNamedBitmap("list-remove"));
+
+#if defined(__WXGTK3__) && !defined(__WXUNIVERSAL__)
+        // Tweak the toolbar appearance to correspond to how the toolbars used
+        // in other GNOME applications for similar purposes look.
+        GtkToolbar* const toolbar = m_tbar->GTKGetToolbar();
+        GtkStyleContext* context = gtk_widget_get_style_context(GTK_WIDGET(toolbar));
+        gtk_style_context_add_class(context, GTK_STYLE_CLASS_INLINE_TOOLBAR);
+        gtk_style_context_set_junction_sides(context, GTK_JUNCTION_TOP);
+#endif // GTK+3
+
+        wxSizer* const sizerTop = new wxBoxSizer(wxVERTICAL);
+        sizerTop->Add(ctrlItems, wxSizerFlags(1).Expand());
+        sizerTop->Add(m_tbar, wxSizerFlags().Expand());
+        parent->SetSizer(sizerTop);
+
+        m_tbar->Bind(wxEVT_UPDATE_UI,
+                       &wxAddRemoveImplBase::OnUpdateUIAdd, this, wxID_ADD);
+        m_tbar->Bind(wxEVT_UPDATE_UI,
+                       &wxAddRemoveImplBase::OnUpdateUIRemove, this, wxID_REMOVE);
+
+        m_tbar->Bind(wxEVT_TOOL, &wxAddRemoveImplBase::OnAdd, this, wxID_ADD);
+        m_tbar->Bind(wxEVT_TOOL, &wxAddRemoveImplBase::OnRemove, this, wxID_REMOVE);
+    }
+
+    virtual void SetButtonsToolTips(const wxString& addtip,
+                                    const wxString& removetip) wxOVERRIDE
+    {
+        m_tbar->SetToolShortHelp(wxID_ADD, addtip);
+        m_tbar->SetToolShortHelp(wxID_REMOVE, removetip);
+    }
+
+private:
+    static wxBitmap GetNamedBitmap(const wxString& name)
+    {
+        // GTK UI guidelines recommend using "symbolic" versions of the icons
+        // for these buttons, so try them first but fall back to the normal
+        // ones if symbolic theme is not installed.
+        wxBitmap bmp = wxArtProvider::GetBitmap(name + "-symbolic", wxART_MENU);
+        if ( !bmp.IsOk() )
+            bmp = wxArtProvider::GetBitmap(name, wxART_MENU);
+        return bmp;
+    }
+
+    wxToolBar* const m_tbar;
+};
+
+#endif // _WX_GTK_PRIVATE_ADDREMOVECTRL_H_
diff --git a/include/wx/private/addremovectrl.h b/include/wx/private/addremovectrl.h
index 19540e8df1..13a10ade02 100644
--- a/include/wx/private/addremovectrl.h
+++ b/include/wx/private/addremovectrl.h
@@ -145,8 +145,10 @@ protected:
 
 #ifdef __WXOSX__
     #include "wx/osx/private/addremovectrl.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/private/addremovectrl.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/private/addremovectrl.h"
 #else
     #include "wx/generic/private/addremovectrl.h"
 #endif
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 391d322efe..9cf66e43c7 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -43,7 +43,12 @@
 
 #ifdef __WXGTK__
 #include "wx/renderer.h"
-#include "wx/gtk/private/wrapgtk.h"
+#ifdef __WXGTK20__
+    #include "wx/gtk/private/wrapgtk.h"
+#else
+    #include <gtk/gtk.h>
+    #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
+#endif
 #ifdef __WXGTK3__
     #include "wx/graphics.h"
     #include "wx/gtk/private.h"
diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index f05fc5e97c..e69ad0d2ad 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -41,8 +41,11 @@
     #include "wx/scrolbar.h"
 #endif // __WXUNIVERSAL__
 
-#ifdef __WXGTK__
+#ifdef __WXGTK20__
     #include "wx/gtk/private/wrapgtk.h"
+#elif defined(__WXGTK__)
+    #include <gtk/gtk.h>
+    #define gtk_widget_get_window(x) x->window
 #elif defined(__WXMSW__)
     #include "wx/msw/private.h"
 #elif defined(__WXX11__)
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 729c51da67..bae186b759 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -103,13 +103,17 @@
     #include "wx/msw/private.h"
 #endif
 
-#if wxUSE_GUI && defined(__WXGTK__)
-    #include "wx/gtk/private/wrapgtk.h"    // for GTK_XXX_VERSION constants
+#if wxUSE_GUI
+    // Include the definitions of GTK_XXX_VERSION constants.
+    #ifdef __WXGTK20__
+        #include "wx/gtk/private/wrapgtk.h"
+    #elif defined(__WXGTK__)
+        #include <gtk/gtk.h>
+    #elif defined(__WXQT__)
+        #include <QtCore/QtGlobal>       // for QT_VERSION_STR constants
+    #endif
 #endif
 
-#if wxUSE_GUI && defined(__WXQT__)
-    #include <QtCore/QtGlobal>       // for QT_VERSION_STR constants
-#endif
 #if wxUSE_BASE
 
 // ============================================================================
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index a1ad0dca9f..ddf2f94c52 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -83,7 +83,11 @@ using namespace std;
 #endif
 
 #ifdef __WXGTK__
+#ifdef __WXGTK20__
 #include "wx/gtk/private/wrapgtk.h"
+#else // GTK+ 1.x
+#include <gtk/gtk.h>
+#endif
 #include "wx/fontutil.h"
 #ifndef __WXGTK3__
 #include "wx/gtk/dc.h"
diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 0e608e89eb..f58590d519 100644
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -64,7 +64,11 @@
 // ----------------------------------------------------------------------------
 
 #if defined(__WXGTK__)
-    #include "wx/gtk/private/wrapgtk.h"
+    #ifdef __WXGTK20__
+        #include "wx/gtk/private/wrapgtk.h"
+    #else // GTK+ 1.x
+        #include <gtk/gtk.h>
+    #endif
     #include <gdk/gdkx.h>
     #define GetDisplay()        GDK_DISPLAY()
     #define GetXWindow(wxwin)   GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 8b9f37b831..d4f659df7c 100644
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -37,7 +37,12 @@
 #endif
 
 #ifdef __WXGTK__
+#ifdef __WXGTK20__
 #include "wx/gtk/private/wrapgtk.h"
+#else // GTK+ 1.x
+#include <gtk/gtk.h>
+#define GDK_WINDOWING_X11
+#endif
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif

From a74058a958e864aaa2f9f902ae5dbbf0d3d0cc25 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 00:09:05 +0200
Subject: [PATCH 739/916] Fix wxGetKeyState() compilation with wxGTK 1

This was broken back in a73251a80d95efa37bf1fc7879b21a6aec57910d which
added check for GDK_WINDOWING_X11 which is not defined by GTK+ 1.

See #14469.
---
 src/unix/utilsx11.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index d4f659df7c..97c8fa5560 100644
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -50,8 +50,9 @@ GdkWindow* wxGetTopLevelGDK();
 GtkWidget* wxGetTopLevelGTK();
 #endif
 
-// Only X11 backend is supported for wxGTK here
-#if !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)
+// Only X11 backend is supported for wxGTK here (GTK < 2 has no others)
+#if !defined(__WXGTK__) || \
+    (!defined(__WXGTK20__) || defined(GDK_WINDOWING_X11))
 
 // Various X11 Atoms used in this file:
 static Atom _NET_WM_STATE = 0;

From 2034f6683b753f4a912477683972ab93d175c34c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2018 00:24:35 +0200
Subject: [PATCH 740/916] Disable use of wxSecretStore with wxGTK1

libsecret is for GTK+ 2+ only and can't be used with GTK+ 1.
---
 configure    | 20 ++++++--------------
 configure.in |  5 ++++-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index 1b11ac5dc3..779605646c 100755
--- a/configure
+++ b/configure
@@ -1040,7 +1040,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1461,7 +1460,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1714,15 +1712,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1860,7 +1849,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -2013,7 +2002,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -34150,7 +34138,11 @@ fi
 
 
 if test "$wxUSE_SECRETSTORE" = "yes"; then
-            if test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then
+            if test "$WXGTK1" = "1"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&5
+$as_echo "$as_me: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&2;}
+        wxUSE_SECRETSTORE=no
+    elif test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSECRET" >&5
diff --git a/configure.in b/configure.in
index cbd7392216..7720f2f5d9 100644
--- a/configure.in
+++ b/configure.in
@@ -5419,7 +5419,10 @@ dnl ---------------------------------------------------------------------------
 if test "$wxUSE_SECRETSTORE" = "yes"; then
     dnl The required APIs are always available under MSW and OS X but we must
     dnl have GNOME libsecret under Unix to be able to compile this class.
-    if test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then
+    if test "$WXGTK1" = "1"; then
+        AC_MSG_WARN([libsecret is incompatible with GTK+ 1, disabled])
+        wxUSE_SECRETSTORE=no
+    elif test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then
         PKG_CHECK_MODULES(LIBSECRET, [libsecret-1],
             [
                 CXXFLAGS="$LIBSECRET_CFLAGS $CXXFLAGS"

From 3dd4fb39978e48ecac6644ad789fc7457002ec69 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 11 Jul 2018 00:44:46 +0200
Subject: [PATCH 741/916] Document wxNO_UNSAFE_WXSTRING_CONV in wxString
 overview

Also add wxUSE_UNSAFE_WXSTRING_CONV to the list of wxUSE_XXX options
documentation and mention it in wxString overview as well.

See #11830.
---
 docs/doxygen/mainpages/const_wxusedef.h |  3 +++
 docs/doxygen/overviews/string.h         | 28 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h
index 3c2040bcb8..9d52ed1821 100644
--- a/docs/doxygen/mainpages/const_wxusedef.h
+++ b/docs/doxygen/mainpages/const_wxusedef.h
@@ -45,6 +45,9 @@ library:
     other locales and reduces the library size; useful for embedded systems.}
 @itemdef{wxUSE_GUI, Use the GUI classes; if set to 0 only non-GUI classes are
     available.}
+@itemdef{wxUSE_UNSAFE_WXSTRING_CONV, Defined as 1 by default for compatibility,
+    but can be set to 0 to globally disable unsafe implicit conversions in
+    wxString class. See @ref overview_string_settings for more details.}
 @endDefList
 
 
diff --git a/docs/doxygen/overviews/string.h b/docs/doxygen/overviews/string.h
index 27adb0136f..4e3fecc5eb 100644
--- a/docs/doxygen/overviews/string.h
+++ b/docs/doxygen/overviews/string.h
@@ -178,10 +178,22 @@ which are deprecated and may disappear in future versions.
 
 @subsection overview_string_implicitconv Implicit conversions
 
-Probably the main trap with using this class is the implicit conversion
-operator to <tt>const char*</tt>. It is advised that you use wxString::c_str()
-instead to clearly indicate when the conversion is done. Specifically, the
-danger of this implicit conversion may be seen in the following code fragment:
+The default behaviour, which can't be changed to avoid breaking compatibility
+with the existing code, is to provide implicit conversions of wxString to
+C-style strings, i.e. <tt>const char*</tt> and/or <tt>const wchar_t*</tt>. As
+explained below, these conversions are dangerous and it is @e strongly
+recommended to predefine @c wxNO_UNSAFE_WXSTRING_CONV for all new projects
+using wxWidgets to disable them. Notice that this preprocessor symbol is
+different from the more usual @c wxUSE_XXX build options, as it only needs to
+be defined when building the application and doesn't require rebuilding the
+library (and so can be used with e.g. system-provided libraries from Linux
+system packages).
+
+If you can't disable the implicit conversions, it is still advised to use
+wxString::c_str() instead of relying on them to clearly indicate when the
+conversion is done as implicit conversions may result in difficult to find
+bugs. For example, some of the dangers of this implicit conversion may be seen
+in the following code fragment:
 
 @code
 // this function converts the input string to uppercase,
@@ -374,6 +386,14 @@ using UTF-8 has performance implications as explained in @ref
 overview_unicode_performance, so it probably shouldn't be enabled for legacy
 code which might contain a lot of index-using loops.
 
+As mentioned in @ref overview_string_implicitconv, @c wxNO_UNSAFE_WXSTRING_CONV
+should be defined by all code using this class to opt-in safer, but not
+backwards-compatible, behaviour of @e not providing dangerous implicit
+conversions to C-style strings. This option is convenient when using standard
+build of the library as it doesn't require rebuilding it, but for custom builds
+it is also possible to set @c wxUSE_UNSAFE_WXSTRING_CONV to 0 in order to
+disable the implicit conversions for all applications using it.
+
 See also @ref page_wxusedef_important for a few other options affecting wxString.
 
 */

From 03a13591b9593f46d99395bcc2d7dae144438de6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 11 Jul 2018 01:13:22 +0200
Subject: [PATCH 742/916] Add wxDataViewToggleRenderer::ShowAsRadio()

This allows showing radio buttons in wxDataViewCtrl easily and natively.

Notice that this approach, adding an extra function to the existing
renderer class instead of creating some new wxDataViewRadioRenderer (see
https://github.com/wxWidgets/wxWidgets/pull/809), was finally chosen
because it is simpler to implement and, more importantly, because it
will be more natural to generalize if/when we also add a 3-state
check/radio renderer.

Closes https://github.com/wxWidgets/wxWidgets/pull/853
---
 docs/changes.txt                 |  1 +
 include/wx/generic/dvrenderers.h |  3 ++
 include/wx/gtk/dvrenderers.h     |  2 +
 include/wx/osx/dvrenderers.h     |  2 +
 interface/wx/dataview.h          | 21 +++++++++++
 samples/dataview/dataview.cpp    | 65 ++++++++++++++++++++++++++++++++
 src/generic/datavgen.cpp         | 12 +++---
 src/gtk/dataview.cpp             |  5 +++
 src/osx/cocoa/dataview.mm        |  5 +++
 9 files changed, 111 insertions(+), 5 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 4762e4888a..d64d16eeca 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -94,6 +94,7 @@ All:
 
 All (GUI):
 
+- Add wxDataViewToggleRenderer::ShowAsRadio().
 - Improve stock items consistency and aesthetics (dhowland).
 - Fix bug with missing items in overflowing AUI toolbar (Maarten Bent).
 - Revert to left-aligning wxSpinCtrl contents by default.
diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h
index d85bbe0619..1f23fdee3a 100644
--- a/include/wx/generic/dvrenderers.h
+++ b/include/wx/generic/dvrenderers.h
@@ -132,6 +132,8 @@ public:
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                               int align = wxDVR_DEFAULT_ALIGNMENT );
 
+    void ShowAsRadio() { m_radio = true; }
+
     virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
     virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
 #if wxUSE_ACCESSIBILITY
@@ -149,6 +151,7 @@ public:
                                 const wxMouseEvent *mouseEvent) wxOVERRIDE;
 private:
     bool    m_toggle;
+    bool    m_radio;
 
 protected:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer);
diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h
index bd50a515b2..9d4091d90f 100644
--- a/include/wx/gtk/dvrenderers.h
+++ b/include/wx/gtk/dvrenderers.h
@@ -107,6 +107,8 @@ public:
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                               int align = wxDVR_DEFAULT_ALIGNMENT );
 
+    void ShowAsRadio();
+
     bool SetValue( const wxVariant &value ) wxOVERRIDE;
     bool GetValue( wxVariant &value ) const wxOVERRIDE;
 
diff --git a/include/wx/osx/dvrenderers.h b/include/wx/osx/dvrenderers.h
index 0aa10473dc..e9ad8edd79 100644
--- a/include/wx/osx/dvrenderers.h
+++ b/include/wx/osx/dvrenderers.h
@@ -198,6 +198,8 @@ public:
                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                              int align = wxDVR_DEFAULT_ALIGNMENT);
 
+    void ShowAsRadio();
+
     virtual bool MacRender();
 
     virtual void OSXOnCellChanged(NSObject *value,
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 22fd11fe88..c673939758 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -2272,6 +2272,9 @@ public:
 
     This class is used by wxDataViewCtrl to render toggle controls.
 
+    Note that "toggles" can be represented either by check boxes (default) or
+    radio buttons.
+
     @see wxDataViewCheckIconTextRenderer
     @library{wxadv}
     @category{dvc}
@@ -2292,6 +2295,24 @@ public:
     wxDataViewToggleRenderer(const wxString& varianttype = GetDefaultType(),
                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                              int align = wxDVR_DEFAULT_ALIGNMENT);
+
+    /**
+        Switch to using radiobutton-like appearance instead of the default
+        checkbox-like one.
+
+        By default, this renderer uses checkboxes to represent the boolean
+        values, but using this method its appearance can be changed to use
+        radio buttons instead.
+
+        Notice that only the appearance is changed, the cells don't really
+        start behaving as radio buttons after a call to ShowAsRadio(), i.e. the
+        application code also needs to react to selecting one of the cells
+        shown by this renderer and clearing all the other ones in the same row
+        or column to actually implement radio button-like behaviour.
+
+        @since 3.1.2
+     */
+    void ShowAsRadio();
 };
 
 
diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 26fbc1dde6..54f3666603 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -108,6 +108,10 @@ private:
 
     void OnPrependList(wxCommandEvent& event);
     void OnDeleteList(wxCommandEvent& event);
+
+    // Third (wxDataViewListCtrl) page.
+    void OnListValueChanged(wxDataViewEvent& event);
+
     // Fourth page.
     void OnDeleteTreeItem(wxCommandEvent& event);
     void OnDeleteAllTreeItems(wxCommandEvent& event);
@@ -176,6 +180,9 @@ private:
     wxLog *m_logOld;
 
 private:
+    // Flag used by OnListValueChanged(), see there.
+    bool m_eventFromProgram;
+
     wxDECLARE_EVENT_TABLE();
 };
 
@@ -450,6 +457,8 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
     m_ctrl[2] = NULL;
     m_ctrl[3] = NULL;
 
+    m_eventFromProgram = false;
+
     SetIcon(wxICON(sample));
 
 
@@ -759,6 +768,17 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             page2_model->DecRef();
 
             lc->AppendToggleColumn( "Toggle" );
+
+            // We're not limited to convenience column-appending functions, it
+            // can also be done fully manually, which allows us to customize
+            // the renderer being used.
+            wxDataViewToggleRenderer* const rendererRadio =
+                new wxDataViewToggleRenderer("bool", wxDATAVIEW_CELL_ACTIVATABLE);
+            rendererRadio->ShowAsRadio();
+            wxDataViewColumn* const colRadio =
+                new wxDataViewColumn("Radio", rendererRadio, 1);
+            lc->AppendColumn(colRadio, "bool");
+
             lc->AppendTextColumn( "Text" );
             lc->AppendProgressColumn( "Progress" );
 
@@ -767,11 +787,14 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             {
                 data.clear();
                 data.push_back( (i%3) == 0 );
+                data.push_back( i == 7 ); // select a single (random) radio item
                 data.push_back( wxString::Format("row %d", i) );
                 data.push_back( long(5*i) );
 
                 lc->AppendItem( data );
             }
+
+            lc->Bind(wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, &MyFrame::OnListValueChanged, this);
         }
         break;
 
@@ -1390,6 +1413,48 @@ void MyFrame::OnShowAttributes(wxCommandEvent& WXUNUSED(event))
     m_attributes->SetHidden(false);
 }
 
+// ----------------------------------------------------------------------------
+// MyFrame - event handlers for the third (wxDataViewListCtrl) page
+// ----------------------------------------------------------------------------
+
+void MyFrame::OnListValueChanged(wxDataViewEvent& event)
+{
+    // Ignore changes coming from our own SetToggleValue() calls below.
+    if ( m_eventFromProgram )
+    {
+        m_eventFromProgram = false;
+        return;
+    }
+
+    wxDataViewListCtrl* const lc = static_cast<wxDataViewListCtrl*>(m_ctrl[2]);
+
+    const int columnToggle = 1;
+
+    // Handle selecting a radio button by unselecting all the other ones.
+    if ( event.GetColumn() == columnToggle )
+    {
+        const int rowChanged = lc->ItemToRow(event.GetItem());
+        if ( lc->GetToggleValue(rowChanged, columnToggle) )
+        {
+            for ( int row = 0; row < lc->GetItemCount(); ++row )
+            {
+                if ( row != rowChanged )
+                {
+                    m_eventFromProgram = true;
+                    lc->SetToggleValue(false, row, columnToggle);
+                }
+            }
+        }
+        else // The item was cleared.
+        {
+            // Explicitly check it back, we want to always have exactly one
+            // checked radio item in this column.
+            m_eventFromProgram = true;
+            lc->SetToggleValue(true, rowChanged, columnToggle);
+        }
+    }
+}
+
 // ----------------------------------------------------------------------------
 // MyFrame - event handlers for the fourth page
 // ----------------------------------------------------------------------------
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 5c45bd7409..719f6ee122 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -1260,6 +1260,7 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
     wxDataViewRenderer( varianttype, mode, align )
 {
     m_toggle = false;
+    m_radio = false;
 }
 
 bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )
@@ -1301,11 +1302,12 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state
     size.IncTo(GetSize());
     cell.SetSize(size);
 
-    wxRendererNative::Get().DrawCheckBox(
-            GetOwner()->GetOwner(),
-            *dc,
-            cell,
-            flags );
+    wxRendererNative& renderer = wxRendererNative::Get();
+    wxWindow* const win = GetOwner()->GetOwner();
+    if ( m_radio )
+        renderer.DrawRadioBitmap(win, *dc, cell, flags);
+    else
+        renderer.DrawCheckBox(win, *dc, cell, flags);
 
     return true;
 }
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 2715737b86..71f9774591 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -2539,6 +2539,11 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype,
     SetAlignment(align);
 }
 
+void wxDataViewToggleRenderer::ShowAsRadio()
+{
+    gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(m_renderer), TRUE);
+}
+
 bool wxDataViewToggleRenderer::SetValue( const wxVariant &value )
 {
     bool tmp = value;
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 9428747a3c..f70eaae314 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -3326,6 +3326,11 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer(const wxString& varianttype,
     [cell release];
 }
 
+void wxDataViewToggleRenderer::ShowAsRadio()
+{
+    [GetNativeData()->GetItemCell() setButtonType:NSRadioButton];
+}
+
 bool wxDataViewToggleRenderer::MacRender()
 {
     [GetNativeData()->GetItemCell() setIntValue:GetValue().GetLong()];

From 2171076e8113fb54dfc128357018f5f9d3f8494e Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Fri, 6 Jul 2018 10:54:15 +0300
Subject: [PATCH 743/916] Avoid pointer overflow warning in
 wxPropertyGridPageState::DoRemoveFromSelection()

Looks like gcc8.1 think 'sel' can be empty after initialization. Avoid this by copying only the remaining entries.
---
 src/propgrid/propgridpagestate.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index ad9fdc5858..870354a27f 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -1371,8 +1371,7 @@ void wxPropertyGridPageState::DoRemoveFromSelection( wxPGProperty* prop )
             {
                 // If first item (i.e. one with the active editor) was
                 // deselected, then we need to take some extra measures.
-                wxArrayPGProperty sel = m_selection;
-                sel.erase( sel.begin() + i );
+                wxArrayPGProperty sel(m_selection.begin() + 1, m_selection.end());
 
                 wxPGProperty* newFirst = sel.empty()? NULL: sel[0];
 

From 915b5212f8c4e4d026b4ae6c761572cc0a19f79f Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Thu, 12 Jul 2018 11:15:10 +0300
Subject: [PATCH 744/916] Avoid unsafe casts to enum type

---
 src/generic/statusbr.cpp | 6 +++---
 src/msw/statusbar.cpp    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index f364677c7b..c0581dd679 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -231,12 +231,12 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int
 
     // eventually ellipsize the text so that it fits the field width
 
-    wxEllipsizeMode ellmode = (wxEllipsizeMode)-1;
+    wxEllipsizeMode ellmode = wxELLIPSIZE_NONE;
     if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START;
     else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE;
     else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END;
 
-    if (ellmode == (wxEllipsizeMode)-1)
+    if (ellmode == wxELLIPSIZE_NONE)
     {
         // if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if
         // we don't ellipsize the text but just truncate it
@@ -267,7 +267,7 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int
     // draw the text
     dc.DrawText(text, xpos, ypos);
 
-    if (ellmode == (wxEllipsizeMode)-1)
+    if (ellmode == wxELLIPSIZE_NONE)
         dc.DestroyClippingRegion();
 }
 
diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index 52ed30fa79..ad9b4eff96 100644
--- a/src/msw/statusbar.cpp
+++ b/src/msw/statusbar.cpp
@@ -287,12 +287,12 @@ void wxStatusBar::DoUpdateStatusText(int nField)
     wxString text = GetStatusText(nField);
 
     // do we need to ellipsize this string?
-    wxEllipsizeMode ellmode = (wxEllipsizeMode)-1;
+    wxEllipsizeMode ellmode = wxELLIPSIZE_NONE;
     if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START;
     else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE;
     else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END;
 
-    if (ellmode == (wxEllipsizeMode)-1)
+    if (ellmode == wxELLIPSIZE_NONE)
     {
         // if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if
         // we don't ellipsize the text but just truncate it

From 82881d6b038c10906704f5e53819051d2a9b6a5a Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Thu, 12 Jul 2018 12:19:07 +0300
Subject: [PATCH 745/916] Use memcpy instead of strncpy in wxStrlcpy

Avoid stringop-overflow warning about strncpy size argument depending on source size.
Checking for null in src is not needed because it is already checked by strlen.
---
 include/wx/wxcrt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 2cbd853ecf..1a3e5e0dbf 100644
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -257,7 +257,7 @@ inline size_t wxStrlcpy(char *dest, const char *src, size_t n)
     {
         if ( n-- > len )
             n = len;
-        wxCRT_StrncpyA(dest, src, n);
+        wxTmemcpy(dest, src, n);
         dest[n] = '\0';
     }
 
@@ -270,7 +270,7 @@ inline size_t wxStrlcpy(wchar_t *dest, const wchar_t *src, size_t n)
     {
         if ( n-- > len )
             n = len;
-        wxCRT_StrncpyW(dest, src, n);
+        wxTmemcpy(dest, src, n);
         dest[n] = L'\0';
     }
 

From 24b8a2523d2724c67aa622fc1e83d80ff3345058 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 12 Jul 2018 17:44:04 +0200
Subject: [PATCH 746/916] Undo change for notebook under 10.14, not needed
 under Beta 3 anymore

see #18146
---
 src/osx/cocoa/notebook.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm
index 853b810e49..0a3862ac24 100644
--- a/src/osx/cocoa/notebook.mm
+++ b/src/osx/cocoa/notebook.mm
@@ -87,7 +87,7 @@
     if (!initialized)
     {
         initialized = YES;
-        wxOSXCocoaClassAddWXMethods( self, wxOSXSKIP_DRAW );
+        wxOSXCocoaClassAddWXMethods( self );
     }
 }
 

From 6c6cc08975f7d161076315cebe1cd2b1a12ea4fe Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 13 Jul 2018 10:44:44 +0200
Subject: [PATCH 747/916] Fixing drop on macos native dataview when 
 wxNEEDS_UTF16_FOR_TEXT_DATAOBJ

see #18165
---
 src/osx/cocoa/dataview.mm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index f70eaae314..a95d29190e 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -622,7 +622,11 @@ outlineView:(NSOutlineView*)outlineView
                     (
                      kCFAllocatorDefault,
                      (CFStringRef)[pasteboard stringForType:NSStringPboardType],
+#if defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
+                     kCFStringEncodingUTF16,
+#else
                      kCFStringEncodingUTF8,
+#endif
                      32
                     );
         if (textDataObject->SetData(::CFDataGetLength(osxData),
@@ -850,7 +854,13 @@ outlineView:(NSOutlineView*)outlineView
         wxDataObjectComposite* dataObjects   (new wxDataObjectComposite());
         wxTextDataObject*      textDataObject(new wxTextDataObject());
 
-        osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,(CFStringRef)[pasteboard stringForType:NSStringPboardType],kCFStringEncodingUTF8,32);
+        osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,(CFStringRef)[pasteboard stringForType:NSStringPboardType],
+#if defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
+                                                         kCFStringEncodingUTF16,
+#else
+                                                         kCFStringEncodingUTF8,
+#endif
+                                                         32);
         if (textDataObject->SetData(::CFDataGetLength(osxData),::CFDataGetBytePtr(osxData)))
             dataObjects->Add(textDataObject);
         else

From 61223ab32d969da233d388883069749d2b936551 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 13 Jul 2018 18:16:16 +0200
Subject: [PATCH 748/916] Fix using radio buttons in wxDataViewToggleRenderer
 under macOS

Changing item cell in ShowAsRadio() was wrong as the item cell doesn't
exist when it is called and changing the column cell didn't seem to work
well, so just recreate the entire cell in it instead.

See https://github.com/wxWidgets/wxWidgets/pull/853
---
 include/wx/osx/dvrenderers.h |  2 ++
 src/osx/cocoa/dataview.mm    | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/include/wx/osx/dvrenderers.h b/include/wx/osx/dvrenderers.h
index e9ad8edd79..1c6b5b5687 100644
--- a/include/wx/osx/dvrenderers.h
+++ b/include/wx/osx/dvrenderers.h
@@ -207,6 +207,8 @@ public:
                                   unsigned col);
 
 private:
+    void DoInitButtonCell(int buttonType);
+
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer);
 };
 
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index a95d29190e..de561b8b4e 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -3324,13 +3324,18 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer(const wxString& varianttype,
                                                    wxDataViewCellMode mode,
                                                    int align)
     : wxOSXDataViewDisabledInertRenderer(varianttype, mode, align)
+{
+    DoInitButtonCell(NSSwitchButton);
+}
+
+void wxDataViewToggleRenderer::DoInitButtonCell(int buttonType)
 {
     NSButtonCell* cell;
 
 
     cell = [[NSButtonCell alloc] init];
-    [cell setAlignment:ConvertToNativeHorizontalTextAlignment(align)];
-    [cell setButtonType:NSSwitchButton];
+    [cell setAlignment:ConvertToNativeHorizontalTextAlignment(GetAlignment())];
+    [cell setButtonType: static_cast<NSButtonType>(buttonType)];
     [cell setImagePosition:NSImageOnly];
     SetNativeData(new wxDataViewRendererNativeData(cell));
     [cell release];
@@ -3338,7 +3343,11 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer(const wxString& varianttype,
 
 void wxDataViewToggleRenderer::ShowAsRadio()
 {
-    [GetNativeData()->GetItemCell() setButtonType:NSRadioButton];
+    // This is a bit wasteful, as we always create the cell using
+    // NSSwitchButton in the ctor and recreate it here, but modifying the
+    // existing cell doesn't seem to work well and delaying the creation of the
+    // cell until it's used doesn't seem to be worth it, so just recreate it.
+    DoInitButtonCell(NSRadioButton);
 }
 
 bool wxDataViewToggleRenderer::MacRender()

From 0e92eb13dc127fd02e75f40ff83c1cc55ce4bdb4 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 13 Jul 2018 18:22:45 +0200
Subject: [PATCH 749/916] initializing m_ItemCell always

---
 include/wx/osx/cocoa/dataview.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h
index ffe1ac2e5d..58d9495f6e 100644
--- a/include/wx/osx/cocoa/dataview.h
+++ b/include/wx/osx/cocoa/dataview.h
@@ -118,19 +118,19 @@ class wxDataViewRendererNativeData
 {
 public:
     wxDataViewRendererNativeData()
-        : m_Object(NULL), m_ColumnCell(NULL)
+        : m_Object(NULL), m_ColumnCell(NULL), m_ItemCell(NULL)
     {
         Init();
     }
 
     wxDataViewRendererNativeData(NSCell* initColumnCell)
-        : m_Object(NULL), m_ColumnCell([initColumnCell retain])
+        : m_Object(NULL), m_ColumnCell([initColumnCell retain]), m_ItemCell(NULL)
     {
         Init();
     }
 
     wxDataViewRendererNativeData(NSCell* initColumnCell, id initObject)
-        : m_Object([initObject retain]), m_ColumnCell([initColumnCell retain])
+        : m_Object([initObject retain]), m_ColumnCell([initColumnCell retain]), m_ItemCell(NULL)
     {
         Init();
     }

From cc8392514714645deed146ff3d5ebb3b6a9b39f6 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 13 Jul 2018 20:17:02 +0200
Subject: [PATCH 750/916] Factoring out common code, applying patch

Applying drag/drop result codes patch by dkulp see #18166, factoring out common code and adding proper setting of drop data in event.
---
 src/osx/cocoa/dataview.mm | 253 ++++++++++++++------------------------
 1 file changed, 92 insertions(+), 161 deletions(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index de561b8b4e..3583ec9369 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -541,116 +541,7 @@ outlineView:(NSOutlineView*)outlineView
     wxUnusedVar(outlineView);
     wxUnusedVar(index);
     
-    NSArray* supportedTypes(
-        [NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]
-    );
-
-    NSPasteboard* pasteboard([info draggingPasteboard]);
-
-    NSString* bestType([pasteboard availableTypeFromArray:supportedTypes]);
-
-    if ( bestType == nil )
-        return FALSE;
-
-    wxDataViewCtrl * const dvc(implementation->GetDataViewCtrl());
-
-    wxCHECK_MSG( dvc, false,
-                     "Pointer to data view control not set correctly." );
-    wxCHECK_MSG( dvc->GetModel(), false,
-                    "Pointer to model not set correctly." );
-
-    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_DROP, dvc, wxDataViewItemFromItem(item));
-
-    BOOL dragSuccessful = false;
-    if ( [bestType compare:DataViewPboardType] == NSOrderedSame )
-    {
-        NSArray* dataArray((NSArray*)
-                      [pasteboard propertyListForType:DataViewPboardType]);
-        NSUInteger indexDraggedItem, noOfDraggedItems([dataArray count]);
-
-        indexDraggedItem = 0;
-        while (indexDraggedItem < noOfDraggedItems)
-        {
-            wxDataObjectComposite* dataObjects(
-                implementation->GetDnDDataObjects((NSData*)
-                    [dataArray objectAtIndex:indexDraggedItem]));
-
-            if (dataObjects && (dataObjects->GetFormatCount() > 0))
-            {
-                wxMemoryBuffer buffer;
-
-                // copy data into data object:
-                event.SetDataObject(dataObjects);
-                event.SetDataFormat(
-                    implementation->GetDnDDataFormat(dataObjects));
-                // copy data into buffer:
-                dataObjects->GetDataHere(
-                    event.GetDataFormat().GetType(),
-                    buffer.GetWriteBuf(event.GetDataSize()));
-                buffer.UngetWriteBuf(event.GetDataSize());
-                event.SetDataBuffer(buffer.GetData());
-                // finally, send event:
-                if (dvc->HandleWindowEvent(event) && event.IsAllowed())
-                {
-                    dragSuccessful = true;
-                    ++indexDraggedItem;
-                }
-                else
-                {
-                    dragSuccessful   = true;
-                    indexDraggedItem = noOfDraggedItems; // stop loop
-                }
-            }
-            else
-            {
-                dragSuccessful   = false;
-                indexDraggedItem = noOfDraggedItems; // stop loop
-            }
-            // clean-up:
-            delete dataObjects;
-        }
-    }
-    else
-    {
-        // needed to convert internally used UTF-16 representation to a UTF-8
-        // representation
-        CFDataRef              osxData;
-        wxDataObjectComposite* dataObjects   (new wxDataObjectComposite());
-        wxTextDataObject*      textDataObject(new wxTextDataObject());
-
-        osxData = ::CFStringCreateExternalRepresentation
-                    (
-                     kCFAllocatorDefault,
-                     (CFStringRef)[pasteboard stringForType:NSStringPboardType],
-#if defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
-                     kCFStringEncodingUTF16,
-#else
-                     kCFStringEncodingUTF8,
-#endif
-                     32
-                    );
-        if (textDataObject->SetData(::CFDataGetLength(osxData),
-                                    ::CFDataGetBytePtr(osxData)))
-            dataObjects->Add(textDataObject);
-        else
-            delete textDataObject;
-        // send event if data could be copied:
-        if (dataObjects->GetFormatCount() > 0)
-        {
-            event.SetDataObject(dataObjects);
-            event.SetDataFormat(implementation->GetDnDDataFormat(dataObjects));
-            if (dvc->HandleWindowEvent(event) && event.IsAllowed())
-                dragSuccessful = true;
-            else
-                dragSuccessful = false;
-        }
-        else
-            dragSuccessful = false;
-        // clean up:
-        ::CFRelease(osxData);
-        delete dataObjects;
-    }
-    return dragSuccessful;
+    return [self setupAndCallDataViewEvents:wxEVT_DATAVIEW_ITEM_DROP dropInfo:info item:item] != NSDragOperationNone;
 }
 
 -(id) outlineView:(NSOutlineView*)outlineView
@@ -789,59 +680,107 @@ outlineView:(NSOutlineView*)outlineView
     wxUnusedVar(outlineView);
     wxUnusedVar(index);
 
-    NSArray* supportedTypes([NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]);
-
-    NSPasteboard* pasteboard([info draggingPasteboard]);
-
-    NSString* bestType([pasteboard availableTypeFromArray:supportedTypes]);
-    if (bestType == nil)
-        return NSDragOperationNone;
+    return [self setupAndCallDataViewEvents:wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE dropInfo:info item:item];
+}
 
+-(NSDragOperation) callDataViewEvents:(wxEventType)eventType dataObjects:(wxDataObjectComposite*)dataObjects item:(id)item
+{
     NSDragOperation dragOperation = NSDragOperationNone;
     wxDataViewCtrl* const dvc(implementation->GetDataViewCtrl());
+    wxDataViewEvent event(eventType, dvc, wxDataViewItemFromItem(item));
+    if (dataObjects && (dataObjects->GetFormatCount() > 0))
+    {
+        // copy data into data object:
+        event.SetDataObject(dataObjects);
+        event.SetDataFormat(implementation->GetDnDDataFormat(dataObjects));
+        event.SetDropEffect(wxDragCopy);
+        wxDataFormatId formatId = event.GetDataFormat().GetType();
+        wxMemoryBuffer buffer;
+        
+        // copy data into buffer:
+        if ( formatId != wxDF_INVALID)
+        {
+            size_t size = dataObjects->GetDataSize(formatId);
+            
+            event.SetDataSize(size);
+            dataObjects->GetDataHere(formatId,buffer.GetWriteBuf(size));
+            buffer.UngetWriteBuf(size);
+            event.SetDataBuffer(buffer.GetData());
+        }
+        
+        // finally, send event:
+        if (dvc->HandleWindowEvent(event) && event.IsAllowed())
+        {
+            switch (event.GetDropEffect())
+            {
+                case wxDragCopy:
+                    dragOperation = NSDragOperationCopy;
+                    break;
+                case wxDragMove:
+                    dragOperation = NSDragOperationMove;
+                    break;
+                case wxDragLink:
+                    dragOperation = NSDragOperationLink;
+                    break;
+                case wxDragNone:
+                case wxDragCancel:
+                case wxDragError:
+                    dragOperation = NSDragOperationNone;
+                    break;
+                default:
+                    dragOperation = NSDragOperationEvery;
+            }
+        }
+        else
+        {
+            dragOperation = NSDragOperationNone;
+        }
+    }
+    else
+    {
+        dragOperation = NSDragOperationNone;
+    }
 
+    return dragOperation;
+}
+
+-(NSDragOperation) setupAndCallDataViewEvents:(wxEventType)eventType dropInfo:(id<NSDraggingInfo>)info item:(id)item
+{
+    NSArray* supportedTypes(
+                            [NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]
+                            );
+    
+    NSPasteboard* pasteboard([info draggingPasteboard]);
+    
+    NSString* bestType([pasteboard availableTypeFromArray:supportedTypes]);
+    
+    if ( bestType == nil )
+        return NSDragOperationNone;
+    
+    NSDragOperation dragOperation = NSDragOperationNone;
+    wxDataViewCtrl* const dvc(implementation->GetDataViewCtrl());
+    
     wxCHECK_MSG(dvc, false, "Pointer to data view control not set correctly.");
     wxCHECK_MSG(dvc->GetModel(), false, "Pointer to model not set correctly.");
-
-    wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, dvc, wxDataViewItemFromItem(item));
+    
+    // wxDataViewEvent event(eventType, dvc, wxDataViewItemFromItem(item));
     if ([bestType compare:DataViewPboardType] == NSOrderedSame)
     {
         NSArray*               dataArray((NSArray*)[pasteboard propertyListForType:DataViewPboardType]);
         NSUInteger             indexDraggedItem, noOfDraggedItems([dataArray count]);
-
+        
         indexDraggedItem = 0;
         while (indexDraggedItem < noOfDraggedItems)
         {
             wxDataObjectComposite* dataObjects(implementation->GetDnDDataObjects((NSData*)[dataArray objectAtIndex:indexDraggedItem]));
-
-            if (dataObjects && (dataObjects->GetFormatCount() > 0))
-            {
-                wxMemoryBuffer buffer;
-
-                // copy data into data object:
-                event.SetDataObject(dataObjects);
-                event.SetDataFormat(implementation->GetDnDDataFormat(dataObjects));
-                // copy data into buffer:
-                dataObjects->GetDataHere(event.GetDataFormat().GetType(),buffer.GetWriteBuf(event.GetDataSize()));
-                buffer.UngetWriteBuf(event.GetDataSize());
-                event.SetDataBuffer(buffer.GetData());
-                // finally, send event:
-                if (dvc->HandleWindowEvent(event) && event.IsAllowed())
-                {
-                    dragOperation = NSDragOperationEvery;
-                    ++indexDraggedItem;
-                }
-                else
-                {
-                    dragOperation    = NSDragOperationNone;
-                    indexDraggedItem = noOfDraggedItems; // stop loop
-                }
-            }
+            
+            dragOperation = [self callDataViewEvents:eventType dataObjects:dataObjects item:item];
+            
+            if ( dragOperation != NSDragOperationNone )
+                ++indexDraggedItem;
             else
-            {
-                dragOperation    = NSDragOperationNone;
-                indexDraggedItem = noOfDraggedItems; // stop loop
-            }
+                indexDraggedItem = noOfDraggedItems;
+            
             // clean-up:
             delete dataObjects;
         }
@@ -853,7 +792,7 @@ outlineView:(NSOutlineView*)outlineView
         CFDataRef              osxData;
         wxDataObjectComposite* dataObjects   (new wxDataObjectComposite());
         wxTextDataObject*      textDataObject(new wxTextDataObject());
-
+        
         osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,(CFStringRef)[pasteboard stringForType:NSStringPboardType],
 #if defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
                                                          kCFStringEncodingUTF16,
@@ -866,22 +805,14 @@ outlineView:(NSOutlineView*)outlineView
         else
             delete textDataObject;
         // send event if data could be copied:
-        if (dataObjects->GetFormatCount() > 0)
-        {
-            event.SetDataObject(dataObjects);
-            event.SetDataFormat(implementation->GetDnDDataFormat(dataObjects));
-            if (dvc->HandleWindowEvent(event) && event.IsAllowed())
-                dragOperation = NSDragOperationEvery;
-            else
-                dragOperation = NSDragOperationNone;
-        }
-        else
-            dragOperation = NSDragOperationNone;
+        
+        dragOperation = [self callDataViewEvents:eventType dataObjects:dataObjects item:item];
+
         // clean up:
         ::CFRelease(osxData);
         delete dataObjects;
     }
-
+    
     return dragOperation;
 }
 

From b227875f989977e9e7e0a2be7c6b2104d0232078 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 15 Jul 2018 14:38:01 +0200
Subject: [PATCH 751/916] Remove CMPFUNC##T definition from WX_DECLARE_OBJARRAY
 macro

It is unnecessary and fails to compile when "T" is not an identifier
(but e.g. a pointer type).
---
 include/wx/dynarray.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index c1566953a6..fc58e89897 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -657,7 +657,6 @@ private:
     };                                                                        \
     typedef wxBaseObjectArray<T, wxObjectArrayTraitsFor##name>                \
         wxBaseObjectArrayFor##name;                                           \
-    typedef int (wxCMPFUNC_CONV *CMPFUNC##T)(T **pItem1, T **pItem2);         \
     classdecl name : public wxBaseObjectArrayFor##name                        \
     {                                                                         \
     public:                                                                   \

From 02ffdd16f6664a3b81e24ced192fbeccaa4393ef Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 15 Jul 2018 14:41:58 +0200
Subject: [PATCH 752/916] Fix using WX_DECLARE_OBJARRAY() with pointer types

While this doesn't make, and never made, any sense (pointers should be
stored in a plain, non-object array), we still should continue to
support it for compatibility.

Fix the problem introduced by 97684a9267ff49d55d00151b06e89b7891e731b3
by writing "T const&" instead of "const T&" as the latter didn't have
the same meaning when the macro parameter "T" expanded into "U*" as
"const" applied to "U", making this type incompatible with the actual
one.

Also extend the unit test to check for this.
---
 include/wx/dynarray.h   |  2 +-
 tests/arrays/arrays.cpp | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index fc58e89897..e6d5178f73 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -652,7 +652,7 @@ private:
     classdecl wxObjectArrayTraitsFor##name                                    \
     {                                                                         \
     public:                                                                   \
-        static T* Clone(const T& item);                                       \
+        static T* Clone(T const& item);                                       \
         static void Free(T* p);                                               \
     };                                                                        \
     typedef wxBaseObjectArray<T, wxObjectArrayTraitsFor##name>                \
diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index e991f7fc56..24c887da8e 100644
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -95,6 +95,17 @@ WX_DECLARE_OBJARRAY(Bar, ArrayBars);
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(ArrayBars)
 
+// ----------------------------------------------------------------------------
+// another object array test
+// ----------------------------------------------------------------------------
+
+// This code doesn't make any sense, as object arrays should be used with
+// objects, not pointers, but it used to work, so check that it continues to
+// compile.
+WX_DECLARE_OBJARRAY(Bar*, ArrayBarPtrs);
+#include "wx/arrimpl.cpp"
+WX_DEFINE_OBJARRAY(ArrayBarPtrs)
+
 // ----------------------------------------------------------------------------
 // helpers for sorting arrays and comparing items
 // ----------------------------------------------------------------------------
@@ -165,6 +176,7 @@ private:
         CPPUNIT_TEST( wxStringArraySplitJoinTest );
 
         CPPUNIT_TEST( wxObjArrayTest );
+        CPPUNIT_TEST( wxObjArrayPtrTest );
         CPPUNIT_TEST( wxArrayUShortTest );
         CPPUNIT_TEST( wxArrayIntTest );
         CPPUNIT_TEST( wxArrayCharTest );
@@ -181,6 +193,7 @@ private:
     void wxStringArrayJoinTest();
     void wxStringArraySplitJoinTest();
     void wxObjArrayTest();
+    void wxObjArrayPtrTest();
     void wxArrayUShortTest();
     void wxArrayIntTest();
     void wxArrayCharTest();
@@ -567,6 +580,13 @@ void ArraysTestCase::wxObjArrayTest()
     CPPUNIT_ASSERT_EQUAL( 0, Bar::GetNumber() );
 }
 
+void ArraysTestCase::wxObjArrayPtrTest()
+{
+    // Just check that instantiating this class compiles.
+    ArrayBarPtrs barptrs;
+    CPPUNIT_ASSERT_EQUAL( 0, barptrs.size() );
+}
+
 #define TestArrayOf(name)                                                     \
                                                                               \
 void ArraysTestCase::wxArray ## name ## Test()                                \

From 3e27a53e958867252ad8a77258cd0ef824fc7f7d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 14 Jul 2018 19:53:13 +0200
Subject: [PATCH 753/916] Make wxInfoBar actually appear when using GTK+ 3

Due to https://bugzilla.gnome.org/show_bug.cgi?id=710888 GtkInfoBar
wasn't shown if it had been hidden before -- which is exactly what
wxInfoBar did.

Fix this using the workaround proposed in the bug report, which makes
the info bar appear immediately, without any transition, which might be
not ideal, but markedly better than failing to show it at all.
---
 docs/changes.txt    |  1 +
 src/gtk/infobar.cpp | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index d64d16eeca..7936144c7b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -106,6 +106,7 @@ All (GUI):
 wxGTK:
 
 - Implement wxTextCtrl::HitTest() for single line controls.
+- Fix not showing wxInfoBar with GTK+ 3 < 3.22.29.
 - Fix the build with glib < 2.32 (e.g. CentOS 6).
 
 wxMSW:
diff --git a/src/gtk/infobar.cpp b/src/gtk/infobar.cpp
index f918415505..ea7be9274b 100644
--- a/src/gtk/infobar.cpp
+++ b/src/gtk/infobar.cpp
@@ -145,6 +145,31 @@ bool wxInfoBar::Create(wxWindow *parent, wxWindowID winid)
     GTKConnectWidget("response", G_CALLBACK(wxgtk_infobar_response));
     GTKConnectWidget("close", G_CALLBACK(wxgtk_infobar_close));
 
+    // Work around GTK+ bug https://bugzilla.gnome.org/show_bug.cgi?id=710888
+    // by disabling the transition when showing it: without this, it's not
+    // shown at all.
+    //
+    // Compile-time check is needed because GtkRevealer is new in 3.10.
+#if GTK_CHECK_VERSION(3, 10, 0)
+    // Run-time check is needed because the bug was introduced in 3.10 and
+    // fixed in 3.22.29 (see 6b4d95e86dabfcdaa805fbf068a99e19736a39a4 and a
+    // couple of previous commits in GTK+ repository).
+    if ( gtk_check_version(3, 10, 0) == NULL &&
+            gtk_check_version(3, 22, 29) != NULL )
+    {
+        GObject* const
+            revealer = gtk_widget_get_template_child(GTK_WIDGET(m_widget),
+                                                     GTK_TYPE_INFO_BAR,
+                                                     "revealer");
+        if ( revealer )
+        {
+            gtk_revealer_set_transition_type(GTK_REVEALER (revealer),
+                                             GTK_REVEALER_TRANSITION_TYPE_NONE);
+            gtk_revealer_set_transition_duration(GTK_REVEALER (revealer), 0);
+        }
+    }
+#endif // GTK+ >= 3.10
+
     return true;
 }
 

From c482c2cb6486b256d0c415e158b2fafbd81c2655 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 14 Jul 2018 20:08:53 +0200
Subject: [PATCH 754/916] Make wxInfoBar in the dialogs sample more readable

As usual, when changing the background colour, we need to change the
foreground as well, otherwise the text risks becoming unreadable with
some default text colour values -- as was the case under GTK+ 3 with its
default theme.
---
 samples/dialogs/dialogs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 9de1fa2ab5..3fbfd99aeb 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -686,6 +686,7 @@ MyFrame::MyFrame(const wxString& title)
 
     // ... changing the colours and/or fonts
     m_infoBarAdvanced->SetOwnBackgroundColour(0xc8ffff);
+    m_infoBarAdvanced->SetForegroundColour(0x123312);
     m_infoBarAdvanced->SetFont(GetFont().Bold().Larger());
 
     // ... and changing the effect (only does anything under MSW currently)

From b554cf001834b72d19ba98a82eb4148bc98ae9ec Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 16 Jul 2018 19:25:40 +0200
Subject: [PATCH 755/916] Always add set the DataObject when starting the drag,
 regardless whether the event does, fixes crash

see #18167
---
 src/osx/cocoa/dataview.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 3583ec9369..82c02cc8a7 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -850,6 +850,7 @@ outlineView:(NSOutlineView*)outlineView
             wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, dvc, item);
             itemString = ::ConcatenateDataViewItemValues(dvc, item);
             itemObject->Add(new wxTextDataObject(itemString));
+            event.SetDataObject(itemObject);
             // check if event has not been vetoed:
             if (dvc->HandleWindowEvent(event) && event.IsAllowed() && (event.GetDataObject()->GetFormatCount() > 0))
             {

From d3e8d3f2711c3b2b2bbda4c6c89cfaa28cf68e2e Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 16 Jul 2018 19:42:35 +0200
Subject: [PATCH 756/916] Support or disable "insert" for drag/drop
 wxDataViewCtrl on OSX

see #18167
---
 include/wx/dataview.h     |  8 +++++++-
 src/common/datavcmn.cpp   |  1 +
 src/osx/cocoa/dataview.mm | 26 ++++++++++++++++++++------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 58b0fdafe4..573caf5227 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -846,7 +846,8 @@ public:
         m_dataBuffer(event.m_dataBuffer),
         m_dataSize(event.m_dataSize),
         m_dragFlags(event.m_dragFlags),
-        m_dropEffect(event.m_dropEffect)
+        m_dropEffect(event.m_dropEffect),
+        m_proposedDropIndex(event.m_proposedDropIndex)
 #endif
         { }
 
@@ -889,6 +890,10 @@ public:
     int GetDragFlags() const { return m_dragFlags; }
     void SetDropEffect( wxDragResult effect ) { m_dropEffect = effect; }
     wxDragResult GetDropEffect() const { return m_dropEffect; }
+    // for plaforms (currently only OSX) that support Drag/Drop insertion of items,
+	// this is the proposed child index for the insertion
+	void SetProposedDropIndex(int index) { m_proposedDropIndex = index; }
+	int GetProposedDropIndex() const { return m_proposedDropIndex;}
 #endif // wxUSE_DRAG_AND_DROP
 
     virtual wxEvent *Clone() const wxOVERRIDE { return new wxDataViewEvent(*this); }
@@ -928,6 +933,7 @@ protected:
 
     int                 m_dragFlags;
     wxDragResult        m_dropEffect;
+    int                 m_proposedDropIndex;
 #endif // wxUSE_DRAG_AND_DROP
 
 private:
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 1c3609261e..fd68880243 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1683,6 +1683,7 @@ void wxDataViewEvent::Init(wxDataViewCtrlBase* dvc,
     m_dataSize = 0;
     m_dragFlags = 0;
     m_dropEffect = wxDragNone;
+    m_proposedDropIndex = -1;
 #endif // wxUSE_DRAG_AND_DROP
 
     SetEventObject(dvc);
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 82c02cc8a7..a2b20c00a0 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -539,9 +539,8 @@ outlineView:(NSOutlineView*)outlineView
     item:(id)item childIndex:(NSInteger)index
 {
     wxUnusedVar(outlineView);
-    wxUnusedVar(index);
     
-    return [self setupAndCallDataViewEvents:wxEVT_DATAVIEW_ITEM_DROP dropInfo:info item:item] != NSDragOperationNone;
+    return [self setupAndCallDataViewEvents:wxEVT_DATAVIEW_ITEM_DROP dropInfo:info item:item proposedChildIndex:index] != NSDragOperationNone;
 }
 
 -(id) outlineView:(NSOutlineView*)outlineView
@@ -680,10 +679,11 @@ outlineView:(NSOutlineView*)outlineView
     wxUnusedVar(outlineView);
     wxUnusedVar(index);
 
-    return [self setupAndCallDataViewEvents:wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE dropInfo:info item:item];
+    return [self setupAndCallDataViewEvents:wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE dropInfo:info item:item proposedChildIndex:index];
 }
 
 -(NSDragOperation) callDataViewEvents:(wxEventType)eventType dataObjects:(wxDataObjectComposite*)dataObjects item:(id)item
+                   proposedChildIndex:(NSInteger)index
 {
     NSDragOperation dragOperation = NSDragOperationNone;
     wxDataViewCtrl* const dvc(implementation->GetDataViewCtrl());
@@ -693,7 +693,20 @@ outlineView:(NSOutlineView*)outlineView
         // copy data into data object:
         event.SetDataObject(dataObjects);
         event.SetDataFormat(implementation->GetDnDDataFormat(dataObjects));
-        event.SetDropEffect(wxDragCopy);
+        event.SetProposedDropIndex(index);
+        if (index == -1)
+        {
+            event.SetDropEffect(wxDragCopy);
+        }
+        else
+        {
+            //if index is not -1, we're going to set the default
+            //for the drop effect to None to be compatible with
+            //the other wxPlatforms that don't support it.  In the
+            //user code for for the event, they can set this to
+            //copy/move or similar to support it.
+            event.SetDropEffect(wxDragNone);
+        }
         wxDataFormatId formatId = event.GetDataFormat().GetType();
         wxMemoryBuffer buffer;
         
@@ -745,6 +758,7 @@ outlineView:(NSOutlineView*)outlineView
 }
 
 -(NSDragOperation) setupAndCallDataViewEvents:(wxEventType)eventType dropInfo:(id<NSDraggingInfo>)info item:(id)item
+                           proposedChildIndex:(NSInteger)index
 {
     NSArray* supportedTypes(
                             [NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]
@@ -774,7 +788,7 @@ outlineView:(NSOutlineView*)outlineView
         {
             wxDataObjectComposite* dataObjects(implementation->GetDnDDataObjects((NSData*)[dataArray objectAtIndex:indexDraggedItem]));
             
-            dragOperation = [self callDataViewEvents:eventType dataObjects:dataObjects item:item];
+            dragOperation = [self callDataViewEvents:eventType dataObjects:dataObjects item:item proposedChildIndex:index];
             
             if ( dragOperation != NSDragOperationNone )
                 ++indexDraggedItem;
@@ -806,7 +820,7 @@ outlineView:(NSOutlineView*)outlineView
             delete textDataObject;
         // send event if data could be copied:
         
-        dragOperation = [self callDataViewEvents:eventType dataObjects:dataObjects item:item];
+        dragOperation = [self callDataViewEvents:eventType dataObjects:dataObjects item:item proposedChildIndex:index];
 
         // clean up:
         ::CFRelease(osxData);

From 85c2877a6c660c3b59c7a5400bab224374e3324a Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 16 Jul 2018 20:37:09 +0200
Subject: [PATCH 757/916] Support or disable "insert" for drag/drop
 wxDataViewCtrl on OSX, missed one part

see #18167
---
 src/osx/cocoa/dataview.mm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index a2b20c00a0..a7ec7df23f 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -677,7 +677,6 @@ outlineView:(NSOutlineView*)outlineView
 -(NSDragOperation) outlineView:(NSOutlineView*)outlineView validateDrop:(id<NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
 {
     wxUnusedVar(outlineView);
-    wxUnusedVar(index);
 
     return [self setupAndCallDataViewEvents:wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE dropInfo:info item:item proposedChildIndex:index];
 }

From 1f8ccb7726752411ba067d7b1f1999315507cc9c Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Wed, 18 Jul 2018 13:06:34 +0200
Subject: [PATCH 758/916] Avoid incompatible macro redefinition

---
 setup.h_vms | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.h_vms b/setup.h_vms
index 85bc02d2f9..8d374384ab 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -76,7 +76,7 @@
 #ifdef __WXGTK__
 
 #ifndef VMS_GTK2
-#define GDK_WINDOWING_X11 1
+#define GDK_WINDOWING_X11
 #endif
 
 /* Define this if your version of GTK+ is greater than 1.2.7 */
@@ -510,7 +510,7 @@ typedef pid_t GPid;
 
 #define wxUSE_CARET         1
 
-#define wxUSE_DISPLAY       1
+#define wxUSE_DISPLAY       0
 
 #define wxUSE_GEOMETRY            1
 

From fd4d38e657938e2a478032ce306b887c4a16e4ee Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Thu, 19 Jul 2018 09:52:44 +0200
Subject: [PATCH 759/916] Always include wx/display.h (also when
 wxUSE_DISPLAY=0)

---
 src/stc/PlatWX.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index ecca096883..1efb9d9de0 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -22,9 +22,7 @@
 
 #include <ctype.h>
 
-#if wxUSE_DISPLAY
 #include "wx/display.h"
-#endif
 
 #include "wx/encconv.h"
 #include "wx/listctrl.h"

From 4a53b029de2520938b02e945cdabd832c3c4fbbd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 21 Jul 2018 13:25:44 +0200
Subject: [PATCH 760/916] Mark WXSTRINGCAST and related macros as obsolete in a
 comment

Make it clear that these macros are defined for compatibility only and
shouldn't be used.

See https://github.com/wxWidgets/wxWidgets/pull/857
---
 include/wx/string.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/wx/string.h b/include/wx/string.h
index 031cff5a60..c05eeac92e 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -90,8 +90,9 @@ namespace wxPrivate
 // macros
 // ---------------------------------------------------------------------------
 
-// casts [unfortunately!] needed to call some broken functions which require
-// "char *" instead of "const char *"
+// These macros are not used by wxWidgets itself any longer and are only
+// preserved for compatibility with the user code that might be still using
+// them. Do _not_ use them in the new code, just use const_cast<> instead.
 #define   WXSTRINGCAST (wxChar *)(const wxChar *)
 #define   wxCSTRINGCAST (wxChar *)(const wxChar *)
 #define   wxMBSTRINGCAST (char *)(const char *)

From d390bee8a2135dd9cb64130e959840268539fe45 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 21 Jul 2018 14:03:47 +0200
Subject: [PATCH 761/916] Allow comparing wxString with wide strings in
 non-Unicode build

This fixes a compilation error in wxMSW private fonts support
implementation, which compares wxString with a wide string but, unlike a
local fix there, makes sense more broadly and should reduce the
likelihood of similar errors in the future.

It also makes comparisons with narrow C strings more efficient in the
default, Unicode, build by using wxString::Cmp() method instead of
creating a temporary wxString, as was done before.

See #18172.
---
 include/wx/string.h | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/include/wx/string.h b/include/wx/string.h
index c05eeac92e..68651f35e3 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -3839,9 +3839,11 @@ public:
 // wxString comparison functions: operator versions are always case sensitive
 // ---------------------------------------------------------------------------
 
+// comparison with C-style narrow and wide strings.
 #define wxCMP_WXCHAR_STRING(p, s, op) 0 op s.Cmp(p)
 
-wxDEFINE_ALL_COMPARISONS(const wxChar *, const wxString&, wxCMP_WXCHAR_STRING)
+wxDEFINE_ALL_COMPARISONS(const wchar_t *, const wxString&, wxCMP_WXCHAR_STRING)
+wxDEFINE_ALL_COMPARISONS(const char *, const wxString&, wxCMP_WXCHAR_STRING)
 
 #undef wxCMP_WXCHAR_STRING
 
@@ -3930,17 +3932,6 @@ inline bool wxString::iterator::operator<=(const const_iterator& i) const
 inline bool wxString::iterator::operator>=(const const_iterator& i) const
     { return i <= *this; }
 
-// comparison with C string in Unicode build
-#if wxUSE_UNICODE
-
-#define wxCMP_CHAR_STRING(p, s, op) wxString(p) op s
-
-wxDEFINE_ALL_COMPARISONS(const char *, const wxString&, wxCMP_CHAR_STRING)
-
-#undef wxCMP_CHAR_STRING
-
-#endif // wxUSE_UNICODE
-
 // we also need to provide the operators for comparison with wxCStrData to
 // resolve ambiguity between operator(const wxChar *,const wxString &) and
 // operator(const wxChar *, const wxChar *) for "p == s.c_str()"

From d605405ca1cdebc260569018686e03fb28434b9a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 21 Jul 2018 14:07:32 +0200
Subject: [PATCH 762/916] Fix building wxMSW GDI+ graphics code in non-Unicode
 build

Use wc_str() with GDI+ function which always takes wide strings, even in
non-Unicode build.

Closes #18172.
---
 docs/changes.txt     | 1 +
 src/msw/graphics.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 7936144c7b..94c3ce14eb 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -118,6 +118,7 @@ wxMSW:
 - Fix positioning windows at positions >= SHORT_MAX (Cătălin Răceanu).
 - Honour alignment flags for multiline buttons using custom colours too.
 - Support MSVC auto-linking when using monolithic build too (PB).
+- Fix build in ANSI (non-Unicode) mode.
 
 wxOSX:
 
diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index f7c014d9d4..8d752b8ab6 100644
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -2335,7 +2335,7 @@ void wxGDIPlusRenderer::Load()
             for ( size_t i = 0 ; i < n; i++ )
             {
                 const wxString& fname = privateFonts[i];
-                gs_privateFonts->AddFontFile(fname.t_str());
+                gs_privateFonts->AddFontFile(fname.wc_str());
             }
 
             gs_pFontFamily = new Gdiplus::FontFamily[n];

From c4c4fb46d9d54e42285a0dd22dc03e32e7864466 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 21 Jul 2018 14:35:56 +0200
Subject: [PATCH 763/916] Remove unnecessary SetMargins() calls from
 wxBitmapButton ctor

Margins are overwritten by Create() anyhow, so there is just no need to
set them in the default ctor.
---
 include/wx/osx/bmpbuttn.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 813a6dcb61..2a269d356c 100644
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -20,7 +20,6 @@ class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
 public:
     wxBitmapButton()
         {
-            SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
         }
 
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,

From 5b703b6a24ff719d1ba16121ac41ea0f5b41671f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 21 Jul 2018 14:38:31 +0200
Subject: [PATCH 764/916] Always use default margins for wxBitmapButton under
 Mac

Previously this was only done when wxBU_AUTODRAW was specified, making
this the only place in wxWidgets where this style was actually used.

This was not ideal, as the same code, not using wxBU_AUTODRAW, worked
just fine under MSW and GTK, but created ugly-looking buttons under Mac,
so do the right thing by default and let people call SetMargins(0, 0) if
they really don't want to have any margins.

Closes #18170.
---
 docs/changes.txt         |  4 ++++
 src/osx/bmpbuttn_osx.cpp | 12 ++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 7936144c7b..f93ec456f7 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -47,6 +47,10 @@ Changes in behaviour not resulting in compilation errors
   event handlers if you want the standard key combinations such as Alt-Space or
   Alt-F4 to work.
 
+- wxOSX port uses default button margins for wxBitmapButton by default, for
+  consistency with the other ports. You now need to call SetMargins(0, 0)
+  explicitly if you really don't want to have any margins in your buttons.
+
 
 Changes in behaviour which may result in build errors
 -----------------------------------------------------
diff --git a/src/osx/bmpbuttn_osx.cpp b/src/osx/bmpbuttn_osx.cpp
index f2088bd480..5f26d49e71 100644
--- a/src/osx/bmpbuttn_osx.cpp
+++ b/src/osx/bmpbuttn_osx.cpp
@@ -38,16 +38,8 @@ bool wxBitmapButton::Create( wxWindow *parent,
                                      validator, name) )
         return false;
 
-    if ( style & wxBU_AUTODRAW )
-    {
-        m_marginX =
-        m_marginY = wxDEFAULT_BUTTON_MARGIN;
-    }
-    else
-    {
-        m_marginX =
-        m_marginY = 0;
-    }
+    m_marginX =
+    m_marginY = wxDEFAULT_BUTTON_MARGIN;
 
     m_bitmaps[State_Normal] = bitmap;
 

From 71cef5f3be06b861637d9f85d36bf4cdca58f8a4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 21 Jul 2018 14:42:06 +0200
Subject: [PATCH 765/916] Stop using wxBU_AUTODRAW in wxWidgets code

This style bit is obsolete and doesn't do anything, so remove confusing
references to it.
---
 include/wx/anybutton.h               | 2 +-
 include/wx/cshelp.h                  | 4 ++--
 include/wx/gtk1/bmpbuttn.h           | 4 ++--
 include/wx/motif/bmpbuttn.h          | 4 ++--
 include/wx/msw/bmpbuttn.h            | 4 ++--
 include/wx/osx/bmpbuttn.h            | 4 ++--
 interface/wx/anybutton.h             | 2 +-
 interface/wx/bmpbuttn.h              | 4 ++--
 interface/wx/cshelp.h                | 2 +-
 src/generic/buttonbar.cpp            | 2 +-
 src/generic/clrpickerg.cpp           | 2 +-
 src/xrc/xh_bmpbt.cpp                 | 2 +-
 utils/screenshotgen/src/guiframe.cpp | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h
index ff41ce999c..828ce7d690 100644
--- a/include/wx/anybutton.h
+++ b/include/wx/anybutton.h
@@ -25,7 +25,7 @@
 #define wxBU_BOTTOM          0x0200
 #define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
 
-// These two flags are obsolete
+// These two flags are obsolete and have no effect any longer.
 #define wxBU_NOAUTODRAW      0x0000
 #define wxBU_AUTODRAW        0x0004
 
diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index c521d454bc..a1b0e53a6e 100644
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -73,7 +73,7 @@ public:
                         wxWindowID id = wxID_CONTEXT_HELP,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
-                        long style = wxBU_AUTODRAW)
+                        long style = 0)
     {
         Create(parent, id, pos, size, style);
     }
@@ -83,7 +83,7 @@ public:
                 wxWindowID id = wxID_CONTEXT_HELP,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW);
+                long style = 0);
 
 
     void OnContextHelp(wxCommandEvent& event);
diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 8c08f3d575..d1674e5813 100644
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -24,7 +24,7 @@ public:
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxBU_AUTODRAW,
+                   long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
@@ -38,7 +38,7 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW,
+                long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index 9fc399a7fb..3ef6ea7865 100644
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -22,7 +22,7 @@ public:
     virtual ~wxBitmapButton();
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
         const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+        const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxButtonNameStr)
     {
@@ -31,7 +31,7 @@ public:
 
     bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
         const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+        const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxButtonNameStr);
 
diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 066c0f4f4f..ce4e20fed2 100644
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -25,7 +25,7 @@ public:
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxBU_AUTODRAW,
+                   long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
@@ -37,7 +37,7 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW,
+                long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 2a269d356c..33253d5613 100644
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -24,7 +24,7 @@ public:
 
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+                   const wxSize& size = wxDefaultSize, long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
         {
@@ -33,7 +33,7 @@ public:
 
     bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+                const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
diff --git a/interface/wx/anybutton.h b/interface/wx/anybutton.h
index f4e2c2446a..5887f8ffd6 100644
--- a/interface/wx/anybutton.h
+++ b/interface/wx/anybutton.h
@@ -13,7 +13,7 @@
 
 #define wxBU_EXACTFIT        0x0001
 #define wxBU_NOTEXT          0x0002
-#define wxBU_AUTODRAW        0x0004
+#define wxBU_AUTODRAW        0x0004 ///< Obsolete, has no effect.
 
 
 /**
diff --git a/interface/wx/bmpbuttn.h b/interface/wx/bmpbuttn.h
index f8e8c3fed5..9c04bc2993 100644
--- a/interface/wx/bmpbuttn.h
+++ b/interface/wx/bmpbuttn.h
@@ -83,7 +83,7 @@ public:
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxBU_AUTODRAW,
+                   long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr);
 
@@ -95,7 +95,7 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW,
+                long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
diff --git a/interface/wx/cshelp.h b/interface/wx/cshelp.h
index 123a7bbc05..e7f80d4c6b 100644
--- a/interface/wx/cshelp.h
+++ b/interface/wx/cshelp.h
@@ -271,7 +271,7 @@ public:
                         wxWindowID id = wxID_CONTEXT_HELP,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
-                        long style = wxBU_AUTODRAW);
+                        long style = 0);
 };
 
 
diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index c67ddd4d16..38848cd30b 100644
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -389,7 +389,7 @@ void wxButtonToolBar::DoLayout()
             if (!tool->GetButton())
             {
                 wxBitmapButton* bmpButton = new wxBitmapButton(this, tool->GetId(), tool->GetNormalBitmap(), wxPoint(tool->m_x, tool->m_y), wxDefaultSize,
-                                                               wxBU_AUTODRAW|wxBORDER_NONE);
+                                                               wxBORDER_NONE);
                 if (!tool->GetShortHelp().empty())
                     bmpButton->SetLabel(tool->GetShortHelp());
 
diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 5bb576a3c2..58cd06ab8a 100644
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -50,7 +50,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
 
     // create this button
     if (!wxBitmapButton::Create( parent, id, m_bitmap, pos,
-                           size, style | wxBU_AUTODRAW, validator, name ))
+                           size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxGenericColourButton creation failed") );
         return false;
diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index c82857977c..53af4880e7 100644
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -44,7 +44,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
                    GetID(),
                    GetBitmap(wxT("bitmap"), wxART_BUTTON),
                    GetPosition(), GetSize(),
-                   GetStyle(wxT("style"), wxBU_AUTODRAW),
+                   GetStyle(wxT("style")),
                    wxDefaultValidator,
                    GetName());
     if (GetBool(wxT("default"), 0))
diff --git a/utils/screenshotgen/src/guiframe.cpp b/utils/screenshotgen/src/guiframe.cpp
index 050902b0c9..216760bebd 100644
--- a/utils/screenshotgen/src/guiframe.cpp
+++ b/utils/screenshotgen/src/guiframe.cpp
@@ -148,7 +148,7 @@ void GUIFrame::AddPanel_1()
     m_radioBtn2->SetToolTip( _("wxRadioButton") );
     fgSizer1->Add( m_radioBtn2, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 );
 
-    m_bpButton1 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    m_bpButton1 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, 0 );
     m_bpButton1->SetToolTip( _("wxBitmapButton") );
     m_bpButton1->SetToolTip( _("wxBitmapButton") );
     fgSizer1->Add( m_bpButton1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 );

From e24e9323e01ef013b54c0b38d97a8b4d15f47184 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 21 Jul 2018 16:00:08 +0200
Subject: [PATCH 766/916] Fix clobbering warnings in PNG image loading code in
 a better way

Add wxPNGImageData and use it to store variables that used to be local
in wxPNGHandler::LoadFile() and could be clobbered by the use of
longjmp() and pass these variables to DoLoadPNGFile(), which still uses
longjmp(), whereas LoadFile() doesn't any longer.

In addition to fixing the warning, this allows to use C++ dtors for
freeing memory and makes the code shorter and, arguably, more clear than
the original version (although written in an unusual way) and definitely
more clear than the version with the warning fix.

This reverts commit 99ea06203aec0ebb1f8978cb34a50483e0fa746c ("Fix
clobbering warning") and replaces it with a different solution to the
same problem.
---
 src/common/imagpng.cpp | 151 ++++++++++++++++++++++++++---------------
 1 file changed, 95 insertions(+), 56 deletions(-)

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 0644d0c82d..48aee7d5fc 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -68,6 +68,8 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler);
     #endif
 #endif
 
+namespace
+{
 
 // VS: wxPNGInfoStruct declared below is a hack that needs some explanation.
 //     First, let me describe what's the problem: libpng uses jmp_buf in
@@ -93,10 +95,57 @@ struct wxPNGInfoStruct
         wxInputStream  *in;
         wxOutputStream *out;
     } stream;
+
 };
 
 #define WX_PNG_INFO(png_ptr) ((wxPNGInfoStruct*)png_get_io_ptr(png_ptr))
 
+// This is another helper struct which is used to pass parameters to
+// DoLoadPNGFile(). It allows us to use the usual RAII for freeing memory,
+// which wouldn't be possible inside DoLoadPNGFile() because it uses
+// setjmp/longjmp() functions for error handling, which are incompatible with
+// C++ destructors.
+struct wxPNGImageData
+{
+    wxPNGImageData()
+    {
+        lines = NULL;
+        numLines = 0;
+        ok = false;
+    }
+
+    bool Alloc(png_uint_32 width, png_uint_32 height)
+    {
+        lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
+        if ( !lines )
+            return false;
+
+        numLines = height;
+        for ( unsigned int n = 0; n < numLines; n++ )
+        {
+            lines[n] = (unsigned char *)malloc( (size_t)(width * 4));
+            if ( !lines[n] )
+                return false;
+        }
+
+        return true;
+    }
+
+    ~wxPNGImageData()
+    {
+        for ( unsigned int n = 0; n < numLines; n++ )
+            free( lines[n] );
+
+        free( lines );
+    }
+
+    unsigned char** lines;
+    png_uint_32 numLines;
+    bool ok;
+};
+
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // helper functions
 // ----------------------------------------------------------------------------
@@ -247,27 +296,23 @@ void CopyDataFromPNG(wxImage *image,
     #pragma warning(disable:4611)
 #endif /* VC++ */
 
-bool
-wxPNGHandler::LoadFile(wxImage *image,
-                       wxInputStream& stream,
-                       bool verbose,
-                       int WXUNUSED(index))
+// This function uses wxPNGImageData to store some of its "local" variables in
+// order to avoid clobbering these variables by longjmp(): having them inside
+// the stack frame of the caller prevents this from happening. It also
+// "returns" its result via "data" parameter: use its "ok" field to check
+// whether loading succeeded or failed.
+static
+void
+DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo, wxPNGImageData& data)
 {
     // VZ: as this function uses setjmp() the only fool-proof error handling
     //     method is to use goto (setjmp is not really C++ dtors friendly...)
 
-    // allocate the lines pointer dynamically to avoid clobbering by longjmp
-    unsigned char *** const lines_p = new unsigned char ** (NULL);
-    unsigned char ** &lines = *lines_p;
     png_infop info_ptr = (png_infop) NULL;
-    wxPNGInfoStruct wxinfo;
 
-    png_uint_32 i, width, height = 0;
+    png_uint_32 width, height = 0;
     int bit_depth, color_type, interlace_type;
 
-    wxinfo.verbose = verbose;
-    wxinfo.stream.in = &stream;
-
     image->Destroy();
 
     png_structp png_ptr = png_create_read_struct
@@ -278,7 +323,7 @@ wxPNGHandler::LoadFile(wxImage *image,
                             wx_PNG_warning
                           );
     if (!png_ptr)
-        goto error;
+        return;
 
     // NB: please see the comment near wxPNGInfoStruct declaration for
     //     explanation why this line is mandatory
@@ -286,7 +331,10 @@ wxPNGHandler::LoadFile(wxImage *image,
 
     info_ptr = png_create_info_struct( png_ptr );
     if (!info_ptr)
-        goto error;
+    {
+        png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
+        return;
+    }
 
     if (setjmp(wxinfo.jmpbuf))
         goto error;
@@ -314,17 +362,10 @@ wxPNGHandler::LoadFile(wxImage *image,
 
     // initialize all line pointers to NULL to ensure that they can be safely
     // free()d if an error occurs before all of them could be allocated
-    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-    if ( !lines )
+    if ( !data.Alloc(width, height) )
         goto error;
 
-    for (i = 0; i < height; i++)
-    {
-        if ((lines[i] = (unsigned char *)malloc( (size_t)(width * 4))) == NULL)
-            goto error;
-    }
-
-    png_read_image( png_ptr, lines );
+    png_read_image( png_ptr, data.lines );
     png_read_end( png_ptr, info_ptr );
 
 #if wxUSE_PALETTE
@@ -394,49 +435,47 @@ wxPNGHandler::LoadFile(wxImage *image,
     }
 
 
-    png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
-
     // loaded successfully, now init wxImage with this data
-    CopyDataFromPNG(image, lines, width, height, color_type);
+    CopyDataFromPNG(image, data.lines, width, height, color_type);
 
-    for ( i = 0; i < height; i++ )
-        free( lines[i] );
-    free( lines );
-    delete lines_p;
-
-    return true;
+    // This will indicate to the caller that loading succeeded.
+    data.ok = true;
 
 error:
-    if (verbose)
-    {
-       wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
-    }
+    // Note that we only get here if both png_ptr and info_ptr are valid,
+    // otherwise we just return from this function early.
+    png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
+}
 
-    if ( image->IsOk() )
-    {
-        image->Destroy();
-    }
+bool
+wxPNGHandler::LoadFile(wxImage *image,
+                       wxInputStream& stream,
+                       bool verbose,
+                       int WXUNUSED(index))
+{
+    wxPNGInfoStruct wxinfo;
+    wxinfo.verbose = verbose;
+    wxinfo.stream.in = &stream;
 
-    if ( lines )
-    {
-        for ( unsigned int n = 0; n < height; n++ )
-            free( lines[n] );
+    wxPNGImageData data;
+    DoLoadPNGFile(image, wxinfo, data);
 
-        free( lines );
-    }
-    delete lines_p;
-
-    if ( png_ptr )
+    if ( !data.ok )
     {
-        if ( info_ptr )
+        if (verbose)
         {
-            png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
-            free(info_ptr);
+           wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
         }
-        else
-            png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
+
+        if ( image->IsOk() )
+        {
+            image->Destroy();
+        }
+
+        return false;
     }
-    return false;
+
+    return true;
 }
 
 // ----------------------------------------------------------------------------

From 8dfd799fd521eaf95d784076c069657b1b47efcb Mon Sep 17 00:00:00 2001
From: orbitcowboy <orbitcowboy@web.de>
Date: Tue, 29 May 2018 09:54:19 +0200
Subject: [PATCH 767/916] Use const for constant local variables in wxWidgets
 headers

This avoids warnings from MSVS 2017 static analyzer when C++ core rule
set is activated.

Closes https://github.com/wxWidgets/wxWidgets/pull/819
---
 include/wx/arrstr.h                | 10 +++++-----
 include/wx/clntdata.h              |  2 +-
 include/wx/event.h                 |  2 +-
 include/wx/file.h                  |  2 +-
 include/wx/log.h                   |  6 +++---
 include/wx/longlong.h              |  2 +-
 include/wx/msw/ole/oleutils.h      |  2 +-
 include/wx/msw/private/fswatcher.h |  4 ++--
 include/wx/string.h                |  8 ++++----
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index 23a73fefb8..d716bc0e6b 100644
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -280,9 +280,9 @@ public:
     pointer operator->() const { return m_ptr; }
     itor& operator++() { --m_ptr; return *this; }
     const itor operator++(int)
-      { reverse_iterator tmp = *this; --m_ptr; return tmp; }
+      { const reverse_iterator tmp = *this; --m_ptr; return tmp; }
     itor& operator--() { ++m_ptr; return *this; }
-    const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }
+    const itor operator--(int) { const itor tmp = *this; ++m_ptr; return tmp; }
     bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; }
     bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }
   };
@@ -307,9 +307,9 @@ public:
     pointer operator->() const { return m_ptr; }
     itor& operator++() { --m_ptr; return *this; }
     const itor operator++(int)
-      { itor tmp = *this; --m_ptr; return tmp; }
+      { const itor tmp = *this; --m_ptr; return tmp; }
     itor& operator--() { ++m_ptr; return *this; }
-    const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }
+    const itor operator--(int) { const itor tmp = *this; ++m_ptr; return tmp; }
     bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; }
     bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }
   };
@@ -421,7 +421,7 @@ public:
     wxString* GetStrings()
     {
         if( m_strings ) return m_strings;
-        size_t count = m_array.GetCount();
+        const size_t count = m_array.GetCount();
         m_strings = new wxString[count];
         for( size_t i = 0; i < count; ++i )
             m_strings[i] = m_array[i];
diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index a41ccc0ea9..0619ff3b6a 100644
--- a/include/wx/clntdata.h
+++ b/include/wx/clntdata.h
@@ -47,7 +47,7 @@ public:
         if (it == m_methods.end())
             return false;
         wxShadowObjectMethod method = it->second;
-        int ret = (*method)(window, param);
+        const int ret = (*method)(window, param);
         if (returnValue)
             *returnValue = ret;
         return true;
diff --git a/include/wx/event.h b/include/wx/event.h
index 21fa3924c7..d2b7a5d932 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -972,7 +972,7 @@ public:
     // propagation level value
     int StopPropagation()
     {
-        int propagationLevel = m_propagationLevel;
+        const int propagationLevel = m_propagationLevel;
         m_propagationLevel = wxEVENT_PROPAGATE_NONE;
         return propagationLevel;
     }
diff --git a/include/wx/file.h b/include/wx/file.h
index 00ac471abf..3ca1d4dde4 100644
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -65,7 +65,7 @@ public:
 
   // assign an existing file descriptor and get it back from wxFile object
   void Attach(int lfd) { Close(); m_fd = lfd; m_lasterror = 0; }
-  int  Detach() { int fdOld = m_fd; m_fd = fd_invalid; return fdOld; }
+  int  Detach() { const int fdOld = m_fd; m_fd = fd_invalid; return fdOld; }
   int  fd() const { return m_fd; }
 
   // read/write (unbuffered)
diff --git a/include/wx/log.h b/include/wx/log.h
index 3d7d273cbe..c3d4343ce7 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -244,7 +244,7 @@ public:
         if ( !m_data )
             return false;
 
-        wxStringToNumHashMap::const_iterator it = m_data->numValues.find(key);
+        const wxStringToNumHashMap::const_iterator it = m_data->numValues.find(key);
         if ( it == m_data->numValues.end() )
             return false;
 
@@ -258,7 +258,7 @@ public:
         if ( !m_data )
             return false;
 
-        wxStringToStringHashMap::const_iterator it = m_data->strValues.find(key);
+        const wxStringToStringHashMap::const_iterator it = m_data->strValues.find(key);
         if ( it == m_data->strValues.end() )
             return false;
 
@@ -379,7 +379,7 @@ public:
             return EnableThreadLogging(enable);
 #endif // wxUSE_THREADS
 
-        bool doLogOld = ms_doLog;
+        const bool doLogOld = ms_doLog;
         ms_doLog = enable;
         return doLogOld;
     }
diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index f28a3635c8..3e503c97f6 100644
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -1060,7 +1060,7 @@ inline wxULongLong operator+(unsigned long l, const wxULongLong& ull) { return u
 
 inline wxLongLong operator-(unsigned long l, const wxULongLong& ull)
 {
-    wxULongLong ret = wxULongLong(l) - ull;
+    const wxULongLong ret = wxULongLong(l) - ull;
     return wxLongLong((wxInt32)ret.GetHi(),ret.GetLo());
 }
 
diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index f334a7a289..ed45e592d0 100644
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -38,7 +38,7 @@
 // return true if ok, false otherwise
 inline bool wxOleInitialize()
 {
-    HRESULT
+    const HRESULT
     hr = ::OleInitialize(NULL);
 
     // RPC_E_CHANGED_MODE indicates that OLE had been already initialized
diff --git a/include/wx/msw/private/fswatcher.h b/include/wx/msw/private/fswatcher.h
index 7bf034f018..31daa038fc 100644
--- a/include/wx/msw/private/fswatcher.h
+++ b/include/wx/msw/private/fswatcher.h
@@ -207,7 +207,7 @@ public:
         wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" );
 
         // The special values of 0 will make GetStatus() return Status_Exit.
-        int ret = PostQueuedCompletionStatus(m_iocp, 0, 0, NULL);
+        const int ret = PostQueuedCompletionStatus(m_iocp, 0, 0, NULL);
         if (!ret)
         {
             wxLogSysError(_("Unable to post completion status"));
@@ -244,7 +244,7 @@ public:
         wxCHECK_MSG( count && watch && overlapped, Status_Error,
                      "Output parameters can't be NULL" );
 
-        int ret = GetQueuedCompletionStatus(m_iocp, count, (ULONG_PTR *)watch,
+        const int ret = GetQueuedCompletionStatus(m_iocp, count, (ULONG_PTR *)watch,
                                             overlapped, INFINITE);
         if ( ret != 0 )
         {
diff --git a/include/wx/string.h b/include/wx/string.h
index c05eeac92e..75b5a587d4 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -994,7 +994,7 @@ public:
       // This is logically equivalent to strlen(str.mb_str()) but avoids
       // actually converting the string to multibyte and just computes the
       // length that it would have after conversion.
-      size_t ofs = wxConvLibc.FromWChar(NULL, 0, str.wc_str(), str.length());
+      const size_t ofs = wxConvLibc.FromWChar(NULL, 0, str.wc_str(), str.length());
       return ofs == wxCONV_FAILED ? 0 : static_cast<ptrdiff_t>(ofs);
   }
 
@@ -2161,17 +2161,17 @@ public:
       // searching (return starting index, or -1 if not found)
   int Find(const wxString& sub) const               // like strstr
   {
-    size_type idx = find(sub);
+    const size_type idx = find(sub);
     return (idx == npos) ? wxNOT_FOUND : (int)idx;
   }
   int Find(const char *sub) const               // like strstr
   {
-    size_type idx = find(sub);
+    const size_type idx = find(sub);
     return (idx == npos) ? wxNOT_FOUND : (int)idx;
   }
   int Find(const wchar_t *sub) const               // like strstr
   {
-    size_type idx = find(sub);
+    const size_type idx = find(sub);
     return (idx == npos) ? wxNOT_FOUND : (int)idx;
   }
 

From 566e401a3fc345900cc7f0e876d08285a6d6ff0a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Jun 2018 01:03:20 +0200
Subject: [PATCH 768/916] Add support for style="page-break-inside:avoid" to
 wxHTML

Allow using this style to prevent page breaks inside the given <div>.
---
 docs/changes.txt        |  1 +
 src/html/m_layout.cpp   |  6 ++++
 tests/html/htmprint.cpp | 68 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index 7936144c7b..39e2e4eb6a 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -102,6 +102,7 @@ All (GUI):
 - Add wxHtmlEasyPrinting::SetPromptMode() (pavel-t).
 - Fix possible infinite loop in wxHtmlWindow layout (trivia21).
 - Add "hint" property support to XRC for wxComboBox and wxSearchCtrl.
+- Add support for style="page-break-inside:avoid" to <div> in wxHTML.
 
 wxGTK:
 
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 95b0afbab2..e8f849b86f 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -187,6 +187,12 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
                 m_WParser->OpenContainer();
                 return false;
             }
+            else if(style.IsSameAs(wxT("PAGE-BREAK-INSIDE:AVOID"), false))
+            {
+                m_WParser->CloseContainer();
+                m_WParser->OpenContainer()->SetCanLiveOnPagebreak(false);
+                return false;
+            }
             else
             {
                 // Treat other STYLE parameters here when they're supported.
diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 34560d9cb8..2b7f6e561a 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -107,6 +107,74 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
             "</div>"
        );
     CHECK( CountPages(pr) == 2 );
+
+    // Also test that forbidding page breaks inside a paragraph works: it
+    // should move it entirely to the next page, resulting in one extra page
+    // compared to the version without "page-break-inside: avoid".
+    static const char* const text =
+"Early in the morning on the fourteenth of the spring month of Nisan the "
+"Procurator of Judea, Pontius Pilate, in a white cloak lined with blood red, "
+"emerged with his shuffling cavalryman's walk into the arcade connecting the two "
+"wings of the palace of Herod the Great. "
+"\n"
+"More than anything else in the world the Procurator hated the smell of attar of "
+"roses.  The omens for the day were bad, as this scent had been haunting him "
+"since dawn. "
+"\n"
+"It seemed to the Procurator that the very cypresses and palms in the garden "
+"were exuding the smell of roses, that this damned stench of roses was even "
+"mingling with the smell of leather tackle and sweat from his mounted bodyguard. "
+"\n"
+"A haze of smoke was drifting toward the arcade across the upper courtyard of "
+"the garden, coming from the wing at the rear of the palace, the quarters of the "
+"first cohort of the XII Legion; known as the \"Lightning,\" it had been "
+"stationed in Jerusalem since the Procurator's arrival.  The same oily perfume "
+"of roses was mixed with the acrid smoke that showed that the centuries' cooks "
+"had started to prepare breakfast "
+"\n"
+"\"Oh, gods, what are you punishing me for?..  No, there's no doubt, I have it "
+"again, this terrible incurable pain...  hemicrania, when half the head aches... "
+"There's no cure for it, nothing helps...  I must try not to move my head...\" "
+"\n"
+"A chair had already been placed on the mosaic floor by the fountain; without a "
+"glance around, the Procurator sat in it and stretched out his hand to one side. "
+"His secretary deferentially laid a piece of parchment in his hand.  Unable to "
+"restrain a grimace of agony, the Procurator gave a fleeting sideways look at "
+"its contents, returned the parchment to his secretary and said painfully, \"The "
+"accused comes from Galilee, does he?  Was the case sent to the tetrarch?\" "
+"\n"
+"\"Yes, Procurator,\" replied the secretary.  \"He declined to confirm the "
+"finding of the court and passed the Sanhedrin's sentence of death to you for "
+"confirmation.\" "
+"\n"
+"The Procurator's cheek twitched, and he said quietly, \"Bring in the accused.\" "
+        ;
+
+    pr.SetHtmlText
+       (
+            wxString::Format
+            (
+                "<img width=\"100\" height=\"600\" src=\"dummy\"/>"
+                "<div>%s</div>"
+                "<br/>"
+                "<img width=\"100\" height=\"600\" src=\"dummy\"/>",
+                text
+            )
+       );
+    CHECK( CountPages(pr) == 2 );
+
+    pr.SetHtmlText
+       (
+            wxString::Format
+            (
+                "<img width=\"100\" height=\"600\" src=\"dummy\"/>"
+                "<div style=\"page-break-inside:avoid\">%s</div>"
+                "<br/>"
+                "<img width=\"100\" height=\"600\" src=\"dummy\"/>",
+                text
+            )
+       );
+    CHECK( CountPages(pr) == 3 );
 }
 
 #endif //wxUSE_HTML

From 905789485a02b425356d2c9d3b4331f78aaa368e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Jun 2018 14:38:45 +0200
Subject: [PATCH 769/916] Fix the just added pagination test for high DPI
 systems

Adjust the font size used by a DPI-dependent factor to ensure that the
text takes the same amount of pixels independently of DPI.
---
 tests/html/htmprint.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 2b7f6e561a..9d805f4862 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -22,6 +22,9 @@
     #include "wx/dcmemory.h"
 #endif // WX_PRECOMP
 
+#include "wx/app.h"
+#include "wx/window.h"
+
 #include "wx/html/htmprint.h"
 
 namespace
@@ -59,6 +62,12 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
     // the DPI-dependent factor, but it doesn't seem to be worth doing it).
     pr.SetMargins(0, 0, 0, 0, 0);
 
+    // We do need to use DPI-proportional font sizes in order for the text used
+    // in the page-break-inside:avoid test to take the same amount of pixels
+    // for any DPI (12 being the font size used by wxHtmlDCRenderer by default).
+    const int adjFontSize = 12*wxTheApp->GetTopWindow()->GetContentScaleFactor();
+    pr.SetStandardFonts(adjFontSize);
+
     wxBitmap bmp(1000, 1000);
     wxMemoryDC dc(bmp);
     pr.SetUp(dc);
@@ -174,6 +183,7 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
                 text
             )
        );
+    INFO("Using base font size " << adjFontSize);
     CHECK( CountPages(pr) == 3 );
 }
 

From 0393940033976973c76bab8997112a2c7383e459 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Jun 2018 23:34:42 +0200
Subject: [PATCH 770/916] Add temporary debugging code for HTML pagination test
 failure

---
 .travis.yml           |  1 -
 appveyor.yml          | 19 -------------------
 src/html/htmprint.cpp |  2 ++
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 790f5aca76..aa86540a5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,6 @@ matrix:
 
 branches:
     only:
-        - master
         - WX_3_0_BRANCH
 
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
index 5b3d335e05..1361fa8a23 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,25 +17,6 @@ environment:
     CONFIGURATION: DLL Release
     ARCH: x64
     wxUSE_STL: 1
-  - TOOLSET: nmake
-    VS: '9.0'
-    BUILD: release
-    ARCH: x86
-    wxUSE_STL: 0
-  - TOOLSET: nmake
-    VS: '14.0'
-    BUILD: debug
-    ARCH: amd64
-    wxUSE_STL: 1
-  - TOOLSET: mingw
-    wxUSE_STL: 0
-  - TOOLSET: msys2
-    MSYSTEM: MINGW32
-  - TOOLSET: cygwin
-  - TOOLSET: cmake
-    GENERATOR: 'Visual Studio 12'
-    SHARED: ON
-    CONFIGURATION: Release
 
 clone_depth: 50
 
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index ba1f31b016..4de883fc2c 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -33,6 +33,7 @@
 #include "wx/wfstream.h"
 #include "wx/infobar.h"
 
+#include "wx/crt.h"
 
 // default font size of normal text (HTML font size 0) for printing, in points:
 #define DEFAULT_PRINT_FONT_SIZE   12
@@ -159,6 +160,7 @@ int wxHtmlDCRenderer::FindNextPageBreak(int pos) const
         wxCHECK_MSG( posNext > pos, wxNOT_FOUND, "Bug in AdjustPagebreak()" );
     }
 
+    wxPrintf("HTML-DEBUG: Next page break after %d is %d\n", pos, posNext);
     return posNext;
 }
 

From 96cca103281f6e2615877df0e48ed959b63499b7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 21 Jun 2018 01:39:04 +0200
Subject: [PATCH 771/916] Use fixed font name in the HTML pagination test

---
 tests/html/htmprint.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 9d805f4862..3ee81ca1d6 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -66,7 +66,7 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
     // in the page-break-inside:avoid test to take the same amount of pixels
     // for any DPI (12 being the font size used by wxHtmlDCRenderer by default).
     const int adjFontSize = 12*wxTheApp->GetTopWindow()->GetContentScaleFactor();
-    pr.SetStandardFonts(adjFontSize);
+    pr.SetStandardFonts(adjFontSize, "Helvetica");
 
     wxBitmap bmp(1000, 1000);
     wxMemoryDC dc(bmp);

From 1ce009e73ae605e57e84c61be865a59c124a43a2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 21 Jun 2018 16:50:59 +0200
Subject: [PATCH 772/916] Add even more debug output to the test

---
 tests/html/htmprint.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 3ee81ca1d6..c4a1812212 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -183,7 +183,9 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
                 text
             )
        );
-    INFO("Using base font size " << adjFontSize);
+    const wxSize ext = dc.GetTextExtent("Something");
+    WARN("Using base font size " << adjFontSize
+         << ", text extent of \"Something\" is " << ext.x << "x" << ext.y);
     CHECK( CountPages(pr) == 3 );
 }
 

From 321854b5193b8025cce2ca76302aff9d96a105c8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 22 Jul 2018 00:54:05 +0200
Subject: [PATCH 773/916] Try using fixed font size in pixels in the test

---
 tests/html/htmprint.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index c4a1812212..11dcc10c7a 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -65,8 +65,8 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
     // We do need to use DPI-proportional font sizes in order for the text used
     // in the page-break-inside:avoid test to take the same amount of pixels
     // for any DPI (12 being the font size used by wxHtmlDCRenderer by default).
-    const int adjFontSize = 12*wxTheApp->GetTopWindow()->GetContentScaleFactor();
-    pr.SetStandardFonts(adjFontSize, "Helvetica");
+    const wxFont fontFixedPixelSize(wxFontInfo(wxSize(10, 16)));
+    pr.SetStandardFonts(fontFixedPixelSize.GetPointSize(), "Helvetica");
 
     wxBitmap bmp(1000, 1000);
     wxMemoryDC dc(bmp);
@@ -184,7 +184,7 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
             )
        );
     const wxSize ext = dc.GetTextExtent("Something");
-    WARN("Using base font size " << adjFontSize
+    WARN("Using base font size " << fontFixedPixelSize.GetPointSize()
          << ", text extent of \"Something\" is " << ext.x << "x" << ext.y);
     CHECK( CountPages(pr) == 3 );
 }

From 97e217e175c0c4929e88efb3eed9ef56a52757ca Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 22 Jul 2018 19:12:17 +0200
Subject: [PATCH 774/916] Ensure that wxDatePickerCtrlGeneric does get focus
 events

Revert 1de107c03706de5e1864f7e167d29eea93df066f and remove the focus
event handler which duplicated and interfered with the handler inherited
from this class to make sure that we get wxEVT_{SET,KILL}_FOCUS for the
objects of this class.

Unfortunately these events now come in pairs, due to an extra artificial
event generated by wxComboBoxExtraInputHandler::OnFocus(), which is
still wrong -- but arguably less wrong and more useful than not sending
them at all.
---
 include/wx/generic/datectrl.h | 3 +--
 src/generic/datectlg.cpp      | 9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 09d340739d..4276ff853a 100644
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
 class WXDLLIMPEXP_FWD_ADV wxCalendarComboPopup;
 
 class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric
-    : public wxCompositeWindowSettersOnly< wxNavigationEnabled<wxDatePickerCtrlBase> >
+    : public wxCompositeWindow< wxNavigationEnabled<wxDatePickerCtrlBase> >
 {
 public:
     // creating the control
@@ -80,7 +80,6 @@ private:
 
     void OnText(wxCommandEvent &event);
     void OnSize(wxSizeEvent& event);
-    void OnFocus(wxFocusEvent& event);
 
 #ifdef __WXOSX_COCOA__
     virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) wxOVERRIDE { }
diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 767a7454df..d5abccfd3a 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -296,7 +296,6 @@ wxEND_EVENT_TABLE()
 wxBEGIN_EVENT_TABLE(wxDatePickerCtrlGeneric, wxDatePickerCtrlBase)
     EVT_TEXT(wxID_ANY, wxDatePickerCtrlGeneric::OnText)
     EVT_SIZE(wxDatePickerCtrlGeneric::OnSize)
-    EVT_SET_FOCUS(wxDatePickerCtrlGeneric::OnFocus)
 wxEND_EVENT_TABLE()
 
 #ifndef wxHAS_NATIVE_DATEPICKCTRL
@@ -485,12 +484,4 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
     m_popup->SendDateEvent(dt);
 }
 
-
-void wxDatePickerCtrlGeneric::OnFocus(wxFocusEvent& WXUNUSED(event))
-{
-    m_combo->SetFocus();
-}
-
-
 #endif // wxUSE_DATEPICKCTRL
-

From e3df636d826f893d4025c2f09a3d70b38c89b129 Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Mon, 23 Jul 2018 08:33:10 +0300
Subject: [PATCH 775/916] Make DoLoadPNGFile member function of wxPNGImageData

Avoid adding "data." everywhere in DoLoadPNGFile code
---
 src/common/imagpng.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 48aee7d5fc..89fee280fe 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -139,6 +139,8 @@ struct wxPNGImageData
         free( lines );
     }
 
+    void DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo);
+
     unsigned char** lines;
     png_uint_32 numLines;
     bool ok;
@@ -299,11 +301,10 @@ void CopyDataFromPNG(wxImage *image,
 // This function uses wxPNGImageData to store some of its "local" variables in
 // order to avoid clobbering these variables by longjmp(): having them inside
 // the stack frame of the caller prevents this from happening. It also
-// "returns" its result via "data" parameter: use its "ok" field to check
+// "returns" its result via wxPNGImageData: use its "ok" field to check
 // whether loading succeeded or failed.
-static
 void
-DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo, wxPNGImageData& data)
+wxPNGImageData::DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo)
 {
     // VZ: as this function uses setjmp() the only fool-proof error handling
     //     method is to use goto (setjmp is not really C++ dtors friendly...)
@@ -362,10 +363,10 @@ DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo, wxPNGImageData& data)
 
     // initialize all line pointers to NULL to ensure that they can be safely
     // free()d if an error occurs before all of them could be allocated
-    if ( !data.Alloc(width, height) )
+    if ( !Alloc(width, height) )
         goto error;
 
-    png_read_image( png_ptr, data.lines );
+    png_read_image( png_ptr, lines );
     png_read_end( png_ptr, info_ptr );
 
 #if wxUSE_PALETTE
@@ -436,10 +437,10 @@ DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo, wxPNGImageData& data)
 
 
     // loaded successfully, now init wxImage with this data
-    CopyDataFromPNG(image, data.lines, width, height, color_type);
+    CopyDataFromPNG(image, lines, width, height, color_type);
 
     // This will indicate to the caller that loading succeeded.
-    data.ok = true;
+    ok = true;
 
 error:
     // Note that we only get here if both png_ptr and info_ptr are valid,
@@ -458,7 +459,7 @@ wxPNGHandler::LoadFile(wxImage *image,
     wxinfo.stream.in = &stream;
 
     wxPNGImageData data;
-    DoLoadPNGFile(image, wxinfo, data);
+    data.DoLoadPNGFile(image, wxinfo);
 
     if ( !data.ok )
     {

From 58f0fd65fefacd883b3a0c93ed5157f05c05eb03 Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Mon, 23 Jul 2018 09:01:56 +0300
Subject: [PATCH 776/916] Store info_ptr and png_ptr in wxPNGImageData

Avoid having to use goto in DoLoadPNGFile and have all clean-ups in wxPNGImageData destructor.
---
 src/common/imagpng.cpp | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 89fee280fe..516de8d3e6 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -111,6 +111,8 @@ struct wxPNGImageData
     {
         lines = NULL;
         numLines = 0;
+        info_ptr = (png_infop) NULL;
+        png_ptr = (png_structp) NULL;
         ok = false;
     }
 
@@ -137,12 +139,22 @@ struct wxPNGImageData
             free( lines[n] );
 
         free( lines );
+
+        if ( png_ptr )
+        {
+            if ( info_ptr )
+                png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
+            else
+                png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
+        }
     }
 
     void DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo);
 
     unsigned char** lines;
     png_uint_32 numLines;
+    png_infop info_ptr;
+    png_structp png_ptr;
     bool ok;
 };
 
@@ -306,17 +318,12 @@ void CopyDataFromPNG(wxImage *image,
 void
 wxPNGImageData::DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo)
 {
-    // VZ: as this function uses setjmp() the only fool-proof error handling
-    //     method is to use goto (setjmp is not really C++ dtors friendly...)
-
-    png_infop info_ptr = (png_infop) NULL;
-
     png_uint_32 width, height = 0;
     int bit_depth, color_type, interlace_type;
 
     image->Destroy();
 
-    png_structp png_ptr = png_create_read_struct
+    png_ptr = png_create_read_struct
                           (
                             PNG_LIBPNG_VER_STRING,
                             NULL,
@@ -332,13 +339,10 @@ wxPNGImageData::DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo)
 
     info_ptr = png_create_info_struct( png_ptr );
     if (!info_ptr)
-    {
-        png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
         return;
-    }
 
     if (setjmp(wxinfo.jmpbuf))
-        goto error;
+        return;
 
     png_read_info( png_ptr, info_ptr );
     png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL );
@@ -359,12 +363,12 @@ wxPNGImageData::DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo)
     image->Create((int)width, (int)height, (bool) false /* no need to init pixels */);
 
     if (!image->IsOk())
-        goto error;
+        return;
 
     // initialize all line pointers to NULL to ensure that they can be safely
     // free()d if an error occurs before all of them could be allocated
     if ( !Alloc(width, height) )
-        goto error;
+        return;
 
     png_read_image( png_ptr, lines );
     png_read_end( png_ptr, info_ptr );
@@ -441,11 +445,6 @@ wxPNGImageData::DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo)
 
     // This will indicate to the caller that loading succeeded.
     ok = true;
-
-error:
-    // Note that we only get here if both png_ptr and info_ptr are valid,
-    // otherwise we just return from this function early.
-    png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
 }
 
 bool

From 59942486488c62b4624f2354ef1890b794bbb3cb Mon Sep 17 00:00:00 2001
From: pavel-t <36256989+pavel-t@users.noreply.github.com>
Date: Mon, 23 Jul 2018 09:21:40 +0300
Subject: [PATCH 777/916] Keep actual number of allocated lines in numLines

---
 src/common/imagpng.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 516de8d3e6..0b7c485321 100644
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -118,15 +118,16 @@ struct wxPNGImageData
 
     bool Alloc(png_uint_32 width, png_uint_32 height)
     {
-        lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
+        lines = (unsigned char **)malloc(height * sizeof(unsigned char *));
         if ( !lines )
             return false;
 
-        numLines = height;
-        for ( unsigned int n = 0; n < numLines; n++ )
+        for ( png_uint_32 n = 0; n < height; n++ )
         {
             lines[n] = (unsigned char *)malloc( (size_t)(width * 4));
-            if ( !lines[n] )
+            if ( lines[n] )
+                ++numLines;
+            else
                 return false;
         }
 
@@ -365,8 +366,6 @@ wxPNGImageData::DoLoadPNGFile(wxImage* image, wxPNGInfoStruct& wxinfo)
     if (!image->IsOk())
         return;
 
-    // initialize all line pointers to NULL to ensure that they can be safely
-    // free()d if an error occurs before all of them could be allocated
     if ( !Alloc(width, height) )
         return;
 

From 8e5afcafa49a8f07c5e2a49dd20b51ba8ad1d7a0 Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Tue, 24 Jul 2018 14:13:29 +0200
Subject: [PATCH 778/916] Remove libxinerama from linking on OpenVMS

---
 lib/vms.opt          | 1 -
 lib/vms_gtk.opt      | 1 -
 lib/vms_gtk2.opt     | 1 -
 lib/vms_x11_univ.opt | 1 -
 4 files changed, 4 deletions(-)

diff --git a/lib/vms.opt b/lib/vms.opt
index 873b5e8642..abc3ca3c52 100644
--- a/lib/vms.opt
+++ b/lib/vms.opt
@@ -4,7 +4,6 @@ sys$library:libpng.olb/lib
 sys$library:libz.olb/lib
 sys$library:tiff.olb/lib
 X11:libxpm.olb/lib
-sys$library:libxinerama.olb/lib
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share
 sys$library:decw$xtlibshrr5.exe/share
diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt
index 48fbb0270e..1246be9681 100644
--- a/lib/vms_gtk.opt
+++ b/lib/vms_gtk.opt
@@ -10,6 +10,5 @@ sys$share:libgtk.exe/share
 sys$share:libgdk.exe/share
 sys$share:libglib.exe/share
 sys$share:pthread$rtl.exe/share
-sys$library:libxinerama.olb/lib
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share
diff --git a/lib/vms_gtk2.opt b/lib/vms_gtk2.opt
index f6c06c98f1..490b2440cb 100644
--- a/lib/vms_gtk2.opt
+++ b/lib/vms_gtk2.opt
@@ -15,6 +15,5 @@ sys$share:libglib2.exe/share
 sys$share:freetype2shr/share
 sys$share:libfontconfig/share
 sys$share:pthread$rtl.exe/share
-sys$library:libxinerama.olb/lib
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share
diff --git a/lib/vms_x11_univ.opt b/lib/vms_x11_univ.opt
index eca1f4645c..36680e33c0 100644
--- a/lib/vms_x11_univ.opt
+++ b/lib/vms_x11_univ.opt
@@ -11,6 +11,5 @@ sys$share:freetype2shr/share
 sys$share:libfontconfig/share
 sys$share:pthread$rtl.exe/share
 sys$share:libXrender.exe/share
-sys$library:libxinerama.olb/lib
 sys$library:decw$xextlibshr.exe/share
 sys$library:decw$xlibshr.exe/share

From 187d7190716af29632dd7ff2bebb83098dc8037b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 24 Jul 2018 15:26:45 +0200
Subject: [PATCH 779/916] Update comment in
 wxListBox::MacHandleSelectionChange()

Don't mention GetOldSelection() function that was removed by
dde6f662fcf537e6f3efcb309446ce3db9aba32f to avoid confusion.

See #15603.
---
 src/osx/listbox_osx.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index ff41b53a37..90fd3338d4 100644
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -436,8 +436,8 @@ void wxListBox::MacHandleSelectionChange(int row)
     // selection because in wxWidgets API there is no notification event for
     // removing the selection from a single-selection list box.
     //
-    // Otherwise call DoChangeSingleSelection so GetOldSelection() will return
-    // the correct value if row < 0 later.
+    // Otherwise call DoChangeSingleSelection so that m_oldSelections is
+    // updated with the correct value before it's possible used later.
     const int count = static_cast<int>(GetCount());
     if ( row < 0 || row >= count )
     {

From a024c802b1027931ffa721d67d44cad85869f11e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 24 Jul 2018 15:27:31 +0200
Subject: [PATCH 780/916] Avoid warnings from gtk.h in the widgets sample

Ignore -Wparentheses given by g++ 8 for some GTK+ 3 versions (e.g.
3.22.30 currently in Debian Sid).
---
 samples/widgets/native.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/samples/widgets/native.cpp b/samples/widgets/native.cpp
index 2bf606ac46..ba2cbd6b5f 100644
--- a/samples/widgets/native.cpp
+++ b/samples/widgets/native.cpp
@@ -143,7 +143,10 @@ protected:
 
 #elif defined(__WXGTK__)
 
+// Avoid a bunch of warnings from gtk.h for some GTK+ 3 versions.
+wxGCC_WARNING_SUPPRESS(parentheses)
 #include <gtk/gtk.h>
+wxGCC_WARNING_RESTORE(parentheses)
 
 class NativeWindow : public wxNativeWindow
 {

From 021725ce76ebd581adabc3c85c03bccce652a451 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 24 Jul 2018 15:59:33 +0200
Subject: [PATCH 781/916] Dispatch all events pending at wx level before
 exiting event loop

This amends a0298f3149284df19087eb4f2e5394956626881f by only avoiding
dispatching of the native events in nested event loops, but still
dispatching any pending wx-level events before exiting it.

The latest code still solves the original problem, as it was due to
having an endless stream of native events, without possibly introducing
new problems and even crashes if, for example, some dialog event handler
queued an event referencing the dialog itself for later procession, as
this event must be dispatched before the loop exits and the dialog is
destroyed, which wasn't the case any more after the changes of
a0298f3149284df19087eb4f2e5394956626881f but is done again now.

See #11273.
---
 src/common/evtloopcmn.cpp | 62 ++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index 561a0d174f..94a6f93d61 100644
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -284,39 +284,55 @@ int wxEventLoopManual::DoRun()
                     break;
             }
 
-            // If we exit the outermost loop, process the remaining queued
-            // messages, both at the level of the underlying toolkit level
-            // (Pending/Dispatch()) and wx level (Has/ProcessPendingEvents()).
-            //
-            // Note that we must not do this for nested modal event loops as,
-            // at least in wxMSW, the modality has already been undone when
-            // Exit() was called, and so we could end up with reentrancies such
-            // as starting another modal event loop before exiting this one.
-            // To avoid this we must not dispatch any events after calling
-            // Exit() and, for the nested loops, there is no real reason to do
-            // it anyhow, as the outer loop will still dispatch them.
-            //
-            // Finally, even when doing this in the outermost loop, there is
-            // still the risk of never exiting this loop if pending event
-            // handlers endlessly generate new events but they shouldn't do
-            // this in a well-behaved program and we shouldn't just discard the
-            // events we already have, they might be important.
-            if ( gs_eventLoopCount != 1 )
-                break;
-
+            // Process any still pending events.
             for ( ;; )
             {
                 bool hasMoreEvents = false;
+
+                // We always dispatch events pending at wx level: it may be
+                // important to do it before the loop exits and e.g. the modal
+                // dialog possibly referenced by these events handlers is
+                // destroyed. It also shouldn't result in the problems
+                // described below for the native events and while there is
+                // still a risk of never existing the loop due to an endless
+                // stream of events generated from the user-defined event
+                // handlers, we consider that well-behaved programs shouldn't
+                // do this -- and if they do, it's better to keep running the
+                // loop than crashing after leaving it.
                 if ( wxTheApp && wxTheApp->HasPendingEvents() )
                 {
                     wxTheApp->ProcessPendingEvents();
                     hasMoreEvents = true;
                 }
 
-                if ( Pending() )
+                // For the underlying toolkit events, we only handle them when
+                // exiting the outermost event loop but not when exiting nested
+                // loops. This is required at least under MSW where, in case of
+                // a nested modal event loop, the modality has already been
+                // undone as Exit() had been already called, so all UI elements
+                // are re-enabled and if we dispatched events from them here,
+                // we could end up reentering the same event handler that had
+                // shown the modal dialog in the first place and showing the
+                // dialog second time before its first instance was destroyed,
+                // resulting in a lot of fun.
+                //
+                // Also, unlike wx events above, it should be fine to dispatch
+                // the native events from the outer event loop, as any events
+                // generated from outside the dialog itself (necessarily, as
+                // the dialog is already hidden and about to be destroyed)
+                // shouldn't reference the dialog. Which is one of the reasons
+                // we still dispatch them in the outermost event loop, to
+                // ensure they're still processed. Another reason is that if we
+                // do have an endless stream of native events, e.g. because we
+                // have a timer with a too short interval, it's arguably better
+                // to keep handling them instead of exiting.
+                if ( gs_eventLoopCount == 1 )
                 {
-                    Dispatch();
-                    hasMoreEvents = true;
+                    if ( Pending() )
+                    {
+                        Dispatch();
+                        hasMoreEvents = true;
+                    }
                 }
 
                 if ( !hasMoreEvents )

From 542124aa95c8ce13559de0b54ff61daae01899f7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 25 Jul 2018 02:23:02 +0200
Subject: [PATCH 782/916] Fix page-break-inside:avoid to work for nested tags
 too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The initial version was too naïve and didn't work correctly if the <div>
with this style had nested elements.
---
 samples/html/printing/test.htm | 11 +++++
 src/html/m_layout.cpp          | 27 +++++++++++-
 tests/html/htmprint.cpp        | 80 +++++++++++++++++-----------------
 3 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/samples/html/printing/test.htm b/samples/html/printing/test.htm
index 3bb5be3a20..c0518a8d00 100644
--- a/samples/html/printing/test.htm
+++ b/samples/html/printing/test.htm
@@ -55,6 +55,8 @@ is split into base and GUI libraries.
 
 <P>
 
+<!-- Avoid page breaks inside individual version change logs -->
+<div style="page-break-inside:avoid">
 <H2>Release 2.1.11 (final)</H2>
 
 <ul>
@@ -71,18 +73,22 @@ combined base/GUI library for GUI applications only.
 <li>Rewritten timer.cpp, possible wxChrono class.
 <li>Bug tracking system in place.
 </ul>
+</div>
 
 <P>
 
+<div style="page-break-inside:avoid">
 <H4>Release 2.1.12</H4>
 
 <ul>
 <li>Release date: January 9th, 2000
 <li>Miscellaneous fixes and small enhancements.
 </ul>
+</div>
 
 <P>
 
+<div style="page-break-inside:avoid">
 <H4>Release 2.1.13</H4>
 
 <ul>
@@ -90,6 +96,7 @@ combined base/GUI library for GUI applications only.
 <li>Miscellaneous fixes and small enhancements.
 <li>wxDateTime class in beta.
 </ul>
+</div>
 
 <P>
 
@@ -102,6 +109,7 @@ combined base/GUI library for GUI applications only.
 
 <P>
 
+<div style="page-break-inside:avoid">
 <H2>Release 2.2.x (final)</H2>
 
 <ul>
@@ -109,15 +117,18 @@ combined base/GUI library for GUI applications only.
 <li>Unicode compilation working in wxGTK and wxMSW.
 <li>wxDateTime class.
 </ul>
+</div>
 
 <P>
 
+<div style="page-break-inside:avoid">
 <H2>Release 2.3.x (final)</H2>
 
 <ul>
 <li>Release date: unknown
 <li>WinCE port available.
 </ul>
+</div>
 
 <P>
 
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index e8f849b86f..5556c34396 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -189,9 +189,32 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
             }
             else if(style.IsSameAs(wxT("PAGE-BREAK-INSIDE:AVOID"), false))
             {
+                // As usual, reuse the current container if it's empty.
+                wxHtmlContainerCell *c = m_WParser->GetContainer();
+                if (c->GetFirstChild() != NULL)
+                {
+                    // If not, open a new one.
+                    m_WParser->CloseContainer();
+                    c = m_WParser->OpenContainer();
+                }
+
+                // Force this container to live entirely on the same page.
+                c->SetCanLiveOnPagebreak(false);
+
+                // Use a nested container so that nested tags that close and
+                // reopen a container again close this one, but still remain
+                // inside the outer "unbreakable" container.
+                m_WParser->OpenContainer();
+
+                ParseInner(tag);
+
+                // Close both the inner and the outer containers and reopen the
+                // new current one.
                 m_WParser->CloseContainer();
-                m_WParser->OpenContainer()->SetCanLiveOnPagebreak(false);
-                return false;
+                m_WParser->CloseContainer();
+                m_WParser->OpenContainer();
+
+                return true;
             }
             else
             {
diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 11dcc10c7a..72c33c6980 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -121,52 +121,52 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
     // should move it entirely to the next page, resulting in one extra page
     // compared to the version without "page-break-inside: avoid".
     static const char* const text =
-"Early in the morning on the fourteenth of the spring month of Nisan the "
-"Procurator of Judea, Pontius Pilate, in a white cloak lined with blood red, "
-"emerged with his shuffling cavalryman's walk into the arcade connecting the two "
-"wings of the palace of Herod the Great. "
-"\n"
-"More than anything else in the world the Procurator hated the smell of attar of "
-"roses.  The omens for the day were bad, as this scent had been haunting him "
-"since dawn. "
-"\n"
-"It seemed to the Procurator that the very cypresses and palms in the garden "
-"were exuding the smell of roses, that this damned stench of roses was even "
-"mingling with the smell of leather tackle and sweat from his mounted bodyguard. "
-"\n"
-"A haze of smoke was drifting toward the arcade across the upper courtyard of "
-"the garden, coming from the wing at the rear of the palace, the quarters of the "
-"first cohort of the XII Legion; known as the \"Lightning,\" it had been "
-"stationed in Jerusalem since the Procurator's arrival.  The same oily perfume "
-"of roses was mixed with the acrid smoke that showed that the centuries' cooks "
-"had started to prepare breakfast "
-"\n"
-"\"Oh, gods, what are you punishing me for?..  No, there's no doubt, I have it "
-"again, this terrible incurable pain...  hemicrania, when half the head aches... "
-"There's no cure for it, nothing helps...  I must try not to move my head...\" "
-"\n"
-"A chair had already been placed on the mosaic floor by the fountain; without a "
-"glance around, the Procurator sat in it and stretched out his hand to one side. "
-"His secretary deferentially laid a piece of parchment in his hand.  Unable to "
-"restrain a grimace of agony, the Procurator gave a fleeting sideways look at "
-"its contents, returned the parchment to his secretary and said painfully, \"The "
-"accused comes from Galilee, does he?  Was the case sent to the tetrarch?\" "
-"\n"
-"\"Yes, Procurator,\" replied the secretary.  \"He declined to confirm the "
-"finding of the court and passed the Sanhedrin's sentence of death to you for "
-"confirmation.\" "
-"\n"
-"The Procurator's cheek twitched, and he said quietly, \"Bring in the accused.\" "
+"Early in the morning on the fourteenth of the spring month of Nisan the<br>"
+"Procurator of Judea, Pontius Pilate, in a white cloak lined with blood red,<br>"
+"emerged with his shuffling cavalryman's walk into the arcade connecting the two<br>"
+"wings of the palace of Herod the Great.<br>"
+"<br>"
+"More than anything else in the world the Procurator hated the smell of attar of<br>"
+"roses.  The omens for the day were bad, as this scent had been haunting him<br>"
+"since dawn.<br>"
+"<br>"
+"It seemed to the Procurator that the very cypresses and palms in the garden<br>"
+"were exuding the smell of roses, that this damned stench of roses was even<br>"
+"mingling with the smell of leather tackle and sweat from his mounted bodyguard.<br>"
+"<br>"
+"A haze of smoke was drifting toward the arcade across the upper courtyard of<br>"
+"the garden, coming from the wing at the rear of the palace, the quarters of the<br>"
+"first cohort of the XII Legion; known as the \"Lightning,\" it had been<br>"
+"stationed in Jerusalem since the Procurator's arrival.  The same oily perfume<br>"
+"of roses was mixed with the acrid smoke that showed that the centuries' cooks<br>"
+"had started to prepare breakfast<br>"
+"<br>"
+"\"Oh, gods, what are you punishing me for?..  No, there's no doubt, I have it<br>"
+"again, this terrible incurable pain...  hemicrania, when half the head aches...<br>"
+"There's no cure for it, nothing helps...  I must try not to move my head...\"<br>"
+"<br>"
+"A chair had already been placed on the mosaic floor by the fountain; without a<br>"
+"glance around, the Procurator sat in it and stretched out his hand to one side.<br>"
+"His secretary deferentially laid a piece of parchment in his hand.  Unable to<br>"
+"restrain a grimace of agony, the Procurator gave a fleeting sideways look at<br>"
+"its contents, returned the parchment to his secretary and said painfully, \"The<br>"
+"accused comes from Galilee, does he?  Was the case sent to the tetrarch?\"<br>"
+"<br>"
+"\"Yes, Procurator,\" replied the secretary.  \"He declined to confirm the<br>"
+"finding of the court and passed the Sanhedrin's sentence of death to you for<br>"
+"confirmation.\"<br>"
+"<br>"
+"The Procurator's cheek twitched, and he said quietly, \"Bring in the accused.\"<br>"
         ;
 
     pr.SetHtmlText
        (
             wxString::Format
             (
-                "<img width=\"100\" height=\"600\" src=\"dummy\"/>"
+                "<img width=\"100\" height=\"500\" src=\"dummy\"/>"
                 "<div>%s</div>"
                 "<br/>"
-                "<img width=\"100\" height=\"600\" src=\"dummy\"/>",
+                "<img width=\"100\" height=\"400\" src=\"dummy\"/>",
                 text
             )
        );
@@ -176,10 +176,10 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
        (
             wxString::Format
             (
-                "<img width=\"100\" height=\"600\" src=\"dummy\"/>"
+                "<img width=\"100\" height=\"500\" src=\"dummy\"/>"
                 "<div style=\"page-break-inside:avoid\">%s</div>"
                 "<br/>"
-                "<img width=\"100\" height=\"600\" src=\"dummy\"/>",
+                "<img width=\"100\" height=\"400\" src=\"dummy\"/>",
                 text
             )
        );

From 6acd663190592e0998c65fb1515a68eb57a28283 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 25 Jul 2018 13:47:13 +0200
Subject: [PATCH 783/916] Revert "Add even more debug output to the test"

This reverts commit 1ce009e73ae605e57e84c61be865a59c124a43a2 as AppVeyor
test failures problem is fixed now.
---
 tests/html/htmprint.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 72c33c6980..05c27b42bf 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -183,9 +183,7 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
                 text
             )
        );
-    const wxSize ext = dc.GetTextExtent("Something");
-    WARN("Using base font size " << fontFixedPixelSize.GetPointSize()
-         << ", text extent of \"Something\" is " << ext.x << "x" << ext.y);
+    INFO("Using base font size " << fontFixedPixelSize.GetPointSize());
     CHECK( CountPages(pr) == 3 );
 }
 

From 78edf14c889ec4f22136af69886ccdbb4f716080 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 25 Jul 2018 13:47:43 +0200
Subject: [PATCH 784/916] Revert "Add temporary debugging code for HTML
 pagination test failure"

This reverts commit 0393940033976973c76bab8997112a2c7383e459 which is
not needed any longer after fixing AppVeyor test failure.
---
 .travis.yml           |  1 +
 appveyor.yml          | 19 +++++++++++++++++++
 src/html/htmprint.cpp |  2 --
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa86540a5e..790f5aca76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ matrix:
 
 branches:
     only:
+        - master
         - WX_3_0_BRANCH
 
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
index 1361fa8a23..5b3d335e05 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,6 +17,25 @@ environment:
     CONFIGURATION: DLL Release
     ARCH: x64
     wxUSE_STL: 1
+  - TOOLSET: nmake
+    VS: '9.0'
+    BUILD: release
+    ARCH: x86
+    wxUSE_STL: 0
+  - TOOLSET: nmake
+    VS: '14.0'
+    BUILD: debug
+    ARCH: amd64
+    wxUSE_STL: 1
+  - TOOLSET: mingw
+    wxUSE_STL: 0
+  - TOOLSET: msys2
+    MSYSTEM: MINGW32
+  - TOOLSET: cygwin
+  - TOOLSET: cmake
+    GENERATOR: 'Visual Studio 12'
+    SHARED: ON
+    CONFIGURATION: Release
 
 clone_depth: 50
 
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 4de883fc2c..ba1f31b016 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -33,7 +33,6 @@
 #include "wx/wfstream.h"
 #include "wx/infobar.h"
 
-#include "wx/crt.h"
 
 // default font size of normal text (HTML font size 0) for printing, in points:
 #define DEFAULT_PRINT_FONT_SIZE   12
@@ -160,7 +159,6 @@ int wxHtmlDCRenderer::FindNextPageBreak(int pos) const
         wxCHECK_MSG( posNext > pos, wxNOT_FOUND, "Bug in AdjustPagebreak()" );
     }
 
-    wxPrintf("HTML-DEBUG: Next page break after %d is %d\n", pos, posNext);
     return posNext;
 }
 

From 0338796847d28e547b2fd994275d23fa40ca6efa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 25 Jul 2018 13:49:00 +0200
Subject: [PATCH 785/916] Remove unnecessary headers from wxHtmlPrintout unit
 test

These headers were added by 905789485a02b425356d2c9d3b4331f78aaa368e
which was replaced with 321854b5193b8025cce2ca76302aff9d96a105c8 later
and are not needed any more.
---
 tests/html/htmprint.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 05c27b42bf..0209ecfe4d 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -22,9 +22,6 @@
     #include "wx/dcmemory.h"
 #endif // WX_PRECOMP
 
-#include "wx/app.h"
-#include "wx/window.h"
-
 #include "wx/html/htmprint.h"
 
 namespace

From 9e05eb42b5eb3bfa6c35e9469894fc2eeb4cbf9a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 25 Jul 2018 13:52:49 +0200
Subject: [PATCH 786/916] Fix outdated comment in wxHtmlPrintout unit test

This should have been part of 321854b5193b8025cce2ca76302aff9d96a105c8
which changed the code, but not the accompanying comment.
---
 tests/html/htmprint.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/html/htmprint.cpp b/tests/html/htmprint.cpp
index 0209ecfe4d..64ce4b144e 100644
--- a/tests/html/htmprint.cpp
+++ b/tests/html/htmprint.cpp
@@ -59,9 +59,14 @@ TEST_CASE("wxHtmlPrintout::Pagination", "[html][print]")
     // the DPI-dependent factor, but it doesn't seem to be worth doing it).
     pr.SetMargins(0, 0, 0, 0, 0);
 
-    // We do need to use DPI-proportional font sizes in order for the text used
-    // in the page-break-inside:avoid test to take the same amount of pixels
-    // for any DPI (12 being the font size used by wxHtmlDCRenderer by default).
+    // Use font size in pixels to make it DPI-independent: if we just used a
+    // normal (say 12pt) font, it would have different height in pixels on 96
+    // and 200 DPI systems, meaning that the text at the end of this test would
+    // take different number of (fixed to 1000px height) pages.
+    //
+    // We could also make the page height proportional to the DPI, but this
+    // would be more complicated as we also wouldn't be able to use hardcoded
+    // height attribute values in the HTML snippets below then.
     const wxFont fontFixedPixelSize(wxFontInfo(wxSize(10, 16)));
     pr.SetStandardFonts(fontFixedPixelSize.GetPointSize(), "Helvetica");
 

From 06d2b836a06a6b541fde8f7ada0af31cc6061e22 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 22 Jul 2018 23:41:53 +0200
Subject: [PATCH 787/916] Bind focus events to direct children only in
 wxCompositeWindow

Previously, wxEVT_{SET,KILL}_FOCUS event handlers were connected to all
children, even the indirect ones, which resulted in duplicate focus
events if a grandchildren forward its focus event to its parent window,
as happens e.g. with wxComboCtrl, which contains a text control that
forwards its focus events to the containing control itself.

This change seems globally sound, even if it might break some controls
whose children don't get the expected focus events themselves, because
the right thing to do is to fix those children. And it fixes duplicate
focus events in wxDatePickerCtrlGeneric.
---
 include/wx/compositewin.h | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h
index 8483414686..23ee6f738b 100644
--- a/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@ -186,8 +186,21 @@ private:
         // support) to hook into its event processing.
 
         wxWindow *child = event.GetWindow();
-        if ( child == this )
-            return; // not a child, we don't want to bind to ourselves
+
+        // Check that it's one of our children: it could also be this window
+        // itself (for which we don't need to handle focus at all) or one of
+        // its grandchildren and we don't want to bind to those as child
+        // controls are supposed to be well-behaved and get their own focus
+        // event if any of their children get focus anyhow, so binding to them
+        // would only result in duplicate events.
+        //
+        // Notice that we can't use GetCompositeWindowParts() here because the
+        // member variables that are typically used in its implementation in
+        // the derived classes would typically not be initialized yet, as this
+        // event is generated by "m_child = new wxChildControl(this, ...)" code
+        // before "m_child" is assigned.
+        if ( child->GetParent() != this )
+            return;
 
         child->Bind(wxEVT_SET_FOCUS, &wxCompositeWindow::OnSetFocus, this);
 

From fb71adab047a5285c6a94e4f59a95baa51dcfbae Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 23 Jul 2018 00:09:25 +0200
Subject: [PATCH 788/916] Add a unit test for wxDatePickerCtrl focus events

Unfortunately it doesn't work with wxGTK, as usual, due to
wxUIActionSimulator not working correctly there.
---
 tests/controls/datepickerctrltest.cpp | 48 +++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/controls/datepickerctrltest.cpp b/tests/controls/datepickerctrltest.cpp
index abef3925f8..2a9094a6e7 100644
--- a/tests/controls/datepickerctrltest.cpp
+++ b/tests/controls/datepickerctrltest.cpp
@@ -16,9 +16,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/button.h"
 #endif // WX_PRECOMP
 
 #include "wx/datectrl.h"
+#include "wx/uiaction.h"
 
 #include "testableframe.h"
 #include "testdate.h"
@@ -35,12 +37,15 @@ private:
     CPPUNIT_TEST_SUITE( DatePickerCtrlTestCase );
         CPPUNIT_TEST( Value );
         CPPUNIT_TEST( Range );
+        WXUISIM_TEST( Focus );
     CPPUNIT_TEST_SUITE_END();
 
     void Value();
     void Range();
+    void Focus();
 
     wxDatePickerCtrl* m_datepicker;
+    wxButton* m_button;
 
     wxDECLARE_NO_COPY_CLASS(DatePickerCtrlTestCase);
 };
@@ -54,10 +59,12 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( DatePickerCtrlTestCase, "DatePickerCtrlTe
 void DatePickerCtrlTestCase::setUp()
 {
     m_datepicker = new wxDatePickerCtrl(wxTheApp->GetTopWindow(), wxID_ANY);
+    m_button = NULL;
 }
 
 void DatePickerCtrlTestCase::tearDown()
 {
+    delete m_button;
     delete m_datepicker;
 }
 
@@ -115,4 +122,45 @@ void DatePickerCtrlTestCase::Range()
     CPPUNIT_ASSERT_EQUAL( dtBeforeEnd, m_datepicker->GetValue() );
 }
 
+#if wxUSE_UIACTIONSIMULATOR
+
+static wxPoint GetRectCenter(const wxRect& r)
+{
+    return (r.GetTopRight() + r.GetBottomLeft()) / 2;
+}
+
+void DatePickerCtrlTestCase::Focus()
+{
+    // Create another control just to give focus to it initially.
+    m_button = new wxButton(wxTheApp->GetTopWindow(), wxID_OK);
+    m_button->Move(0, m_datepicker->GetSize().y * 3);
+    m_button->SetFocus();
+    wxYield();
+
+    CHECK( !m_datepicker->HasFocus() );
+
+    EventCounter setFocus(m_datepicker, wxEVT_SET_FOCUS);
+    EventCounter killFocus(m_datepicker, wxEVT_KILL_FOCUS);
+
+    wxUIActionSimulator sim;
+
+    sim.MouseMove(GetRectCenter(m_datepicker->GetScreenRect()));
+    sim.MouseClick();
+    wxYield();
+
+    REQUIRE( m_datepicker->HasFocus() );
+    CHECK( setFocus.GetCount() == 1 );
+    CHECK( killFocus.GetCount() == 0 );
+
+    sim.MouseMove(GetRectCenter(m_button->GetScreenRect()));
+    sim.MouseClick();
+    wxYield();
+
+    CHECK( !m_datepicker->HasFocus() );
+    CHECK( setFocus.GetCount() == 1 );
+    CHECK( killFocus.GetCount() == 1 );
+}
+
+#endif // wxUSE_UIACTIONSIMULATOR
+
 #endif // wxUSE_DATEPICKCTRL

From 25a2bae83611e768403d4485fadb0f13053d9d38 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 23 Jul 2018 00:29:31 +0200
Subject: [PATCH 789/916] Test focus event generation for all pages of the
 widgets sample

Previously this was done only for wxSearchCtrl, extend this now to all
the widgets in order to be able to check whether the expected events are
generated.
---
 samples/widgets/searchctrl.cpp | 20 --------------------
 samples/widgets/widgets.cpp    | 31 +++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/samples/widgets/searchctrl.cpp b/samples/widgets/searchctrl.cpp
index a4607cafa7..ec295e87e9 100644
--- a/samples/widgets/searchctrl.cpp
+++ b/samples/widgets/searchctrl.cpp
@@ -88,9 +88,6 @@ protected:
     void OnSearch(wxCommandEvent& event);
     void OnSearchCancel(wxCommandEvent& event);
 
-    void OnSetFocus(wxFocusEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
-
     wxMenu* CreateTestMenu();
 
     // (re)create the control
@@ -179,9 +176,6 @@ void SearchCtrlWidgetsPage::CreateControl()
 
     m_srchCtrl = new wxSearchCtrl(this, -1, wxEmptyString, wxDefaultPosition,
                                   FromDIP(wxSize(150, -1)), style);
-
-    m_srchCtrl->Bind(wxEVT_SET_FOCUS, &SearchCtrlWidgetsPage::OnSetFocus, this);
-    m_srchCtrl->Bind(wxEVT_KILL_FOCUS, &SearchCtrlWidgetsPage::OnKillFocus, this);
 }
 
 void SearchCtrlWidgetsPage::RecreateWidget()
@@ -256,18 +250,4 @@ void SearchCtrlWidgetsPage::OnSearchCancel(wxCommandEvent& event)
     event.Skip();
 }
 
-void SearchCtrlWidgetsPage::OnSetFocus(wxFocusEvent& event)
-{
-    wxLogMessage("Search control got focus");
-
-    event.Skip();
-}
-
-void SearchCtrlWidgetsPage::OnKillFocus(wxFocusEvent& event)
-{
-    wxLogMessage("Search control lost focus");
-
-    event.Skip();
-}
-
 #endif  //  wxUSE_SEARCHCTRL
diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 3cd4f6c6a3..5df2d6972c 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -210,6 +210,10 @@ protected:
     WidgetsPage *CurrentPage();
 
 private:
+    void OnWidgetFocus(wxFocusEvent& event);
+
+    void ConnectToWidgetEvents();
+
     // the panel containing everything
     wxPanel *m_panel;
 
@@ -668,6 +672,19 @@ WidgetsPage *WidgetsFrame::CurrentPage()
     return wxStaticCast(page, WidgetsPage);
 }
 
+void WidgetsFrame::ConnectToWidgetEvents()
+{
+    const Widgets& widgets = CurrentPage()->GetWidgets();
+
+    for ( Widgets::const_iterator it = widgets.begin();
+            it != widgets.end();
+            ++it )
+    {
+        (*it)->Bind(wxEVT_SET_FOCUS, &WidgetsFrame::OnWidgetFocus, this);
+        (*it)->Bind(wxEVT_KILL_FOCUS, &WidgetsFrame::OnWidgetFocus, this);
+    }
+}
+
 WidgetsFrame::~WidgetsFrame()
 {
 #if USE_LOG
@@ -723,7 +740,10 @@ void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event)
         wxWindowUpdateLocker noUpdates(curPage);
         curPage->CreateContent();
         curPage->Layout();
+
+        ConnectToWidgetEvents();
     }
+
     // re-apply the attributes to the widget(s)
     curPage->SetUpWidget();
 
@@ -890,6 +910,9 @@ void WidgetsFrame::OnSetBorder(wxCommandEvent& event)
     WidgetsPage *page = CurrentPage();
 
     page->RecreateWidget();
+
+    ConnectToWidgetEvents();
+
     // re-apply the attributes to the widget(s)
     page->SetUpWidget();
 }
@@ -1172,6 +1195,14 @@ void WidgetsFrame::OnSetHint(wxCommandEvent& WXUNUSED(event))
 
 #endif // wxUSE_MENUS
 
+void WidgetsFrame::OnWidgetFocus(wxFocusEvent& event)
+{
+    wxLogMessage("Widgets %s focus",
+                 event.GetEventType() == wxEVT_SET_FOCUS ? "got" : "lost");
+
+    event.Skip();
+}
+
 // ----------------------------------------------------------------------------
 // WidgetsPageInfo
 // ----------------------------------------------------------------------------

From c9cce7e07160644ca53763d96b9519803245fc07 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 24 Jul 2018 01:28:32 +0200
Subject: [PATCH 790/916] Refactor focus debug logging in wxGTK

No real changes, just add a helper wxDumpWindow() function to make focus
logging less verbose and slightly more readable (as the label is not
shown any more if it's empty).
---
 src/gtk/window.cpp | 50 +++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index e6889a3549..866eb2905f 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -308,6 +308,24 @@ static wxPoint gs_lastGesturePoint;
 // the trace mask used for the focus debugging messages
 #define TRACE_FOCUS wxT("focus")
 
+// Function used to dump a brief description of a window.
+static
+wxString wxDumpWindow(wxWindow* win)
+{
+    if ( !win )
+        return "(no window)";
+
+    wxString s = wxString::Format("%s(%p",
+                                  win->GetClassInfo()->GetClassName(), win);
+
+    wxString label = win->GetLabel();
+    if ( !label.empty() )
+        s += wxString::Format(", \"%s\"", label);
+    s += ")";
+
+    return s;
+}
+
 // A handy function to run from under gdb to show information about the given
 // GtkWidget. Right now it only shows its type, we could enhance it to show
 // more information later but this is already pretty useful.
@@ -4335,8 +4353,8 @@ bool wxWindowGTK::GTKHandleFocusIn()
             // GTK+ focus changed from this wxWindow back to itself, so don't
             // emit any events at all
             wxLogTrace(TRACE_FOCUS,
-                       "filtered out spurious focus change within %s(%p, %s)",
-                       GetClassInfo()->GetClassName(), this, GetLabel());
+                       "filtered out spurious focus change within %s",
+                       wxDumpWindow(this));
             gs_deferredFocusOut = NULL;
             return retval;
         }
@@ -4349,8 +4367,8 @@ bool wxWindowGTK::GTKHandleFocusIn()
 
 
     wxLogTrace(TRACE_FOCUS,
-               "handling focus_in event for %s(%p, %s)",
-               GetClassInfo()->GetClassName(), this, GetLabel());
+               "handling focus_in event for %s",
+               wxDumpWindow(this));
 
     if (m_imContext)
         gtk_im_context_focus_in(m_imContext);
@@ -4401,8 +4419,8 @@ bool wxWindowGTK::GTKHandleFocusOut()
         wxASSERT_MSG( gs_deferredFocusOut == NULL,
                       "deferred focus out event already pending" );
         wxLogTrace(TRACE_FOCUS,
-                   "deferring focus_out event for %s(%p, %s)",
-                   GetClassInfo()->GetClassName(), this, GetLabel());
+                   "deferring focus_out event for %s",
+                   wxDumpWindow(this));
         gs_deferredFocusOut = this;
         return retval;
     }
@@ -4415,8 +4433,8 @@ bool wxWindowGTK::GTKHandleFocusOut()
 void wxWindowGTK::GTKHandleFocusOutNoDeferring()
 {
     wxLogTrace(TRACE_FOCUS,
-               "handling focus_out event for %s(%p, %s)",
-               GetClassInfo()->GetClassName(), this, GetLabel());
+               "handling focus_out event for %s",
+               wxDumpWindow(this));
 
     gs_lastFocus = this;
 
@@ -4435,8 +4453,8 @@ void wxWindowGTK::GTKHandleFocusOutNoDeferring()
         // * or it goes to another control, in which case focus-in event will
         //   follow immediately and it will set gs_currentFocus to the right
         //   value
-        wxLogDebug("window %s(%p, %s) lost focus even though it didn't have it",
-                   GetClassInfo()->GetClassName(), this, GetLabel());
+        wxLogDebug("window %s lost focus even though it didn't have it",
+                   wxDumpWindow(this));
     }
     gs_currentFocus = NULL;
 
@@ -4463,8 +4481,8 @@ void wxWindowGTK::GTKHandleDeferredFocusOut()
     gs_deferredFocusOut = NULL;
 
     wxLogTrace(TRACE_FOCUS,
-               "processing deferred focus_out event for %s(%p, %s)",
-               GetClassInfo()->GetClassName(), this, GetLabel());
+               "processing deferred focus_out event for %s",
+               wxDumpWindow(this));
 
     GTKHandleFocusOutNoDeferring();
 }
@@ -4493,15 +4511,15 @@ void wxWindowGTK::SetFocus()
          !gtk_widget_get_can_focus(widget) )
     {
         wxLogTrace(TRACE_FOCUS,
-                   wxT("Setting focus to a child of %s(%p, %s)"),
-                   GetClassInfo()->GetClassName(), this, GetLabel().c_str());
+                   wxT("Setting focus to a child of %s"),
+                   wxDumpWindow(this));
         gtk_widget_child_focus(widget, GTK_DIR_TAB_FORWARD);
     }
     else
     {
         wxLogTrace(TRACE_FOCUS,
-                   wxT("Setting focus to %s(%p, %s)"),
-                   GetClassInfo()->GetClassName(), this, GetLabel().c_str());
+                   wxT("Setting focus to %s"),
+                   wxDumpWindow(this));
         gtk_widget_grab_focus(widget);
     }
 }

From 4059f24cf5e6ba8eb5bed80bcb5db7ae8c41959b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 24 Jul 2018 01:36:37 +0200
Subject: [PATCH 791/916] Reset pending focus when losing focus in wxGTK

It could happen that the window remained as the global "pending focus"
even after it lost its focus, resulting in FindFocus() still returning
it as the currently focused window, even though it didn't have focus any
more.

This notably broke focus logic of wxCompositeWindow and could result in
missing wxEVT_KILL_FOCUS for windows using it, such as wxDatePickerCtrl,
and quite likely was responsible for other focus problems in wxGTK as
well.
---
 src/gtk/window.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 866eb2905f..9f17f19ebe 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4374,7 +4374,13 @@ bool wxWindowGTK::GTKHandleFocusIn()
         gtk_im_context_focus_in(m_imContext);
 
     gs_currentFocus = this;
-    gs_pendingFocus = NULL;
+
+    if ( gs_pendingFocus )
+    {
+        wxLogTrace(TRACE_FOCUS, "Resetting pending focus %s on focus set",
+                   wxDumpWindow(gs_pendingFocus));
+        gs_pendingFocus = NULL;
+    }
 
 #if wxUSE_CARET
     // caret needs to be informed about focus change
@@ -4406,6 +4412,15 @@ bool wxWindowGTK::GTKHandleFocusOut()
     // handler issues a repaint
     const bool retval = m_wxwindow ? true : false;
 
+    // If this window is still the pending focus one, reset that pointer as
+    // we're not going to have focus any longer and DoFindFocus() must not
+    // return this window.
+    if ( gs_pendingFocus == this )
+    {
+        wxLogTrace(TRACE_FOCUS, "Resetting pending focus %s on focus loss",
+                   wxDumpWindow(this));
+        gs_pendingFocus = NULL;
+    }
 
     // NB: If a control is composed of several GtkWidgets and when focus
     //     changes from one of them to another within the same wxWindow, we get

From 3ec4e53aa1845cbf2fee977f65fc8dd931822c89 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Thu, 26 Jul 2018 09:21:03 -0700
Subject: [PATCH 792/916] Avoid setting "pending" focus to a window which
 already has the focus.

---
 src/gtk/window.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 9f17f19ebe..99fc8eebfa 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4518,7 +4518,9 @@ void wxWindowGTK::SetFocus()
     // Because we want to FindFocus() call immediately following
     // foo->SetFocus() to return foo, we have to keep track of "pending" focus
     // ourselves.
-    gs_pendingFocus = this;
+    gs_pendingFocus = NULL;
+    if (gs_currentFocus != this)
+        gs_pendingFocus = this;
 
     GtkWidget *widget = m_wxwindow ? m_wxwindow : m_focusWidget;
 

From a3f6456f5517759e9277fd5031bb0b586366d0f9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 28 Jul 2018 02:17:15 +0200
Subject: [PATCH 793/916] Test wxDataViewColumn::UnsetAsSortKey() in dataview
 sample

Add a checkbox to test the behaviour of SetSortOrder() and
UnsetAsSortKey() methods in the sample.
---
 samples/dataview/dataview.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 54f3666603..9615cc2c88 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -147,6 +147,7 @@ private:
     void OnShowAttributes( wxCommandEvent &event);
 
     void OnMultipleSort( wxCommandEvent &event);
+    void OnSortByFirstColumn( wxCommandEvent &event);
 
 #if wxUSE_DRAG_AND_DROP
     void OnBeginDrag( wxDataViewEvent &event );
@@ -363,6 +364,7 @@ enum
     ID_HIDE_ATTRIBUTES  = 204,
     ID_SHOW_ATTRIBUTES  = 205,
     ID_MULTIPLE_SORT    = 206,
+    ID_SORT_BY_FIRST_COLUMN,
 
     // Fourth page.
     ID_DELETE_TREE_ITEM = 400,
@@ -407,6 +409,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_BUTTON( ID_HIDE_ATTRIBUTES, MyFrame::OnHideAttributes)
     EVT_BUTTON( ID_SHOW_ATTRIBUTES, MyFrame::OnShowAttributes)
     EVT_CHECKBOX( ID_MULTIPLE_SORT, MyFrame::OnMultipleSort)
+    EVT_CHECKBOX( ID_SORT_BY_FIRST_COLUMN, MyFrame::OnSortByFirstColumn)
     
     // Fourth page.
     EVT_BUTTON( ID_DELETE_TREE_ITEM, MyFrame::OnDeleteTreeItem )
@@ -559,12 +562,17 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
     button_sizer2->Add( new wxButton( secondPanel, ID_ADD_MANY,    "Add 1000"),               0, wxALL, 10 );
     button_sizer2->Add( new wxButton( secondPanel, ID_HIDE_ATTRIBUTES,    "Hide attributes"), 0, wxALL, 10 );
     button_sizer2->Add( new wxButton( secondPanel, ID_SHOW_ATTRIBUTES,    "Show attributes"), 0, wxALL, 10 );
-    button_sizer2->Add( new wxCheckBox(secondPanel, ID_MULTIPLE_SORT, "Allow multisort"),
-                        wxSizerFlags().Centre().DoubleBorder() );
+
+    wxBoxSizer *sortSizer = new wxBoxSizer(wxHORIZONTAL);
+    sortSizer->Add(new wxCheckBox(secondPanel, ID_SORT_BY_FIRST_COLUMN, "Sort by first column"),
+                   wxSizerFlags().Centre().DoubleBorder());
+    sortSizer->Add(new wxCheckBox(secondPanel, ID_MULTIPLE_SORT, "Allow multisort"),
+                   wxSizerFlags().Centre().DoubleBorder());
 
     wxSizer *secondPanelSz = new wxBoxSizer( wxVERTICAL );
     secondPanelSz->Add(m_ctrl[1], 1, wxGROW|wxALL, 5);
     secondPanelSz->Add(button_sizer2);
+    secondPanelSz->Add(sortSizer);
     secondPanel->SetSizerAndFit(secondPanelSz);
 
 
@@ -1500,3 +1508,11 @@ void MyFrame::OnMultipleSort( wxCommandEvent &event )
         wxLogMessage("Sorting by multiple columns not supported");
 }
 
+void MyFrame::OnSortByFirstColumn(wxCommandEvent& event)
+{
+    wxDataViewColumn* const col = m_ctrl[1]->GetColumn(0);
+    if ( event.IsChecked() )
+        col->SetSortOrder(true /* ascending */);
+    else
+        col->UnsetAsSortKey();
+}

From 5d091e09622eda04542bf5972331b8e9e2d5d86f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 28 Jul 2018 02:26:45 +0200
Subject: [PATCH 794/916] Avoid harmless warning about using nil in wxMac
 wxNotebook code

At least with 10.12 SDK, NSTabViewItem initWithIdentifier: parameter
isn't annotated as being nullable, so passing "nil" to it triggers a
compiler warning.

This warning is apparently harmless and the header was fixed in 10.13
SDK, so just suppress it.
---
 src/osx/cocoa/notebook.mm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/osx/cocoa/notebook.mm b/src/osx/cocoa/notebook.mm
index 0a3862ac24..396136ff32 100644
--- a/src/osx/cocoa/notebook.mm
+++ b/src/osx/cocoa/notebook.mm
@@ -112,10 +112,18 @@
 @implementation WXCTabViewImageItem : NSTabViewItem
 - (id)init
 {
+    // With 10.12 SDK initWithIdentifier: is declared as taking a non-nil value
+    // and while this was fixed in 10.13 by adding the missing "nullable",
+    // avoid the annoying warning with 10.12 by explicitly disabling it.
+    wxCLANG_WARNING_SUPPRESS(nonnull)
+
     if (self = [super initWithIdentifier:nil])
     {
         m_image = nil;
     }
+
+    wxCLANG_WARNING_RESTORE(nonnull)
+
     return self;
 }
 - (void)dealloc

From 2a59c1fb204169af11213febef755f2b4771f762 Mon Sep 17 00:00:00 2001
From: Daniel Kulp <dan@kulp.com>
Date: Sat, 28 Jul 2018 02:29:29 +0200
Subject: [PATCH 795/916] Implement wxDataViewColumn::UnsetAsSortKey() in macOS
 version

It was impossible to stop sorting the control if it had been sorted
before, so implement UnsetAsSortKey() to allow doing it by destroying
the current sort descriptor.

Closes #18176.
---
 docs/changes.txt          | 1 +
 include/wx/osx/dataview.h | 1 +
 src/osx/cocoa/dataview.mm | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index a156283e77..80c7c8564e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -128,6 +128,7 @@ wxMSW:
 wxOSX:
 
 - Fix dispatching pending events (and CallAfter()) in console applications.
+- Implement wxDataViewColumn::UnsetAsSortKey() (Daniel Kulp).
 
 wxQt:
 
diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index 64418110f9..2b958c60a4 100644
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -60,6 +60,7 @@ public:
     virtual void SetMinWidth   (int minWidth);
     virtual void SetReorderable(bool reorderable);
     virtual void SetResizeable (bool resizable);
+    virtual void UnsetAsSortKey();
     virtual void SetSortable   (bool sortable);
     virtual void SetSortOrder  (bool ascending);
     virtual void SetTitle      (wxString const& title);
diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index a7ec7df23f..83b3fd9343 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -3465,6 +3465,13 @@ void wxDataViewColumn::SetResizeable(bool resizable)
         [m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnNoResizing];
 }
 
+void wxDataViewColumn::UnsetAsSortKey()
+{
+    NSTableColumn* const tableColumn = m_NativeDataPtr->GetNativeColumnPtr();
+    if ( tableColumn )
+        [tableColumn setSortDescriptorPrototype:nil];
+}
+
 void wxDataViewColumn::SetSortable(bool sortable)
 {
     // wxDataViewColumnBase::SetSortable(sortable);

From 4af7d4e0d5dc03a4ef75011c0a6f7f9ffabf495a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 28 Jul 2018 02:54:44 +0200
Subject: [PATCH 796/916] Also implement wxDataViewColumn::UnsetAsSortKey() for
 wxGTK

Allow to reset the sort order in native GTK+ implementation too.

See #18176.
---
 docs/changes.txt          |  1 +
 include/wx/gtk/dataview.h |  1 +
 src/gtk/dataview.cpp      | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index 80c7c8564e..74ef379423 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -111,6 +111,7 @@ All (GUI):
 wxGTK:
 
 - Implement wxTextCtrl::HitTest() for single line controls.
+- Implement wxDataViewColumn::UnsetAsSortKey().
 - Fix not showing wxInfoBar with GTK+ 3 < 3.22.29.
 - Fix the build with glib < 2.32 (e.g. CentOS 6).
 
diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 059f1dc367..4f2de40189 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -43,6 +43,7 @@ public:
 
     virtual void SetSortable( bool sortable ) wxOVERRIDE;
     virtual void SetSortOrder( bool ascending ) wxOVERRIDE;
+    virtual void UnsetAsSortKey() wxOVERRIDE;
 
     virtual void SetResizeable( bool resizable ) wxOVERRIDE;
     virtual void SetHidden( bool hidden ) wxOVERRIDE;
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 71f9774591..c7bd5f16c8 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -3345,6 +3345,17 @@ void wxDataViewColumn::SetSortOrder( bool ascending )
     internal->SetDataViewSortColumn(this);
 }
 
+void wxDataViewColumn::UnsetAsSortKey()
+{
+    GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
+
+    gtk_tree_view_column_set_sort_indicator( column, FALSE );
+
+    wxDataViewCtrlInternal* internal = m_owner->GtkGetInternal();
+    internal->SetSortColumn(-1);
+    internal->SetDataViewSortColumn(NULL);
+}
+
 bool wxDataViewColumn::IsSortOrderAscending() const
 {
     GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);

From e732da462fc3172f609ad5fae97502f1f807ff1d Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 28 Jul 2018 11:33:30 +0200
Subject: [PATCH 797/916] Add tests for the bounds of wxGraphicsPath

Check if bounding box of wxGraphicsPath is properly determined.
---
 tests/graphics/graphpath.cpp | 452 ++++++++++++++++++++++++++++++++++-
 1 file changed, 451 insertions(+), 1 deletion(-)

diff --git a/tests/graphics/graphpath.cpp b/tests/graphics/graphpath.cpp
index 7cd9a2a999..5f5d583bc7 100644
--- a/tests/graphics/graphpath.cpp
+++ b/tests/graphics/graphpath.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        tests/graphics/grsppsth.cpp
+// Name:        tests/graphics/grappath.cpp
 // Purpose:     graphics path unit tests
 // Author:      Artur Wieczorek
 // Created:     2018-07-01
@@ -392,10 +392,460 @@ static void TestCurrentPoint(wxGraphicsContext* gc)
     }
 }
 
+#define WX_CHECK_BOX(r1, r2, tolerance)                           \
+    WX_CHECK_POINT(r1.GetLeftTop(), r2.GetLeftTop(), tolerance); \
+    WX_CHECK_POINT(r1.GetRightBottom(), r2.GetRightBottom(), tolerance)
+
+static void TestBox(wxGraphicsContext* gc)
+{
+    // No current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(0, 0, 0, 0), 0);
+    }
+    // MoveToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(28, 38);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(0, 0, 0, 0), 0);
+    }
+    // AddLineToPoint - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.AddLineToPoint(28, 36);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(0, 0, 0, 0), 0);
+    }
+    // AddLineToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 10;
+        const wxDouble y0 = 18;
+        path.MoveToPoint(x0, y0);
+        const wxDouble w = 20;
+        const wxDouble h = 46;
+        path.AddLineToPoint(x0 + w, y0 + h);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x0, y0, w, h), 0);
+    }
+    // AddArc - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble r = 40;
+        path.AddArc(x, y, r, 0, M_PI / 2, true);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, r, r), 1E-3);
+    }
+    // AddArc
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 20;
+        const wxDouble y0 = 20;
+        path.MoveToPoint(x0, y0);
+        const wxDouble x = 200;
+        const wxDouble y = 50;
+        const wxDouble r = 40;
+        path.AddArc(x, y, r, 0, M_PI / 2, true);
+        const wxDouble x2 = x + r;
+        const wxDouble y2 = y + r;
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x0, y0, x2 - x0, y2 - y0), 1E-3);
+    }
+    // AddArcToPoint - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x1 = 80;
+        const wxDouble y1 = 0;
+        const wxDouble x2 = x1;
+        const wxDouble y2 = 40;
+        const wxDouble r = 20;
+        wxASSERT(y1 == 0 && x2 == x1); // alpha = 90 deg
+        path.AddArcToPoint(x1, y1, x2, y2, r);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(0, 0, x1, r), 1E-3);
+    }
+    // AddArcToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 20;
+        const wxDouble y0 = 20;
+        path.MoveToPoint(x0, y0);
+        const wxDouble x1 = 80;
+        const wxDouble y1 = y0;
+        const wxDouble x2 = x1;
+        const wxDouble y2 = 140;
+        const wxDouble r = 20;
+        wxASSERT(y1 == y0 && x2 == x1); // alpha = 90 deg
+        path.AddArcToPoint(x1, y1, x2, y2, r);
+        const wxDouble xe = x1;
+        const wxDouble ye = y1 + r;
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x0, y0, xe - x0, ye - y0), 1E-3);
+    }
+    // AddCurveToPoint - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x1 = 102;
+        const wxDouble y1 = 230;
+        const wxDouble x2 = 153;
+        const wxDouble y2 = 25;
+        const wxDouble x3 = 230;
+        const wxDouble y3 = 128;
+        path.AddCurveToPoint(x1, y1, x2, y2, x3, y3);
+        const wxDouble xmin = wxMin(wxMin(x1, x2), x3);
+        const wxDouble ymin = wxMin(wxMin(y1, y2), y3);
+        const wxDouble xmax = wxMax(wxMax(x1, x2), x3);
+        const wxDouble ymax = wxMax(wxMax(y1, y2), y3);
+        wxRect2DDouble b = path.GetBox();
+        const wxDouble tolerance = 1E-3;
+        CHECK(xmin - tolerance <= b.GetLeft());
+        CHECK(ymin - tolerance <= b.GetTop());
+        CHECK(xmax + tolerance >= b.GetRight());
+        CHECK(ymax + tolerance >= b.GetBottom());
+    }
+    // AddCurveToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 25;
+        const wxDouble y0 = 128;
+        path.MoveToPoint(x0, y0);
+        const wxDouble x1 = 102;
+        const wxDouble y1 = 230;
+        const wxDouble x2 = 153;
+        const wxDouble y2 = 25;
+        const wxDouble x3 = 230;
+        const wxDouble y3 = 128;
+        path.AddCurveToPoint(x1, y1, x2, y2, x3, y3);
+        const wxDouble xmin = wxMin(wxMin(wxMin(x0, x1), x2), x3);
+        const wxDouble ymin = wxMin(wxMin(wxMin(y0, y1), y2), y3);
+        const wxDouble xmax = wxMax(wxMax(wxMax(x0, x1), x2), x3);
+        const wxDouble ymax = wxMax(wxMax(wxMax(y0, y1), y2), y3);
+        wxRect2DDouble b = path.GetBox();
+        const wxDouble tolerance = 1E-3;
+        CHECK(xmin - tolerance <= b.GetLeft());
+        CHECK(ymin - tolerance <= b.GetTop());
+        CHECK(xmax + tolerance >= b.GetRight());
+        CHECK(ymax + tolerance >= b.GetBottom());
+    }
+    // AddQuadCurveToPoint - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x1 = 200;
+        const wxDouble y1 = 200;
+        const wxDouble x2 = 300;
+        const wxDouble y2 = 100;
+        path.AddQuadCurveToPoint(x1, y1, x2, y2);
+        //        const wxDouble xmin = wxMin(x1, x2);
+        const wxDouble xmin = 133;
+        const wxDouble ymin = wxMin(y1, y2);
+        const wxDouble xmax = wxMax(x1, x2);
+        const wxDouble ymax = wxMax(y1, y2);
+        wxRect2DDouble b = path.GetBox();
+        const wxDouble tolerance = 1E-3;
+        CHECK(xmin - tolerance <= b.GetLeft());
+        CHECK(ymin - tolerance <= b.GetTop());
+        CHECK(xmax + tolerance >= b.GetRight());
+        CHECK(ymax + tolerance >= b.GetBottom());
+    }
+    // AddQuadCurveToPoint
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 20;
+        const wxDouble y0 = 100;
+        path.MoveToPoint(x0, y0);
+        const wxDouble x1 = 200;
+        const wxDouble y1 = 200;
+        const wxDouble x2 = 300;
+        const wxDouble y2 = 100;
+        path.AddQuadCurveToPoint(x1, y1, x2, y2);
+        const wxDouble xmin = wxMin(wxMin(x0, x1), x2);
+        const wxDouble ymin = wxMin(wxMin(y0, y1), y2);
+        const wxDouble xmax = wxMax(wxMax(x0, x1), x2);
+        const wxDouble ymax = wxMax(wxMax(y0, y1), y2);
+        wxRect2DDouble b = path.GetBox();
+        const wxDouble tolerance = 1E-3;
+        CHECK(xmin - tolerance <= b.GetLeft());
+        CHECK(ymin - tolerance <= b.GetTop());
+        CHECK(xmax + tolerance >= b.GetRight());
+        CHECK(ymax + tolerance >= b.GetBottom());
+    }
+    // AddCircle - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble r = 30;
+        path.AddCircle(x, y, r);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x - r, y - r, 2 * r, 2 * r), 1E-3);
+    }
+    // AddCircle
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 80);
+        const wxDouble x = 100;
+        const wxDouble y = 140;
+        const wxDouble r = 40;
+        path.AddCircle(x, y, r);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x - r, y - r, 2 * r, 2 * r), 1E-3);
+    }
+    // AddEllipse - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddEllipse(x, y, w, h);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+    // AddEllipse
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddEllipse(x, y, w, h);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+    // AddRectangle - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddRectangle(x, y, w, h);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+    // AddRectangle
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 50;
+        const wxDouble h = 30;
+        path.AddRectangle(x, y, w, h);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+    // AddRoundedRectangle - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddRoundedRectangle(x, y, w, h, 5);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+    // AddRoundedRectangle - no current point, radius = 0
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddRoundedRectangle(x, y, w, h, 0);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+    // AddRoundedRectangle
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddRoundedRectangle(x, y, w, h, 5);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+    // AddRoundedRectangle - radius = 0
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 40;
+        const wxDouble h = 20;
+        path.AddRoundedRectangle(x, y, w, h, 0);
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+    // CloseSubpath - empty path
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.CloseSubpath();
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(0, 0, 0, 0), 0);
+    }
+    // CloseSubpath - no current point
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 50;
+        const wxDouble y0 = 80;
+        path.AddLineToPoint(x0, y0);
+        const wxDouble x1 = 100;
+        const wxDouble y1 = 160;
+        path.AddLineToPoint(x1, y1);
+        path.CloseSubpath();
+        const wxDouble w = x1 - x0;
+        const wxDouble h = y1 - y0;
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x0, y0, w, h), 1E-3);
+    }
+    // CloseSubpath
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        const wxDouble x0 = 10;
+        const wxDouble y0 = 20;
+        path.MoveToPoint(x0, y0);
+        path.AddLineToPoint(50, 80);
+        const wxDouble x = 100;
+        const wxDouble y = 160;
+        path.AddLineToPoint(x, y);
+        path.CloseSubpath();
+        const wxDouble w = x - x0;
+        const wxDouble h = y - y0;
+        wxRect2DDouble b = path.GetBox();
+        WX_CHECK_BOX(b, wxRect2DDouble(x0, y0, w, h), 1E-3);
+    }
+    // AddPath - no current point
+    {
+        // Path to be added
+        wxGraphicsPath path2 = gc->CreatePath();
+        path2.AddLineToPoint(100, 160);
+        path2.AddLineToPoint(50, 80);
+        path2.CloseSubpath();
+        wxRect2DDouble b2 = path2.GetBox();
+        // Main path
+        wxGraphicsPath path = gc->CreatePath();
+        path.AddLineToPoint(50, 80);
+        const wxDouble x = 100;
+        const wxDouble y = 140;
+        path.AddRectangle(x, y, 50, 200);
+        wxRect2DDouble b0 = path.GetBox();
+        b0.Union(b2);
+        path.AddPath(path2);
+        wxRect2DDouble b1 = path.GetBox();
+        WX_CHECK_BOX(b0, b1, 1E-3);
+    }
+    // AddPath
+    {
+        // Path to be added
+        wxGraphicsPath path2 = gc->CreatePath();
+        path2.AddArcToPoint(100, 160, 50, 200, 30);
+        path2.AddLineToPoint(50, 80);
+        path2.CloseSubpath();
+        wxRect2DDouble b2 = path2.GetBox();
+        // Main path
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(15, 35);
+        path.AddLineToPoint(50, 80);
+        const wxDouble x = 100;
+        const wxDouble y = 140;
+        const wxDouble r = 20;
+        path.AddCircle(x, y, r);
+        wxRect2DDouble b0 = path.GetBox();
+        b0.Union(b2);
+        path.AddPath(path2);
+        wxRect2DDouble b1 = path.GetBox();
+        WX_CHECK_BOX(b0, b1, 1E-3);
+    }
+    // Overlapping figures
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble xr = 100;
+        const wxDouble yr = 150;
+        const wxDouble wr = 80;
+        const wxDouble hr = 40;
+        path.AddRectangle(xr, yr, wr, hr);
+        const wxDouble xe = xr + wr / 4;
+        const wxDouble ye = yr + hr / 4;
+        const wxDouble we = wr / 2;
+        const wxDouble he = hr / 2;
+        path.AddEllipse(xe, ye, we, he);
+        wxRect2DDouble b = path.GetBox();
+        wxRect2DDouble r;
+        wxRect2DDouble::Union(wxRect2DDouble(xe, ye, we, he), wxRect2DDouble(xr, yr, wr, hr), &r);
+        WX_CHECK_BOX(b, r, 1E-3);
+    }
+    // Partially overlapping figures
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble xe = 100;
+        const wxDouble ye = 150;
+        const wxDouble we = 40;
+        const wxDouble he = 20;
+        path.AddEllipse(xe, ye, we, he);
+        const wxDouble xr = xe + he / 2;
+        const wxDouble yr = ye + we / 2;
+        const wxDouble wr = we + 10;
+        const wxDouble hr = he + 10;
+        path.AddRectangle(xr, yr, wr, hr);
+        wxRect2DDouble b = path.GetBox();
+        wxRect2DDouble r;
+        wxRect2DDouble::Union(wxRect2DDouble(xe, ye, we, he), wxRect2DDouble(xr, yr, wr, hr), &r);
+        WX_CHECK_BOX(b, r, 1E-3);
+    }
+    // Non-overlapping figures
+    {
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble xe = 100;
+        const wxDouble ye = 150;
+        const wxDouble we = 40;
+        const wxDouble he = 20;
+        path.AddEllipse(xe, ye, we, he);
+        const wxDouble xr = xe + he + 10;
+        const wxDouble yr = ye + we + 20;
+        const wxDouble wr = 50;
+        const wxDouble hr = 30;
+        path.AddRectangle(xr, yr, wr, hr);
+        wxRect2DDouble b = path.GetBox();
+        wxRect2DDouble r;
+        wxRect2DDouble::Union(wxRect2DDouble(xe, ye, we, he), wxRect2DDouble(xr, yr, wr, hr), &r);
+        WX_CHECK_BOX(b, r, 1E-3);
+    }
+    // Path from transformed graphics context
+    {
+        gc->PushState();
+        gc->Translate(5, 15);
+        gc->Rotate(10 * M_PI / 180);
+        wxGraphicsPath path = gc->CreatePath();
+        path.MoveToPoint(50, 60);
+        const wxDouble x = 100;
+        const wxDouble y = 150;
+        const wxDouble w = 50;
+        const wxDouble h = 30;
+        path.AddRectangle(x, y, w, h);
+        wxRect2DDouble b = path.GetBox();
+        gc->PopState();
+        WX_CHECK_BOX(b, wxRect2DDouble(x, y, w, h), 1E-3);
+    }
+}
+
 static void DoAllTests(wxGraphicsContext* gc)
 {
     gc->DisableOffset();
     TestCurrentPoint(gc);
+    TestBox(gc);
 }
 
 #endif //  wxUSE_GRAPHICS_CONTEXT

From e25ab3e42106c3548a48aa4cb3225a2354b5956f Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 28 Jul 2018 11:41:06 +0200
Subject: [PATCH 798/916] Fix getting extents of wxGraphicsPath (Cairo)

Graphics path is actually a line with null width so its bounding box
should be obtained with cairo_path_extents() function which assumes
that line width is 0.
---
 src/common/cairo.cpp     |  2 ++
 src/generic/graphicc.cpp | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index 940299dad0..3b86f79192 100644
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -100,6 +100,8 @@
         (cairo_t *cr, double alpha), (cr, alpha) ) \
     m( cairo_path_destroy, \
         (cairo_path_t *path), (path) ) \
+    m( cairo_path_extents, \
+        (cairo_t *cr, double *x1, double *y1, double *x2, double *y2), (cr, x1, y1, x2, y2) ) \
     m( cairo_pattern_add_color_stop_rgba, \
         (cairo_pattern_t *pattern, double offset, double red, double green, double blue, double alpha), (pattern, offset, red, green, blue, alpha) ) \
     m( cairo_pattern_destroy, \
diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index ddf2f94c52..1f6b875613 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -1195,7 +1195,17 @@ void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
 {
     double x1,y1,x2,y2;
 
-    cairo_stroke_extents( m_pathContext, &x1, &y1, &x2, &y2 );
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+    if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 6, 0) )
+    {
+        cairo_path_extents(m_pathContext, &x1, &y1, &x2, &y2);
+    }
+    else
+#endif
+    {
+        cairo_stroke_extents(m_pathContext, &x1, &y1, &x2, &y2);
+    }
+
     if ( x2 < x1 )
     {
         *x = x2;

From 74306708bc5e4f9bd04916d1e2cb60084ffa8177 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 28 Jul 2018 11:43:31 +0200
Subject: [PATCH 799/916] Fix retrieving empty bounding box for D2D graphics
 path

Return "zero rectangle" (0, 0, 0, 0) if bounding box is empty.
---
 src/msw/graphicsd2d.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index da36e77523..fe3b2a4dd5 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -1847,11 +1847,17 @@ void wxD2DPathData::GetBox(wxDouble* x, wxDouble* y, wxDouble* w, wxDouble *h) c
 {
     D2D1_RECT_F bounds;
     ID2D1Geometry *curGeometry = GetFullGeometry();
-    curGeometry->GetBounds(D2D1::Matrix3x2F::Identity(), &bounds);
-    if (x != NULL) *x = bounds.left;
-    if (y != NULL) *y = bounds.top;
-    if (w != NULL) *w = bounds.right - bounds.left;
-    if (h != NULL) *h = bounds.bottom - bounds.top;
+    HRESULT hr = curGeometry->GetBounds(D2D1::Matrix3x2F::Identity(), &bounds);
+    wxCHECK_HRESULT_RET(hr);
+    // Check if bounds are empty
+    if ( bounds.left > bounds.right )
+    {
+        bounds.left = bounds.top = bounds.right = bounds.bottom = 0.0F;
+    }
+    if (x) *x = bounds.left;
+    if (y) *y = bounds.top;
+    if (w) *w = bounds.right - bounds.left;
+    if (h) *h = bounds.bottom - bounds.top;
 }
 
 bool wxD2DPathData::Contains(wxDouble x, wxDouble y, wxPolygonFillMode WXUNUSED(fillStyle)) const

From c8fe81163649dba7d367157ca8f8bfbe2326da79 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 28 Jul 2018 11:46:28 +0200
Subject: [PATCH 800/916] Fix wxGraphicsPath::MoveToPoint for Direct2D

Calling MoveToPoint() shouldn't automatically open a new D2D figure (which
acts as a subpath) because in case of consecutive calls to MoveToPoint()
every next call would close the figure opened by the previous call and
we would get spurious figure(s) (consisting one point).
Opening a D2D figure (subpath) should be delgated to the functions doing
actual drawing.
---
 src/msw/graphicsd2d.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index fe3b2a4dd5..9fb830fe52 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -1450,11 +1450,8 @@ void wxD2DPathData::MoveToPoint(wxDouble x, wxDouble y)
 {
     // Close current sub-path (leaving the figure as is).
     EndFigure(D2D1_FIGURE_END_OPEN);
-    // And open a new sub-path.
-    D2D1_POINT_2F p = D2D1::Point2F(x, y);
-    EnsureFigureOpen(p);
-
-    m_currentPoint = p;
+    // Store new current point
+    m_currentPoint = D2D1::Point2F(x, y);
     m_currentPointSet = true;
 }
 
@@ -1480,11 +1477,11 @@ void wxD2DPathData::AddCurveToPoint(wxDouble cx1, wxDouble cy1, wxDouble cx2, wx
 {
     // If no current point is set then this function should behave
     // as if preceded by a call to MoveToPoint(cx1, cy1).
-    if( m_currentPointSet )
-        EnsureFigureOpen(m_currentPoint);
-    else
+    if( !m_currentPointSet )
         MoveToPoint(cx1, cy1);
 
+    EnsureFigureOpen(m_currentPoint);
+
     D2D1_BEZIER_SEGMENT bezierSegment = {
         { (FLOAT)cx1, (FLOAT)cy1 },
         { (FLOAT)cx2, (FLOAT)cy2 },
@@ -1536,13 +1533,19 @@ void wxD2DPathData::AddArc(wxDouble x, wxDouble y, wxDouble r, wxDouble startAng
     // To ensure compatibility with Cairo an initial
     // line segment to the beginning of the arc needs
     // to be added to the path.
-    if (m_figureOpened)
+    if ( m_figureOpened )
     {
         AddLineToPoint(start.m_x + x, start.m_y + y);
     }
+    else if ( m_currentPointSet )
+    {
+        EnsureFigureOpen(m_currentPoint);
+        AddLineToPoint(start.m_x + x, start.m_y + y);
+    }
     else
     {
         MoveToPoint(start.m_x + x, start.m_y + y);
+        EnsureFigureOpen(m_currentPoint);
     }
 
     D2D1_SWEEP_DIRECTION sweepDirection = clockwise ?
@@ -1626,6 +1629,8 @@ void wxD2DPathData::AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h)
     const wxDouble ry = h / 2.0;
 
     MoveToPoint(x + w, y + ry);
+    // Open new subpath
+    EnsureFigureOpen(m_currentPoint);
 
     D2D1_ARC_SEGMENT arcSegmentLower =
     {

From c948e1e15ed59e8859968c87d9956b6fddaa0ba9 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 28 Jul 2018 11:48:21 +0200
Subject: [PATCH 801/916] Fix retrieving empty bounding box for Core Graphics
 graphics path

Return "zero" rectangle if bounding box is empty
---
 src/osx/carbon/graphics.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index cf292a26e4..01a54e106a 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1272,6 +1272,11 @@ void wxMacCoreGraphicsPathData::Transform( const wxGraphicsMatrixData* matrix )
 void wxMacCoreGraphicsPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
 {
     CGRect bounds = CGPathGetBoundingBox( m_path ) ;
+    if ( CGRectIsEmpty(bounds) )
+    {
+        bounds = CGRectZero;
+    }
+
     *x = bounds.origin.x;
     *y = bounds.origin.y;
     *w = bounds.size.width;

From 3f18576deede6554f8eefebbfc0b29f80387f006 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 28 Jul 2018 12:15:10 +0200
Subject: [PATCH 802/916] Apply workaround in creating wxGraphicContext from
 native DC only for Cairo < 1.15.12 (wxMSW).

Cairo bug 96482 was fixed in 1.15.12 so the workaround needs to be applied
only for older Cairo versions.
---
 src/generic/graphicc.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 1f6b875613..0e644ce02a 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -2013,9 +2013,10 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
         // bug 96482) so in this case we would need to pass non-transformed
         // DC to Cairo and to apply original DC transformation to the Cairo
         // context operations on our own.
-        // We believe this bug will be fixed in the next Cairo version.
-#if CAIRO_VERSION <= CAIRO_VERSION_ENCODE(1, 15, 2)
-        if ( cairo_version() <= CAIRO_VERSION_ENCODE(1, 15, 2) )
+        // Bug 96482 was fixed in Cairo 1.15.12 so this workaround needs
+        // to be applied only for older Cairo versions.
+#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 15, 12)
+        if ( cairo_version() < CAIRO_VERSION_ENCODE(1, 15, 12) )
         {
             wxCoord orgX, orgY;
             dc.GetDeviceOrigin(&orgX, &orgY);
@@ -2028,7 +2029,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
                 adjustTransformFromDC = true;
             }
         }
-#endif // Cairo <= 1.15.2
+#endif // Cairo < 1.15.12
 
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 4)
         if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 15, 4) )

From 52d0462aa5252f1728db5ace5ed17cb3af94d6c6 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 28 Jul 2018 14:18:04 +0200
Subject: [PATCH 803/916] Fix closing empty subpath (Core Graphics)

CGPathCloseSubpath() shouldn't be invoked if the path is empty to suppress harmless warning displayed on console.
---
 src/osx/carbon/graphics.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 01a54e106a..5569691a93 100644
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1240,7 +1240,10 @@ void wxMacCoreGraphicsPathData::AddPath( const wxGraphicsPathData* path )
 // closes the current subpath
 void wxMacCoreGraphicsPathData::CloseSubpath()
 {
-    CGPathCloseSubpath( m_path );
+    if ( !CGPathIsEmpty(m_path) )
+    {
+        CGPathCloseSubpath( m_path );
+    }
 }
 
 // gets the last point of the current path, (0,0) if not yet set

From d08033292cb9d42a472ce6129a2b214f2d7172a1 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 28 Jul 2018 15:28:45 +0200
Subject: [PATCH 804/916] correcting doc

---
 include/wx/osx/core/cfdataref.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h
index 6c604cd069..54e7498243 100644
--- a/include/wx/osx/core/cfdataref.h
+++ b/include/wx/osx/core/cfdataref.h
@@ -34,10 +34,9 @@ public:
     typedef wxCFRef<CFDataRef> super_type;
 
     /*! @method     wxCFDataRef
-        @abstract   Assumes ownership of p and creates a reference to it.
-        @templatefield otherType    Any type.
-        @param p        The raw pointer to assume ownership of.  May be NULL.
-        @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
+        @abstract   Assumes ownership of r and creates a reference to it.
+        @param r        The data reference to assume ownership of.  May be NULL.
+        @discussion Like shared_ptr, it is assumed that the caller has a strong reference to r and intends
                     to transfer ownership of that reference to this ref holder.  If the object comes from
                     a Create or Copy method then this is the correct behaviour.  If the object comes from
                     a Get method then you must CFRetain it yourself before passing it to this constructor.

From 342e4454238b32617fcd1fa49a1117d80a19237a Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 28 Jul 2018 17:49:42 +0200
Subject: [PATCH 805/916] Adding wrapper for Core Foundation dictionaries

---
 include/wx/osx/core/cfdictionary.h | 203 +++++++++++++++++++++++++++++
 include/wx/osx/core/private.h      |   1 +
 2 files changed, 204 insertions(+)
 create mode 100644 include/wx/osx/core/cfdictionary.h

diff --git a/include/wx/osx/core/cfdictionary.h b/include/wx/osx/core/cfdictionary.h
new file mode 100644
index 0000000000..a935791da3
--- /dev/null
+++ b/include/wx/osx/core/cfdictionary.h
@@ -0,0 +1,203 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/core/cfdictionaryref.h
+// Purpose:     wxCFDictionaryRef class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     2018/07/27
+// Copyright:   (c) 2018 Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+/*! @header     wx/osx/core/cfdictionaryref.h
+ @abstract   wxCFDictionaryRef class
+ */
+
+#ifndef _WX_OSX_COREFOUNDATION_CFICTIONARYREF_H__
+#define _WX_OSX_COREFOUNDATION_CFICTIONARYREF_H__
+
+#include "wx/osx/core/cfref.h"
+#include "wx/osx/core/cfstring.h"
+
+#include <CoreFoundation/CFDictionary.h>
+
+class wxCFTypeRef : public wxCFRef<CFTypeRef>
+{
+public:
+    typedef wxCFRef<CFTypeRef> super_type;
+
+    wxCFTypeRef(CFTypeRef d)
+        : super_type(d)
+    {
+    }
+
+    template <typename V>
+    bool GetValue(V* ptr) const;
+
+    template <typename V>
+    bool GetValue(V* ptr, V defaultValue) const
+    {
+        bool hasKey = GetValue(ptr);
+
+        if (!hasKey)
+            *ptr = defaultValue;
+
+        return hasKey;
+    }
+
+    template <typename V>
+    bool GetValue(V& ref) const
+    {
+        return GetValue(&ref);
+    }
+
+    template <typename V>
+    bool GetValue(V& ref, V defaultValue) const
+    {
+        bool hasKey = GetValue(ref);
+
+        if (!hasKey)
+            ref = defaultValue;
+
+        return hasKey;
+    }
+
+    // spezialization through overload
+    
+    bool GetValue(CGFloat* ptr) const
+    {
+        if ( m_ptr )
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberCGFloatType, ptr);
+        
+        return m_ptr;
+    }
+
+    bool GetValue(int32_t* ptr) const
+    {
+        if ( m_ptr )
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt32Type, ptr);
+        
+        return m_ptr;
+    }
+    
+    bool GetValue(uint32_t* ptr) const
+    {
+        if ( m_ptr )
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt32Type, ptr);
+        
+        return m_ptr;
+    }
+    
+    bool GetValue(int64_t* ptr) const
+    {
+        if ( m_ptr )
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt64Type, ptr);
+        
+        return m_ptr;
+    }
+    
+    bool GetValue(uint64_t* ptr) const
+    {
+        if ( m_ptr )
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt64Type, ptr);
+        
+        return m_ptr;
+    }
+
+    bool GetValue(wxString *s) const
+    {
+        if ( m_ptr )
+            *s = wxCFStringRef::AsString((CFStringRef)m_ptr);
+        
+        return m_ptr;
+        
+    }
+
+};
+
+class wxCFNumberRef : public wxCFTypeRef
+{
+public:
+    wxCFNumberRef(CGFloat v)
+    : wxCFTypeRef(CFNumberCreate( NULL, kCFNumberCGFloatType, &v))
+    {
+    }
+    
+    wxCFNumberRef(int v)
+    : wxCFTypeRef(CFNumberCreate( NULL, kCFNumberIntType, &v))
+    {
+    }
+};
+
+/*! @class wxCFDictionaryRef
+ @discussion Properly retains/releases reference to CoreFoundation data objects
+ */
+template<typename T> class wxCFDictionaryRefCommon : public wxCFRef< T >
+{
+public:
+    typedef wxCFRef<T> super_type;
+
+    /*! @method     wxCFDictionaryRef
+     @abstract   Assumes ownership of r and creates a reference to it.
+     @param r        The dictionary reference to assume ownership of.  May be NULL.
+     @discussion Like shared_ptr, it is assumed that the caller has a strong reference to r and intends
+     to transfer ownership of that reference to this ref holder.  If the object comes from
+     a Create or Copy method then this is the correct behaviour.  If the object comes from
+     a Get method then you must CFRetain it yourself before passing it to this constructor.
+     A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
+     This method is templated and takes an otherType *p.  This prevents implicit conversion
+     using an operator refType() in a different ref-holding class type.
+     */
+    explicit wxCFDictionaryRefCommon(T r)
+    :   super_type(r)
+    {}
+
+    /*! @method     wxCFDictionaryRef
+     @abstract   Copies a ref holder of the same type
+     @param otherRef The other ref holder to copy.
+     @discussion Ownership will be shared by the original ref and the newly created ref. That is,
+     the object will be explicitly retained by this new ref.
+     */
+    wxCFDictionaryRefCommon(const wxCFDictionaryRefCommon& otherRef)
+    :  super_type( otherRef )
+    {}
+
+    wxCFTypeRef GetValue(const void *key)
+    {
+        CFTypeRef val = CFDictionaryGetValue( this->m_ptr, key);
+        if ( val )
+            ::CFRetain(val);
+        return val;
+    }
+};
+
+class wxCFDictionaryRef : public wxCFDictionaryRefCommon< CFDictionaryRef >
+{
+public:
+    explicit wxCFDictionaryRef(CFDictionaryRef r)
+    :   wxCFDictionaryRefCommon(r)
+    {}
+};
+
+class wxCFMutableDictionaryRef : public wxCFDictionaryRefCommon< CFMutableDictionaryRef >
+{
+public:
+    wxCFMutableDictionaryRef() : wxCFDictionaryRefCommon(CFDictionaryCreateMutable(kCFAllocatorDefault, 0,&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks))
+    {
+    }
+
+    explicit wxCFMutableDictionaryRef(CFMutableDictionaryRef r)
+    :   wxCFDictionaryRefCommon(r)
+    {}
+
+    void SetValue(const void *key, const void *data)
+    {
+        CFDictionarySetValue( this->m_ptr, key, data);
+    }
+    
+    void SetValue(const void*key, CGFloat v)
+    {
+        
+    }
+};
+
+#endif //ifndef _WX_OSX_COREFOUNDATION_CFICTIONARYREF_H__
+
diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 109f420124..3175109d38 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -19,6 +19,7 @@
 
 #include "wx/osx/core/cfstring.h"
 #include "wx/osx/core/cfdataref.h"
+#include "wx/osx/core/cfdictionary.h"
 
 // platform specific Clang analyzer support
 #ifndef NS_RETURNS_RETAINED

From 56a51ad1e739de26bd12cbde71d457b6e837449e Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 28 Jul 2018 20:14:26 +0200
Subject: [PATCH 806/916] fixing non-precompiled header build, adding method
 body

---
 include/wx/osx/core/cfdictionary.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/wx/osx/core/cfdictionary.h b/include/wx/osx/core/cfdictionary.h
index a935791da3..e3aeec32bb 100644
--- a/include/wx/osx/core/cfdictionary.h
+++ b/include/wx/osx/core/cfdictionary.h
@@ -19,6 +19,10 @@
 
 #include <CoreFoundation/CFDictionary.h>
 
+#ifndef WX_PRECOMP
+#include "wx/string.h"
+#endif
+
 class wxCFTypeRef : public wxCFRef<CFTypeRef>
 {
 public:
@@ -195,7 +199,7 @@ public:
     
     void SetValue(const void*key, CGFloat v)
     {
-        
+        SetValue( key, wxCFNumberRef(v));
     }
 };
 

From 57180d68c83f29a37e6bd1aa1acaf2d462fe8f91 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 11:09:17 +0200
Subject: [PATCH 807/916] Add wxOVERRIDE to test files

And cleanup some tailing spaces and tabs.
---
 tests/archive/tartest.cpp                 |  4 ++--
 tests/archive/ziptest.cpp                 | 10 +++++-----
 tests/controls/bitmapcomboboxtest.cpp     | 14 ++++++-------
 tests/controls/bitmaptogglebuttontest.cpp |  4 ++--
 tests/controls/buttontest.cpp             |  6 +++---
 tests/controls/checkboxtest.cpp           |  4 ++--
 tests/controls/checklistboxtest.cpp       |  8 ++++----
 tests/controls/choicebooktest.cpp         | 10 +++++-----
 tests/controls/choicetest.cpp             |  8 ++++----
 tests/controls/comboboxtest.cpp           | 16 +++++++--------
 tests/controls/dataviewctrltest.cpp       |  4 ++--
 tests/controls/datepickerctrltest.cpp     |  4 ++--
 tests/controls/frametest.cpp              |  4 ++--
 tests/controls/gaugetest.cpp              |  4 ++--
 tests/controls/gridtest.cpp               |  4 ++--
 tests/controls/headerctrltest.cpp         |  4 ++--
 tests/controls/htmllboxtest.cpp           |  8 ++++----
 tests/controls/hyperlinkctrltest.cpp      |  4 ++--
 tests/controls/label.cpp                  |  4 ++--
 tests/controls/listbasetest.cpp           |  4 ++--
 tests/controls/listbooktest.cpp           | 10 +++++-----
 tests/controls/listboxtest.cpp            |  8 ++++----
 tests/controls/listctrltest.cpp           |  6 +++---
 tests/controls/listviewtest.cpp           |  6 +++---
 tests/controls/notebooktest.cpp           | 10 +++++-----
 tests/controls/ownerdrawncomboboxtest.cpp | 14 ++++++-------
 tests/controls/pickertest.cpp             | 24 +++++++++++------------
 tests/controls/radioboxtest.cpp           |  4 ++--
 tests/controls/radiobuttontest.cpp        |  4 ++--
 tests/controls/rearrangelisttest.cpp      |  8 ++++----
 tests/controls/richtextctrltest.cpp       |  4 ++--
 tests/controls/simplebooktest.cpp         | 10 +++++-----
 tests/controls/slidertest.cpp             |  4 ++--
 tests/controls/spinctrldbltest.cpp        |  4 ++--
 tests/controls/spinctrltest.cpp           |  4 ++--
 tests/controls/textctrltest.cpp           | 10 +++++-----
 tests/controls/togglebuttontest.cpp       |  4 ++--
 tests/controls/toolbooktest.cpp           | 12 ++++++------
 tests/controls/treebooktest.cpp           | 10 +++++-----
 tests/controls/treectrltest.cpp           |  4 ++--
 tests/controls/treelistctrltest.cpp       |  4 ++--
 tests/controls/virtlistctrltest.cpp       |  4 ++--
 tests/controls/webtest.cpp                |  4 ++--
 tests/controls/windowtest.cpp             |  4 ++--
 tests/events/clone.cpp                    |  4 ++--
 tests/events/keyboard.cpp                 |  4 ++--
 tests/events/propagation.cpp              |  4 ++--
 tests/file/dir.cpp                        |  6 +++---
 tests/file/filefn.cpp                     |  6 +++---
 tests/filekind/filekind.cpp               |  4 ++--
 tests/filename/filenametest.cpp           |  4 ++--
 tests/fswatcher/fswatchertest.cpp         |  4 ++--
 tests/graphics/affinematrix.cpp           |  2 +-
 tests/graphics/bitmap.cpp                 |  4 ++--
 tests/graphics/boundingbox.cpp            |  2 +-
 tests/graphics/clippingbox.cpp            |  2 +-
 tests/html/htmlwindow.cpp                 |  4 ++--
 tests/interactive/input.cpp               | 20 +++++++++----------
 tests/intl/intltest.cpp                   |  4 ++--
 tests/log/logtest.cpp                     |  4 ++--
 tests/menu/menu.cpp                       |  4 ++--
 tests/misc/dynamiclib.cpp                 |  2 +-
 tests/misc/environ.cpp                    |  2 +-
 tests/misc/pathlist.cpp                   |  2 +-
 tests/misc/selstoretest.cpp               |  4 ++--
 tests/misc/settings.cpp                   |  4 ++--
 tests/sizers/boxsizer.cpp                 |  4 ++--
 tests/sizers/gridsizer.cpp                |  4 ++--
 tests/sizers/wrapsizer.cpp                |  4 ++--
 tests/streams/ffilestream.cpp             |  6 +++---
 tests/streams/filestream.cpp              |  6 +++---
 tests/streams/iostreams.cpp               |  2 +-
 tests/streams/memstream.cpp               |  4 ++--
 tests/streams/socketstream.cpp            |  8 ++++----
 tests/streams/sstream.cpp                 |  4 ++--
 tests/streams/zlibstream.cpp              |  8 ++++----
 tests/strings/numformatter.cpp            |  4 ++--
 tests/strings/unichar.cpp                 |  2 +-
 tests/strings/vsnprintf.cpp               |  8 ++++----
 tests/test.cpp                            |  8 ++++----
 tests/textfile/textfiletest.cpp           |  2 +-
 tests/thread/misc.cpp                     | 12 ++++++------
 tests/uris/url.cpp                        |  2 +-
 tests/validators/valnum.cpp               |  4 ++--
 tests/window/clientsize.cpp               |  4 ++--
 tests/window/setsize.cpp                  |  4 ++--
 tests/xml/xrctest.cpp                     |  4 ++--
 87 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/tests/archive/tartest.cpp b/tests/archive/tartest.cpp
index 07d907a538..07a330c30a 100644
--- a/tests/archive/tartest.cpp
+++ b/tests/archive/tartest.cpp
@@ -25,7 +25,7 @@ using std::string;
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// Tar suite 
+// Tar suite
 
 class tartest : public ArchiveTestSuite
 {
@@ -38,7 +38,7 @@ protected:
     CppUnit::Test *makeTest(string descr, int options,
                             bool genericInterface,
                             const wxString& archiver,
-                            const wxString& unarchiver);
+                            const wxString& unarchiver) wxOVERRIDE;
 };
 
 tartest::tartest()
diff --git a/tests/archive/ziptest.cpp b/tests/archive/ziptest.cpp
index 24c62e3f8f..0abe646e4f 100644
--- a/tests/archive/ziptest.cpp
+++ b/tests/archive/ziptest.cpp
@@ -43,13 +43,13 @@ public:
 
 protected:
     void OnCreateArchive(wxZipOutputStream& zip);
-    
+
     void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal);
-    
+
     void OnCreateEntry(wxZipOutputStream& zip,
                        TestEntry& testEntry,
                        wxZipEntry *entry);
-    
+
     void OnEntryExtracted(wxZipEntry& entry,
                           const TestEntry& testEntry,
                           wxZipInputStream *arc);
@@ -206,7 +206,7 @@ void ZipPipeTestCase::runTest()
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// Zip suite 
+// Zip suite
 
 class ziptest : public ArchiveTestSuite
 {
@@ -218,7 +218,7 @@ public:
 protected:
     CppUnit::Test *makeTest(string descr, int options,
                             bool genericInterface, const wxString& archiver,
-                            const wxString& unarchiver);
+                            const wxString& unarchiver) wxOVERRIDE;
 };
 
 ziptest::ziptest()
diff --git a/tests/controls/bitmapcomboboxtest.cpp b/tests/controls/bitmapcomboboxtest.cpp
index 55c044465f..7ac6c112d5 100644
--- a/tests/controls/bitmapcomboboxtest.cpp
+++ b/tests/controls/bitmapcomboboxtest.cpp
@@ -34,17 +34,17 @@ class BitmapComboBoxTestCase : public TextEntryTestCase,
 public:
     BitmapComboBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxTextEntry *GetTestEntry() const { return m_combo; }
-    virtual wxWindow *GetTestWindow() const { return m_combo; }
+    virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual wxItemContainer *GetContainer() const { return m_combo; }
-    virtual wxWindow *GetContainerWindow() const { return m_combo; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual void CheckStringSelection(const char * WXUNUSED(sel))
+    virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE
     {
         // do nothing here, as explained in TextEntryTestCase comment, our
         // GetStringSelection() is the wxChoice, not wxTextEntry, one and there
diff --git a/tests/controls/bitmaptogglebuttontest.cpp b/tests/controls/bitmaptogglebuttontest.cpp
index 9ba028d93d..2a477daa80 100644
--- a/tests/controls/bitmaptogglebuttontest.cpp
+++ b/tests/controls/bitmaptogglebuttontest.cpp
@@ -31,8 +31,8 @@ class BitmapToggleButtonTestCase : public CppUnit::TestCase
 public:
     BitmapToggleButtonTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( BitmapToggleButtonTestCase );
diff --git a/tests/controls/buttontest.cpp b/tests/controls/buttontest.cpp
index 26638d9583..764de5b28e 100644
--- a/tests/controls/buttontest.cpp
+++ b/tests/controls/buttontest.cpp
@@ -32,8 +32,8 @@ class ButtonTestCase : public CppUnit::TestCase
 public:
     ButtonTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( ButtonTestCase );
@@ -164,7 +164,7 @@ void ButtonTestCase::Bitmap()
     CPPUNIT_ASSERT(!m_button->GetBitmap().IsOk());
 
 
-    m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION, 
+    m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION,
                                                wxART_OTHER,
                                                wxSize(32, 32)));
 
diff --git a/tests/controls/checkboxtest.cpp b/tests/controls/checkboxtest.cpp
index 5f38a61f2c..e1edd3e514 100644
--- a/tests/controls/checkboxtest.cpp
+++ b/tests/controls/checkboxtest.cpp
@@ -26,8 +26,8 @@ class CheckBoxTestCase : public CppUnit::TestCase
 public:
     CheckBoxTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( CheckBoxTestCase );
diff --git a/tests/controls/checklistboxtest.cpp b/tests/controls/checklistboxtest.cpp
index b81ea7cf43..27a33ccf54 100644
--- a/tests/controls/checklistboxtest.cpp
+++ b/tests/controls/checklistboxtest.cpp
@@ -27,12 +27,12 @@ class CheckListBoxTestCase : public ItemContainerTestCase, public CppUnit::TestC
 public:
     CheckListBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_check; }
-    virtual wxWindow *GetContainerWindow() const { return m_check; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_check; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_check; }
 
     CPPUNIT_TEST_SUITE( CheckListBoxTestCase );
         wxITEM_CONTAINER_TESTS();
diff --git a/tests/controls/choicebooktest.cpp b/tests/controls/choicebooktest.cpp
index 23683cbdf4..1c3efaf020 100644
--- a/tests/controls/choicebooktest.cpp
+++ b/tests/controls/choicebooktest.cpp
@@ -27,16 +27,16 @@ class ChoicebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     ChoicebookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_choicebook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_choicebook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
     { return wxEVT_CHOICEBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
     { return wxEVT_CHOICEBOOK_PAGE_CHANGING; }
 
     CPPUNIT_TEST_SUITE( ChoicebookTestCase );
diff --git a/tests/controls/choicetest.cpp b/tests/controls/choicetest.cpp
index 14e2f4600f..eacb0e88e6 100644
--- a/tests/controls/choicetest.cpp
+++ b/tests/controls/choicetest.cpp
@@ -26,12 +26,12 @@ class ChoiceTestCase : public ItemContainerTestCase, public CppUnit::TestCase
 public:
     ChoiceTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_choice; }
-    virtual wxWindow *GetContainerWindow() const { return m_choice; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_choice; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_choice; }
 
     CPPUNIT_TEST_SUITE( ChoiceTestCase );
         wxITEM_CONTAINER_TESTS();
diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp
index 705f406318..6bec622644 100644
--- a/tests/controls/comboboxtest.cpp
+++ b/tests/controls/comboboxtest.cpp
@@ -37,17 +37,17 @@ class ComboBoxTestCase : public TextEntryTestCase, public ItemContainerTestCase,
 public:
     ComboBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxTextEntry *GetTestEntry() const { return m_combo; }
-    virtual wxWindow *GetTestWindow() const { return m_combo; }
+    virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual wxItemContainer *GetContainer() const { return m_combo; }
-    virtual wxWindow *GetContainerWindow() const { return m_combo; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual void CheckStringSelection(const char * WXUNUSED(sel))
+    virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE
     {
         // do nothing here, as explained in TextEntryTestCase comment, our
         // GetStringSelection() is the wxChoice, not wxTextEntry, one and there
@@ -64,7 +64,7 @@ private:
 //  TODO on OS X only works interactively
 //   WXUISIM_TEST( Editable );
     CPPUNIT_TEST( Hint );
-    CPPUNIT_TEST( CopyPaste ); 
+    CPPUNIT_TEST( CopyPaste );
     CPPUNIT_TEST( UndoRedo );
 #else
         wxTEXT_ENTRY_TESTS();
diff --git a/tests/controls/dataviewctrltest.cpp b/tests/controls/dataviewctrltest.cpp
index 339b389dad..45c10cf253 100644
--- a/tests/controls/dataviewctrltest.cpp
+++ b/tests/controls/dataviewctrltest.cpp
@@ -32,8 +32,8 @@ class DataViewCtrlTestCase : public CppUnit::TestCase
 public:
     DataViewCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( DataViewCtrlTestCase );
diff --git a/tests/controls/datepickerctrltest.cpp b/tests/controls/datepickerctrltest.cpp
index 2a9094a6e7..403e18ac01 100644
--- a/tests/controls/datepickerctrltest.cpp
+++ b/tests/controls/datepickerctrltest.cpp
@@ -30,8 +30,8 @@ class DatePickerCtrlTestCase : public CppUnit::TestCase
 public:
     DatePickerCtrlTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( DatePickerCtrlTestCase );
diff --git a/tests/controls/frametest.cpp b/tests/controls/frametest.cpp
index fff1dfbff1..5d68b42a45 100644
--- a/tests/controls/frametest.cpp
+++ b/tests/controls/frametest.cpp
@@ -24,8 +24,8 @@ class FrameTestCase : public CppUnit::TestCase
 public:
     FrameTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( FrameTestCase );
diff --git a/tests/controls/gaugetest.cpp b/tests/controls/gaugetest.cpp
index a07872f826..3d2163d81a 100644
--- a/tests/controls/gaugetest.cpp
+++ b/tests/controls/gaugetest.cpp
@@ -24,8 +24,8 @@ class GaugeTestCase : public CppUnit::TestCase
 public:
     GaugeTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( GaugeTestCase );
diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index 7f79e8f48d..abc11a8803 100644
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -42,8 +42,8 @@ class GridTestCase : public CppUnit::TestCase
 public:
     GridTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( GridTestCase );
diff --git a/tests/controls/headerctrltest.cpp b/tests/controls/headerctrltest.cpp
index eb41b3210c..e235cd622a 100644
--- a/tests/controls/headerctrltest.cpp
+++ b/tests/controls/headerctrltest.cpp
@@ -31,8 +31,8 @@ class HeaderCtrlTestCase : public CppUnit::TestCase
 public:
     HeaderCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( HeaderCtrlTestCase );
diff --git a/tests/controls/htmllboxtest.cpp b/tests/controls/htmllboxtest.cpp
index 764d2b861f..92707dd0a8 100644
--- a/tests/controls/htmllboxtest.cpp
+++ b/tests/controls/htmllboxtest.cpp
@@ -25,12 +25,12 @@ class HtmlListBoxTestCase : public ItemContainerTestCase,
 public:
     HtmlListBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_htmllbox; }
-    virtual wxWindow *GetContainerWindow() const { return m_htmllbox; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_htmllbox; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_htmllbox; }
 
     CPPUNIT_TEST_SUITE( HtmlListBoxTestCase );
         wxITEM_CONTAINER_TESTS();
diff --git a/tests/controls/hyperlinkctrltest.cpp b/tests/controls/hyperlinkctrltest.cpp
index 420490b4d6..88ff9ac5f6 100644
--- a/tests/controls/hyperlinkctrltest.cpp
+++ b/tests/controls/hyperlinkctrltest.cpp
@@ -28,8 +28,8 @@ class HyperlinkCtrlTestCase : public CppUnit::TestCase
 public:
     HyperlinkCtrlTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( HyperlinkCtrlTestCase );
diff --git a/tests/controls/label.cpp b/tests/controls/label.cpp
index 2a272f7a65..3ba89c2f7e 100644
--- a/tests/controls/label.cpp
+++ b/tests/controls/label.cpp
@@ -33,8 +33,8 @@ class LabelTestCase : public CppUnit::TestCase
 public:
     LabelTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( LabelTestCase );
diff --git a/tests/controls/listbasetest.cpp b/tests/controls/listbasetest.cpp
index 0548b93a45..ca49e77914 100644
--- a/tests/controls/listbasetest.cpp
+++ b/tests/controls/listbasetest.cpp
@@ -179,7 +179,7 @@ void ListBaseTestCase::ChangeMode()
 
 void ListBaseTestCase::ItemClick()
 {
-#if wxUSE_UIACTIONSIMULATOR 
+#if wxUSE_UIACTIONSIMULATOR
 
 #ifdef __WXMSW__
     // FIXME: This test fails on MSW buildbot slaves although works fine on
@@ -226,7 +226,7 @@ void ListBaseTestCase::ItemClick()
 
     // when the first item was selected the focus changes to it, but not
     // on subsequent clicks
-    
+
     // FIXME: This test fail under wxGTK & wxOSX because we get 3 FOCUSED events and
     //        2 SELECTED ones instead of the one of each we expect for some
     //        reason, this needs to be debugged as it may indicate a bug in the
diff --git a/tests/controls/listbooktest.cpp b/tests/controls/listbooktest.cpp
index 9790adc632..d87bd73e33 100644
--- a/tests/controls/listbooktest.cpp
+++ b/tests/controls/listbooktest.cpp
@@ -28,16 +28,16 @@ class ListbookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     ListbookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_listbook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_listbook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
     { return wxEVT_LISTBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
     { return wxEVT_LISTBOOK_PAGE_CHANGING; }
 
     CPPUNIT_TEST_SUITE( ListbookTestCase );
diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp
index ec2897ad94..f7e37a375d 100644
--- a/tests/controls/listboxtest.cpp
+++ b/tests/controls/listboxtest.cpp
@@ -28,12 +28,12 @@ class ListBoxTestCase : public ItemContainerTestCase, public CppUnit::TestCase
 public:
     ListBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_list; }
-    virtual wxWindow *GetContainerWindow() const { return m_list; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_list; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_list; }
 
     CPPUNIT_TEST_SUITE( ListBoxTestCase );
         wxITEM_CONTAINER_TESTS();
diff --git a/tests/controls/listctrltest.cpp b/tests/controls/listctrltest.cpp
index b606b73f44..0c31dcb189 100644
--- a/tests/controls/listctrltest.cpp
+++ b/tests/controls/listctrltest.cpp
@@ -37,10 +37,10 @@ class ListCtrlTestCase : public ListBaseTestCase, public CppUnit::TestCase
 public:
     ListCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
-    virtual wxListCtrl *GetList() const { return m_list; }
+    virtual wxListCtrl *GetList() const wxOVERRIDE { return m_list; }
 
 private:
     CPPUNIT_TEST_SUITE( ListCtrlTestCase );
diff --git a/tests/controls/listviewtest.cpp b/tests/controls/listviewtest.cpp
index ceec1ed0ae..b4246d9f26 100644
--- a/tests/controls/listviewtest.cpp
+++ b/tests/controls/listviewtest.cpp
@@ -24,10 +24,10 @@ class ListViewTestCase : public ListBaseTestCase, public CppUnit::TestCase
 public:
     ListViewTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
-    virtual wxListCtrl *GetList() const { return m_list; }
+    virtual wxListCtrl *GetList() const wxOVERRIDE { return m_list; }
 
 private:
     CPPUNIT_TEST_SUITE( ListViewTestCase );
diff --git a/tests/controls/notebooktest.cpp b/tests/controls/notebooktest.cpp
index 5471dda4ce..c209eb4c3f 100644
--- a/tests/controls/notebooktest.cpp
+++ b/tests/controls/notebooktest.cpp
@@ -27,16 +27,16 @@ class NotebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     NotebookTestCase() { m_notebook = NULL; m_numPageChanges = 0; }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_notebook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_notebook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
     { return wxEVT_NOTEBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
     { return wxEVT_NOTEBOOK_PAGE_CHANGING; }
 
 
diff --git a/tests/controls/ownerdrawncomboboxtest.cpp b/tests/controls/ownerdrawncomboboxtest.cpp
index 4d187e8446..abeb7a90a1 100644
--- a/tests/controls/ownerdrawncomboboxtest.cpp
+++ b/tests/controls/ownerdrawncomboboxtest.cpp
@@ -39,17 +39,17 @@ class OwnerDrawnComboBoxTestCase : public TextEntryTestCase,
 public:
     OwnerDrawnComboBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxTextEntry *GetTestEntry() const { return m_combo; }
-    virtual wxWindow *GetTestWindow() const { return m_combo; }
+    virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual wxItemContainer *GetContainer() const { return m_combo; }
-    virtual wxWindow *GetContainerWindow() const { return m_combo; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual void CheckStringSelection(const char * WXUNUSED(sel))
+    virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE
     {
         // do nothing here, as explained in TextEntryTestCase comment, our
         // GetStringSelection() is the wxChoice, not wxTextEntry, one and there
diff --git a/tests/controls/pickertest.cpp b/tests/controls/pickertest.cpp
index 86e687e90f..51637a3269 100644
--- a/tests/controls/pickertest.cpp
+++ b/tests/controls/pickertest.cpp
@@ -30,11 +30,11 @@ class ColourPickerCtrlTestCase : public PickerBaseTestCase,
 public:
     ColourPickerCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxPickerBase *GetBase() const { return m_colour; }
+    virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_colour; }
 
     CPPUNIT_TEST_SUITE( ColourPickerCtrlTestCase );
         wxPICKER_BASE_TESTS();
@@ -74,11 +74,11 @@ class DirPickerCtrlTestCase : public PickerBaseTestCase,
 public:
     DirPickerCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxPickerBase *GetBase() const { return m_dir; }
+    virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_dir; }
 
     CPPUNIT_TEST_SUITE( DirPickerCtrlTestCase );
         wxPICKER_BASE_TESTS();
@@ -119,11 +119,11 @@ class FilePickerCtrlTestCase : public PickerBaseTestCase,
 public:
     FilePickerCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxPickerBase *GetBase() const { return m_file; }
+    virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_file; }
 
     CPPUNIT_TEST_SUITE( FilePickerCtrlTestCase );
         wxPICKER_BASE_TESTS();
@@ -165,11 +165,11 @@ class FontPickerCtrlTestCase : public PickerBaseTestCase,
 public:
     FontPickerCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxPickerBase *GetBase() const { return m_font; }
+    virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_font; }
 
     CPPUNIT_TEST_SUITE( FontPickerCtrlTestCase );
         wxPICKER_BASE_TESTS();
diff --git a/tests/controls/radioboxtest.cpp b/tests/controls/radioboxtest.cpp
index f64546c34f..8f6ae8a61e 100644
--- a/tests/controls/radioboxtest.cpp
+++ b/tests/controls/radioboxtest.cpp
@@ -26,8 +26,8 @@ class RadioBoxTestCase : public CppUnit::TestCase
 public:
     RadioBoxTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( RadioBoxTestCase );
diff --git a/tests/controls/radiobuttontest.cpp b/tests/controls/radiobuttontest.cpp
index 102d1a3532..0d687a7918 100644
--- a/tests/controls/radiobuttontest.cpp
+++ b/tests/controls/radiobuttontest.cpp
@@ -27,8 +27,8 @@ class RadioButtonTestCase : public CppUnit::TestCase
 public:
     RadioButtonTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( RadioButtonTestCase );
diff --git a/tests/controls/rearrangelisttest.cpp b/tests/controls/rearrangelisttest.cpp
index 3049b87c06..ec83a40f66 100644
--- a/tests/controls/rearrangelisttest.cpp
+++ b/tests/controls/rearrangelisttest.cpp
@@ -25,12 +25,12 @@ class RearrangeListTestCase : public ItemContainerTestCase, public CppUnit::Test
 public:
     RearrangeListTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_rearrange; }
-    virtual wxWindow *GetContainerWindow() const { return m_rearrange; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_rearrange; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_rearrange; }
 
     CPPUNIT_TEST_SUITE( RearrangeListTestCase );
         wxITEM_CONTAINER_TESTS();
diff --git a/tests/controls/richtextctrltest.cpp b/tests/controls/richtextctrltest.cpp
index 2b5036fba5..bad0f17228 100644
--- a/tests/controls/richtextctrltest.cpp
+++ b/tests/controls/richtextctrltest.cpp
@@ -29,8 +29,8 @@ class RichTextCtrlTestCase : public CppUnit::TestCase
 public:
     RichTextCtrlTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( RichTextCtrlTestCase );
diff --git a/tests/controls/simplebooktest.cpp b/tests/controls/simplebooktest.cpp
index b1452b9305..d5dffcc584 100644
--- a/tests/controls/simplebooktest.cpp
+++ b/tests/controls/simplebooktest.cpp
@@ -27,16 +27,16 @@ class SimplebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     SimplebookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_simplebook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_simplebook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
         { return wxEVT_BOOKCTRL_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
         { return wxEVT_BOOKCTRL_PAGE_CHANGING; }
 
     CPPUNIT_TEST_SUITE( SimplebookTestCase );
diff --git a/tests/controls/slidertest.cpp b/tests/controls/slidertest.cpp
index d02b3ee0be..e09b20f3b0 100644
--- a/tests/controls/slidertest.cpp
+++ b/tests/controls/slidertest.cpp
@@ -27,8 +27,8 @@ class SliderTestCase : public CppUnit::TestCase
 public:
     SliderTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( SliderTestCase );
diff --git a/tests/controls/spinctrldbltest.cpp b/tests/controls/spinctrldbltest.cpp
index 76cfe783d2..989891c9bd 100644
--- a/tests/controls/spinctrldbltest.cpp
+++ b/tests/controls/spinctrldbltest.cpp
@@ -25,8 +25,8 @@ class SpinCtrlDoubleTestCase : public CppUnit::TestCase
 public:
     SpinCtrlDoubleTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( SpinCtrlDoubleTestCase );
diff --git a/tests/controls/spinctrltest.cpp b/tests/controls/spinctrltest.cpp
index 0692b55e63..da4df9363f 100644
--- a/tests/controls/spinctrltest.cpp
+++ b/tests/controls/spinctrltest.cpp
@@ -27,8 +27,8 @@ class SpinCtrlTestCase : public CppUnit::TestCase
 public:
     SpinCtrlTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( SpinCtrlTestCase );
diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp
index eceaee7e47..753890f85c 100644
--- a/tests/controls/textctrltest.cpp
+++ b/tests/controls/textctrltest.cpp
@@ -41,12 +41,12 @@ class TextCtrlTestCase : public TextEntryTestCase, public CppUnit::TestCase
 public:
     TextCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxTextEntry *GetTestEntry() const { return m_text; }
-    virtual wxWindow *GetTestWindow() const { return m_text; }
+    virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_text; }
+    virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_text; }
 
     #define SINGLE_AND_MULTI_TESTS() \
         WXUISIM_TEST( ReadOnly ); \
@@ -223,7 +223,7 @@ void TextCtrlTestCase::ReadOnly()
 
     // SetEditable() is supposed to override wxTE_READONLY
     m_text->SetEditable(true);
-    
+
 #if defined(__WXOSX__) || defined(__WXUNIVERSAL__)
     // a ready only text field might not have been focusable at all
     m_text->SetFocus();
diff --git a/tests/controls/togglebuttontest.cpp b/tests/controls/togglebuttontest.cpp
index a06ede48d0..a8ada1fa25 100644
--- a/tests/controls/togglebuttontest.cpp
+++ b/tests/controls/togglebuttontest.cpp
@@ -27,8 +27,8 @@ class ToggleButtonTestCase : public CppUnit::TestCase
 public:
     ToggleButtonTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( ToggleButtonTestCase );
diff --git a/tests/controls/toolbooktest.cpp b/tests/controls/toolbooktest.cpp
index 90047eb848..92cdc3aa81 100644
--- a/tests/controls/toolbooktest.cpp
+++ b/tests/controls/toolbooktest.cpp
@@ -28,19 +28,19 @@ class ToolbookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     ToolbookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_toolbook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_toolbook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
     { return wxEVT_TOOLBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
     { return wxEVT_TOOLBOOK_PAGE_CHANGING; }
 
-    virtual void Realize() { m_toolbook->GetToolBar()->Realize(); }
+    virtual void Realize() wxOVERRIDE { m_toolbook->GetToolBar()->Realize(); }
 
     CPPUNIT_TEST_SUITE( ToolbookTestCase );
         wxBOOK_CTRL_BASE_TESTS();
diff --git a/tests/controls/treebooktest.cpp b/tests/controls/treebooktest.cpp
index aa855bf6f3..41ff507a42 100644
--- a/tests/controls/treebooktest.cpp
+++ b/tests/controls/treebooktest.cpp
@@ -27,16 +27,16 @@ class TreebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     TreebookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_treebook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_treebook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
         { return wxEVT_TREEBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
         { return wxEVT_TREEBOOK_PAGE_CHANGING; }
 
     CPPUNIT_TEST_SUITE( TreebookTestCase );
diff --git a/tests/controls/treectrltest.cpp b/tests/controls/treectrltest.cpp
index 8a6c822e9a..6f8e8ff514 100644
--- a/tests/controls/treectrltest.cpp
+++ b/tests/controls/treectrltest.cpp
@@ -38,8 +38,8 @@ class TreeCtrlTestCase : public CppUnit::TestCase
 public:
     TreeCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( TreeCtrlTestCase );
diff --git a/tests/controls/treelistctrltest.cpp b/tests/controls/treelistctrltest.cpp
index d4a3ac96d6..3648b7f86c 100644
--- a/tests/controls/treelistctrltest.cpp
+++ b/tests/controls/treelistctrltest.cpp
@@ -31,8 +31,8 @@ class TreeListCtrlTestCase : public CppUnit::TestCase
 public:
     TreeListCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( TreeListCtrlTestCase );
diff --git a/tests/controls/virtlistctrltest.cpp b/tests/controls/virtlistctrltest.cpp
index fec6c1bd40..f04f460a00 100644
--- a/tests/controls/virtlistctrltest.cpp
+++ b/tests/controls/virtlistctrltest.cpp
@@ -33,8 +33,8 @@ class VirtListCtrlTestCase : public CppUnit::TestCase
 public:
     VirtListCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( VirtListCtrlTestCase );
diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index a71db74ef7..93ed8344a6 100644
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -31,8 +31,8 @@ class WebTestCase : public CppUnit::TestCase
 public:
     WebTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( WebTestCase );
diff --git a/tests/controls/windowtest.cpp b/tests/controls/windowtest.cpp
index c7933832eb..bf34e19fde 100644
--- a/tests/controls/windowtest.cpp
+++ b/tests/controls/windowtest.cpp
@@ -31,8 +31,8 @@ class WindowTestCase : public CppUnit::TestCase
 public:
     WindowTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( WindowTestCase );
diff --git a/tests/events/clone.cpp b/tests/events/clone.cpp
index 0d98548806..2f06827fda 100644
--- a/tests/events/clone.cpp
+++ b/tests/events/clone.cpp
@@ -55,14 +55,14 @@ void EventCloneTestCase::CheckAll()
     for (; ci; ci = ci->GetNext())
     {
         wxString cn = wxString(ci->GetClassName());
-    
+
         // is this class derived from wxEvent?
         if ( !ci->IsKindOf(CLASSINFO(wxEvent)) ||
              cn == "wxEvent" )
             continue;
 
         const std::string
-            msg = std::string("Event class \"") + 
+            msg = std::string("Event class \"") +
                   std::string(cn.c_str()) + "\"";
 
         CPPUNIT_ASSERT_MESSAGE( msg, ci->IsDynamic() );
diff --git a/tests/events/keyboard.cpp b/tests/events/keyboard.cpp
index 29f849aab3..05229f9a99 100644
--- a/tests/events/keyboard.cpp
+++ b/tests/events/keyboard.cpp
@@ -197,8 +197,8 @@ class KeyboardEventTestCase : public CppUnit::TestCase
 public:
     KeyboardEventTestCase() {}
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( KeyboardEventTestCase );
diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp
index bf2d40e7d0..8c58d662fd 100644
--- a/tests/events/propagation.cpp
+++ b/tests/events/propagation.cpp
@@ -234,8 +234,8 @@ class EventPropagationTestCase : public CppUnit::TestCase
 public:
     EventPropagationTestCase() {}
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( EventPropagationTestCase );
diff --git a/tests/file/dir.cpp b/tests/file/dir.cpp
index 8b5c4ed89f..d788ee642e 100644
--- a/tests/file/dir.cpp
+++ b/tests/file/dir.cpp
@@ -32,8 +32,8 @@ class DirTestCase : public CppUnit::TestCase
 public:
     DirTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( DirTestCase );
@@ -181,7 +181,7 @@ void DirTestCase::DirExists()
     {
         const char *dirname;
         bool shouldExist;
-    } testData[] = 
+    } testData[] =
     {
         { ".", true },
         { "..", true },
diff --git a/tests/file/filefn.cpp b/tests/file/filefn.cpp
index 49d8767dbd..5d9e6a435e 100644
--- a/tests/file/filefn.cpp
+++ b/tests/file/filefn.cpp
@@ -33,8 +33,8 @@ class FileFunctionsTestCase : public CppUnit::TestCase
 {
 public:
     FileFunctionsTestCase() { }
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( FileFunctionsTestCase );
@@ -453,7 +453,7 @@ void FileFunctionsTestCase::FileEof()
     bool failed = true;
     try
     {
-	file.Eof();
+    file.Eof();
         failed = false;
     }
     catch (...)
diff --git a/tests/filekind/filekind.cpp b/tests/filekind/filekind.cpp
index fa270897b4..0d37dd2cc3 100644
--- a/tests/filekind/filekind.cpp
+++ b/tests/filekind/filekind.cpp
@@ -73,7 +73,7 @@ class FileKindTestCase : public CppUnit::TestCase
 };
 
 // test a wxFFile and wxFFileInput/OutputStreams of a known type
-// 
+//
 void FileKindTestCase::TestFILE(wxFFile& file, bool expected)
 {
     CPPUNIT_ASSERT(file.IsOpened());
@@ -191,7 +191,7 @@ void FileKindTestCase::MemoryStream()
 }
 
 // Stdin will usually be a terminal, if so then test it
-// 
+//
 void FileKindTestCase::Stdin()
 {
     if (isatty(0))
diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index 762061813c..bba94b23cd 100644
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -665,7 +665,7 @@ void FileNameTestCase::TestCreateTempFileName()
         if (testData[n].shouldSucceed)
         {
             errDesc += "; path is " + path.ToStdString();
-        
+
             // test the place where the temp file has been created
             wxString expected = testData[n].expectedFolder;
             expected.Replace("$SYSTEM_TEMP", wxStandardPaths::Get().GetTempDir());
@@ -688,7 +688,7 @@ void FileNameTestCase::TestGetTimes()
     wxDateTime dtAccess, dtMod, dtCreate;
     CPPUNIT_ASSERT( fn.GetTimes(&dtAccess, &dtMod, &dtCreate) );
 
-    // make sure all retrieved dates are equal to the current date&time 
+    // make sure all retrieved dates are equal to the current date&time
     // with an accuracy up to 1 minute
     CPPUNIT_ASSERT(dtCreate.IsEqualUpTo(wxDateTime::Now(), wxTimeSpan(0,1)));
     CPPUNIT_ASSERT(dtMod.IsEqualUpTo(wxDateTime::Now(), wxTimeSpan(0,1)));
diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp
index d19b5e5c09..e074b2df9d 100644
--- a/tests/fswatcher/fswatchertest.cpp
+++ b/tests/fswatcher/fswatchertest.cpp
@@ -438,8 +438,8 @@ class FileSystemWatcherTestCase : public CppUnit::TestCase
 public:
     FileSystemWatcherTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 protected:
     wxEventLoopBase* m_loop;
diff --git a/tests/graphics/affinematrix.cpp b/tests/graphics/affinematrix.cpp
index dce58f76ae..130c95424b 100644
--- a/tests/graphics/affinematrix.cpp
+++ b/tests/graphics/affinematrix.cpp
@@ -121,7 +121,7 @@ public:
     {
     }
 
-    virtual void setUp()
+    virtual void setUp() wxOVERRIDE
     {
         m_bmpOrig = wxBitmap(m_imgOrig);
         m_bmpUsingMatrix.Create(m_bmpOrig.GetSize(), m_bmpOrig.GetDepth());
diff --git a/tests/graphics/bitmap.cpp b/tests/graphics/bitmap.cpp
index ea79bddfff..6588a3a636 100644
--- a/tests/graphics/bitmap.cpp
+++ b/tests/graphics/bitmap.cpp
@@ -37,8 +37,8 @@ class BitmapTestCase : public CppUnit::TestCase
 public:
     BitmapTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( BitmapTestCase );
diff --git a/tests/graphics/boundingbox.cpp b/tests/graphics/boundingbox.cpp
index 1c316e3a80..74c177b58a 100644
--- a/tests/graphics/boundingbox.cpp
+++ b/tests/graphics/boundingbox.cpp
@@ -47,7 +47,7 @@ public:
         m_bmp = wxNullBitmap;
     }
 
-    virtual void setUp()
+    virtual void setUp() wxOVERRIDE
     {
         m_gcdc->ResetBoundingBox();
     }
diff --git a/tests/graphics/clippingbox.cpp b/tests/graphics/clippingbox.cpp
index 42eed74701..87f56119e9 100644
--- a/tests/graphics/clippingbox.cpp
+++ b/tests/graphics/clippingbox.cpp
@@ -127,7 +127,7 @@ public:
     {
     }
 
-    virtual void setUp() { wxASSERT( m_dc ); }
+    virtual void setUp() wxOVERRIDE { wxASSERT( m_dc ); }
     virtual wxDC* GetDC(wxMemoryDC* dc) = 0;
 
 protected:
diff --git a/tests/html/htmlwindow.cpp b/tests/html/htmlwindow.cpp
index af9cbb2e33..2bf6ba593d 100644
--- a/tests/html/htmlwindow.cpp
+++ b/tests/html/htmlwindow.cpp
@@ -35,8 +35,8 @@ class HtmlWindowTestCase : public CppUnit::TestCase
 public:
     HtmlWindowTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( HtmlWindowTestCase );
diff --git a/tests/interactive/input.cpp b/tests/interactive/input.cpp
index da72fd6755..fa3f751201 100644
--- a/tests/interactive/input.cpp
+++ b/tests/interactive/input.cpp
@@ -95,7 +95,7 @@ void InteractiveInputTestCase::TestDiskInfo()
 
         // kill the last '\n'
         pathname[wxStrlen(pathname) - 1] = 0;
-        
+
         if (pathname[0] == '\0' || wxStrcmp(pathname, "quit") == 0)
             break;
 
@@ -111,7 +111,7 @@ void InteractiveInputTestCase::TestDiskInfo()
                     (free / 1024).ToString().c_str(),
                     pathname);
         }
-        
+
         wxPuts("\n");
     }
 
@@ -128,7 +128,7 @@ void InteractiveInputTestCase::TestDiskInfo()
 
 void InteractiveInputTestCase::TestRegExInteractive()
 {
-#ifdef TEST_REGEX 
+#ifdef TEST_REGEX
     wxPuts(wxT("*** Testing RE interactively ***"));
 
     for ( ;; )
@@ -143,7 +143,7 @@ void InteractiveInputTestCase::TestRegExInteractive()
 
         if (pattern[0] == '\0' || wxStrcmp(pattern, "quit") == 0)
             break;
-            
+
         wxRegEx re;
         if ( !re.Compile(pattern) )
         {
@@ -181,7 +181,7 @@ void InteractiveInputTestCase::TestRegExInteractive()
                 }
             }
         }
-        
+
         wxPuts("\n");
     }
 #endif // TEST_REGEX
@@ -237,7 +237,7 @@ void InteractiveInputTestCase::TestFtpInteractive()
         wxPrintf(wxT("--- Connected to %s, current directory is '%s'\n"),
                  hostname, ftp.Pwd().c_str());
     }
-    
+
     wxChar buf[128];
     for ( ;; )
     {
@@ -250,7 +250,7 @@ void InteractiveInputTestCase::TestFtpInteractive()
 
         if (buf[0] == '\0' || wxStrcmp(buf, "quit") == 0)
             break;
-            
+
         // special handling of LIST and NLST as they require data connection
         wxString start(buf, 4);
         start.MakeUpper();
@@ -316,7 +316,7 @@ void InteractiveInputTestCase::TestDateTimeInteractive()
 
         // kill the last '\n'
         buf[wxStrlen(buf) - 1] = 0;
-        
+
         if ( buf[0] == '\0' || wxStrcmp(buf, "quit") == 0 )
             break;
 
@@ -340,7 +340,7 @@ void InteractiveInputTestCase::TestDateTimeInteractive()
                  dt.GetWeekOfMonth(wxDateTime::Sunday_First),
                  dt.GetWeekOfYear(wxDateTime::Monday_First));
     }
-    
+
     wxPuts("\n");
 #endif // TEST_DATETIME
 }
@@ -375,7 +375,7 @@ void InteractiveInputTestCase::TestSingleIstance()
     {
         wxPrintf(wxT("Failed to init wxSingleInstanceChecker.\n"));
     }
-    
+
     wxPuts("\n");
 #endif // defined(TEST_SNGLINST)
 }
diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp
index 4e39762a0f..dc9975248b 100644
--- a/tests/intl/intltest.cpp
+++ b/tests/intl/intltest.cpp
@@ -33,8 +33,8 @@ class IntlTestCase : public CppUnit::TestCase
 public:
     IntlTestCase() { m_locale=NULL; }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( IntlTestCase );
diff --git a/tests/log/logtest.cpp b/tests/log/logtest.cpp
index 60b7f7cc5a..353f136c62 100644
--- a/tests/log/logtest.cpp
+++ b/tests/log/logtest.cpp
@@ -159,8 +159,8 @@ class LogTestCase : public CppUnit::TestCase
 public:
     LogTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( LogTestCase );
diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp
index a38235c47a..dbda30cb74 100644
--- a/tests/menu/menu.cpp
+++ b/tests/menu/menu.cpp
@@ -77,8 +77,8 @@ class MenuTestCase : public CppUnit::TestCase
 public:
     MenuTestCase() {}
 
-    virtual void setUp() { CreateFrame(); }
-    virtual void tearDown() { m_frame->Destroy(); }
+    virtual void setUp() wxOVERRIDE { CreateFrame(); }
+    virtual void tearDown() wxOVERRIDE { m_frame->Destroy(); }
 
 private:
     CPPUNIT_TEST_SUITE( MenuTestCase );
diff --git a/tests/misc/dynamiclib.cpp b/tests/misc/dynamiclib.cpp
index b93e2889ae..fa85291701 100644
--- a/tests/misc/dynamiclib.cpp
+++ b/tests/misc/dynamiclib.cpp
@@ -77,7 +77,7 @@ void DynamicLibraryTestCase::Load()
 
     typedef int (wxSTDCALL *wxStrlenType)(const char *);
     wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME);
-    
+
     wxString errMsg = wxString::Format("ERROR: function '%s' wasn't found in '%s'.\n",
                                        FUNC_NAME, LIB_NAME);
     CPPUNIT_ASSERT_MESSAGE( errMsg.ToStdString(), pfnStrlen );
diff --git a/tests/misc/environ.cpp b/tests/misc/environ.cpp
index 10dac64f07..8ddec15791 100644
--- a/tests/misc/environ.cpp
+++ b/tests/misc/environ.cpp
@@ -68,7 +68,7 @@ void EnvTestCase::GetSet()
 void EnvTestCase::Path()
 {
     wxString contents;
-    
+
     CPPUNIT_ASSERT(wxGetEnv(wxT("PATH"), &contents));
     CPPUNIT_ASSERT(!contents.empty());
 }
diff --git a/tests/misc/pathlist.cpp b/tests/misc/pathlist.cpp
index c869b63955..8227f74f45 100644
--- a/tests/misc/pathlist.cpp
+++ b/tests/misc/pathlist.cpp
@@ -28,7 +28,7 @@ TEST_CASE("wxPathList::FindValidPath", "[file][path]")
 
     wxPathList pathlist;
     pathlist.AddEnvList(wxT("PATH"));
-    
+
     wxString path = pathlist.FindValidPath(CMD_IN_PATH);
     INFO( CMD_IN_PATH " not found in " << wxGetenv("PATH") );
     CHECK( !path.empty() );
diff --git a/tests/misc/selstoretest.cpp b/tests/misc/selstoretest.cpp
index e05ebf0cd9..7883e46f5b 100644
--- a/tests/misc/selstoretest.cpp
+++ b/tests/misc/selstoretest.cpp
@@ -27,13 +27,13 @@ class SelStoreTestCase : public CppUnit::TestCase
 public:
     SelStoreTestCase() { m_store = NULL; }
 
-    virtual void setUp()
+    virtual void setUp() wxOVERRIDE
     {
         m_store = new wxSelectionStore;
         m_store->SetItemCount(NUM_ITEMS);
     }
 
-    virtual void tearDown()
+    virtual void tearDown() wxOVERRIDE
     {
         delete m_store;
         m_store = NULL;
diff --git a/tests/misc/settings.cpp b/tests/misc/settings.cpp
index bde01ed2bb..2bba569832 100644
--- a/tests/misc/settings.cpp
+++ b/tests/misc/settings.cpp
@@ -42,7 +42,7 @@ private:
 
     void GetColour();
     void GetFont();
-    
+
     // not really wxSystemSettings stuff but still nice to test:
     void GlobalColours();
     void GlobalFonts();
@@ -67,7 +67,7 @@ void SettingsTestCase::GetColour()
 
 void SettingsTestCase::GetFont()
 {
-    const wxSystemFont ids[] = 
+    const wxSystemFont ids[] =
     {
         wxSYS_OEM_FIXED_FONT,
         wxSYS_ANSI_FIXED_FONT,
diff --git a/tests/sizers/boxsizer.cpp b/tests/sizers/boxsizer.cpp
index a0da683f4c..77c33cc9fb 100644
--- a/tests/sizers/boxsizer.cpp
+++ b/tests/sizers/boxsizer.cpp
@@ -33,8 +33,8 @@ class BoxSizerTestCase : public CppUnit::TestCase
 public:
     BoxSizerTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( BoxSizerTestCase );
diff --git a/tests/sizers/gridsizer.cpp b/tests/sizers/gridsizer.cpp
index 0253ed8e1d..1b5c0689d6 100644
--- a/tests/sizers/gridsizer.cpp
+++ b/tests/sizers/gridsizer.cpp
@@ -33,8 +33,8 @@ class GridSizerTestCase : public CppUnit::TestCase
 public:
     GridSizerTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( GridSizerTestCase );
diff --git a/tests/sizers/wrapsizer.cpp b/tests/sizers/wrapsizer.cpp
index 2d43863df5..d574b24962 100644
--- a/tests/sizers/wrapsizer.cpp
+++ b/tests/sizers/wrapsizer.cpp
@@ -33,8 +33,8 @@ class WrapSizerTestCase : public CppUnit::TestCase
 public:
     WrapSizerTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( WrapSizerTestCase );
diff --git a/tests/streams/ffilestream.cpp b/tests/streams/ffilestream.cpp
index 1586701a0e..c60e0ab8a3 100644
--- a/tests/streams/ffilestream.cpp
+++ b/tests/streams/ffilestream.cpp
@@ -65,9 +65,9 @@ protected:
 
 private:
     // Implement base class functions.
-    virtual wxFFileInputStream  *DoCreateInStream();
-    virtual wxFFileOutputStream *DoCreateOutStream();
-    virtual void DoDeleteOutStream();
+    virtual wxFFileInputStream  *DoCreateInStream() wxOVERRIDE;
+    virtual wxFFileOutputStream *DoCreateOutStream() wxOVERRIDE;
+    virtual void DoDeleteOutStream() wxOVERRIDE;
 
 private:
     wxString GetInFileName() const;
diff --git a/tests/streams/filestream.cpp b/tests/streams/filestream.cpp
index cfa638f97f..1e8487eb5f 100644
--- a/tests/streams/filestream.cpp
+++ b/tests/streams/filestream.cpp
@@ -65,9 +65,9 @@ protected:
 
 private:
     // Implement base class functions.
-    virtual wxFileInputStream  *DoCreateInStream();
-    virtual wxFileOutputStream *DoCreateOutStream();
-    virtual void DoDeleteOutStream();
+    virtual wxFileInputStream  *DoCreateInStream() wxOVERRIDE;
+    virtual wxFileOutputStream *DoCreateOutStream() wxOVERRIDE;
+    virtual void DoDeleteOutStream() wxOVERRIDE;
 
 private:
     wxString GetInFileName() const;
diff --git a/tests/streams/iostreams.cpp b/tests/streams/iostreams.cpp
index f51bd474f3..8237c795c6 100644
--- a/tests/streams/iostreams.cpp
+++ b/tests/streams/iostreams.cpp
@@ -29,7 +29,7 @@ class IOStreamsTestCase : public CppUnit::TestCase
 public:
     IOStreamsTestCase() { }
 
-    virtual void tearDown()
+    virtual void tearDown() wxOVERRIDE
     {
         if ( !m_fnTemp.empty() )
         {
diff --git a/tests/streams/memstream.cpp b/tests/streams/memstream.cpp
index 54fb318e85..88776d45f6 100644
--- a/tests/streams/memstream.cpp
+++ b/tests/streams/memstream.cpp
@@ -70,8 +70,8 @@ private:
 
 private:
     // Implement base class functions.
-    virtual wxMemoryInputStream  *DoCreateInStream();
-    virtual wxMemoryOutputStream *DoCreateOutStream();
+    virtual wxMemoryInputStream  *DoCreateInStream() wxOVERRIDE;
+    virtual wxMemoryOutputStream *DoCreateOutStream() wxOVERRIDE;
 
 private:
     char    m_DataBuffer[DATABUFFER_SIZE];
diff --git a/tests/streams/socketstream.cpp b/tests/streams/socketstream.cpp
index 2837f6add1..3a48be19a4 100644
--- a/tests/streams/socketstream.cpp
+++ b/tests/streams/socketstream.cpp
@@ -103,8 +103,8 @@ public:
     socketStream();
     virtual ~socketStream();
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
     // repeat all socket tests several times with different socket flags, so we
     // define this macro which is used several times in the test suite
@@ -137,8 +137,8 @@ public:
 
 private:
     // Implement base class functions.
-    virtual wxSocketInputStream  *DoCreateInStream();
-    virtual wxSocketOutputStream *DoCreateOutStream();
+    virtual wxSocketInputStream  *DoCreateInStream() wxOVERRIDE;
+    virtual wxSocketOutputStream *DoCreateOutStream() wxOVERRIDE;
 
     // socket thread functions
     static void WriteSocket(wxSocketBase& socket)
diff --git a/tests/streams/sstream.cpp b/tests/streams/sstream.cpp
index 6b2903b2ff..f1a2d26203 100644
--- a/tests/streams/sstream.cpp
+++ b/tests/streams/sstream.cpp
@@ -63,8 +63,8 @@ protected:
 
 private:
     // Implement base class functions.
-    virtual wxStringInputStream  *DoCreateInStream();
-    virtual wxStringOutputStream *DoCreateOutStream();
+    virtual wxStringInputStream  *DoCreateInStream() wxOVERRIDE;
+    virtual wxStringOutputStream *DoCreateOutStream() wxOVERRIDE;
 
     // output the given string to wxStringOutputStream and check that its
     // contents is exactly the same string
diff --git a/tests/streams/zlibstream.cpp b/tests/streams/zlibstream.cpp
index 294b623a81..d9a7890d42 100644
--- a/tests/streams/zlibstream.cpp
+++ b/tests/streams/zlibstream.cpp
@@ -119,10 +119,10 @@ private:
 
 private:
     // Implement base class functions.
-    virtual wxZlibInputStream  *DoCreateInStream();
-    virtual wxZlibOutputStream *DoCreateOutStream();
-    virtual void DoDeleteInStream();
-    virtual void DoDeleteOutStream();
+    virtual wxZlibInputStream  *DoCreateInStream() wxOVERRIDE;
+    virtual wxZlibOutputStream *DoCreateOutStream() wxOVERRIDE;
+    virtual void DoDeleteInStream() wxOVERRIDE;
+    virtual void DoDeleteOutStream() wxOVERRIDE;
 
     // Helper that can be used to create new wx compatibility tests...
     // Otherwise not used by the tests.
diff --git a/tests/strings/numformatter.cpp b/tests/strings/numformatter.cpp
index e88d0f38d0..9a583f8a7c 100644
--- a/tests/strings/numformatter.cpp
+++ b/tests/strings/numformatter.cpp
@@ -28,7 +28,7 @@ class NumFormatterTestCase : public CppUnit::TestCase
 public:
     NumFormatterTestCase() { m_locale = NULL; }
 
-    virtual void setUp()
+    virtual void setUp() wxOVERRIDE
     {
         // We need to use a locale with known decimal point and which uses the
         // thousands separator for the tests to make sense.
@@ -38,7 +38,7 @@ public:
             tearDown();
     }
 
-    virtual void tearDown()
+    virtual void tearDown() wxOVERRIDE
     {
         delete m_locale;
         m_locale = NULL;
diff --git a/tests/strings/unichar.cpp b/tests/strings/unichar.cpp
index f9603cb61e..e465688bb3 100644
--- a/tests/strings/unichar.cpp
+++ b/tests/strings/unichar.cpp
@@ -1156,4 +1156,4 @@ void UniCharTestCase::RefWideCharCompare()
     wxUNICHARREF_TEST_INT_COMPARE
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp
index 3b082c53aa..9fe7232fd7 100644
--- a/tests/strings/vsnprintf.cpp
+++ b/tests/strings/vsnprintf.cpp
@@ -166,7 +166,7 @@ private:
 #endif
     void Unicode();
 
-    template<typename T> 
+    template<typename T>
         void DoBigToSmallBuffer(T *buffer, int size);
     void BigToSmallBuffer();
 
@@ -251,12 +251,12 @@ void VsnprintfTestCase::P()
         CMP3i("0000ABCDEFABCDEF", "%p", (void*)0xABCDEFABCDEF);
         CMP3("0000000000000000", "%p", (void*)NULL);
     #endif
-#elif defined(__MINGW32__) 
+#elif defined(__MINGW32__)
     // mingw32 uses MSVC CRT in old versions but is own implementation now
     // which is somewhere in the middle as it uses %8x, so to catch both cases
     // we use case-insensitive comparison here.
-    CMP3("0xabcdef", "%p", (void*)0xABCDEF); 
-    CMP3("0", "%p", (void*)NULL); 
+    CMP3("0xabcdef", "%p", (void*)0xABCDEF);
+    CMP3("0", "%p", (void*)NULL);
 #elif defined(__GNUG__)
     // glibc prints pointers as %#x except for NULL pointers which are printed
     // as '(nil)'.
diff --git a/tests/test.cpp b/tests/test.cpp
index 7dbb44fb53..339d091396 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -359,9 +359,9 @@ extern bool IsNetworkAvailable()
 
     // NOTE: we could use wxDialUpManager here if it was in wxNet; since it's in
     //       wxCore we use a simple rough test:
-    
+
     wxSocketBase::Initialize();
-    
+
     wxIPV4address addr;
     if (!addr.Hostname("www.google.com") || !addr.Service("www"))
     {
@@ -372,9 +372,9 @@ extern bool IsNetworkAvailable()
     wxSocketClient sock;
     sock.SetTimeout(10);    // 10 secs
     bool online = sock.Connect(addr);
-    
+
     wxSocketBase::Shutdown();
-    
+
     return online;
 }
 
diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp
index 910cbe3cc7..eda450d1f3 100644
--- a/tests/textfile/textfiletest.cpp
+++ b/tests/textfile/textfiletest.cpp
@@ -40,7 +40,7 @@ public:
         srand((unsigned)time(NULL));
     }
 
-    virtual void tearDown() { unlink(GetTestFileName()); }
+    virtual void tearDown() wxOVERRIDE { unlink(GetTestFileName()); }
 
 private:
     CPPUNIT_TEST_SUITE( TextFileTestCase );
diff --git a/tests/thread/misc.cpp b/tests/thread/misc.cpp
index b26d83da79..3eb5fcdbbb 100644
--- a/tests/thread/misc.cpp
+++ b/tests/thread/misc.cpp
@@ -246,7 +246,7 @@ void MiscThreadTestCase::TestJoinable()
     CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread.Run() );
     CPPUNIT_ASSERT_EQUAL( 362880, (unsigned long)thread.Wait() );
 }
- 
+
 void MiscThreadTestCase::TestDetached()
 {
     static const size_t nThreads = 3;
@@ -330,31 +330,31 @@ void MiscThreadTestCase::TestThreadDelete()
     // terminated will lead to a crash!
 
     MyDetachedThread *thread0 = new MyDetachedThread(30, 'W');
-    CPPUNIT_ASSERT_EQUAL( wxTHREAD_MISC_ERROR, thread0->Delete() );    
+    CPPUNIT_ASSERT_EQUAL( wxTHREAD_MISC_ERROR, thread0->Delete() );
         // delete a thread which didn't start to run yet.
 
     MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y');
     CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread1->Run() );
     wxMilliSleep(300);
-    CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread1->Delete() );      
+    CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread1->Delete() );
         // delete a running thread
 
     MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z');
     CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread2->Run() );
     wxMilliSleep(300);
     CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread2->Pause() );
-    CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread2->Delete() );      
+    CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread2->Delete() );
         // delete a sleeping thread
 
     MyJoinableThread thread3(20);
     CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread3.Run() );
-    CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread3.Delete() );       
+    CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread3.Delete() );
         // delete a joinable running thread
 
     MyJoinableThread thread4(2);
     CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread4.Run() );
     wxMilliSleep(300);
-    CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread4.Delete() );       
+    CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread4.Delete() );
         // delete a joinable thread which already terminated
 }
 
diff --git a/tests/uris/url.cpp b/tests/uris/url.cpp
index fc4ef5a77f..dec56558bb 100644
--- a/tests/uris/url.cpp
+++ b/tests/uris/url.cpp
@@ -30,7 +30,7 @@
 class URLTestCase : public CppUnit::TestCase
 {
 public:
-    URLTestCase(); 
+    URLTestCase();
     ~URLTestCase();
 
 private:
diff --git a/tests/validators/valnum.cpp b/tests/validators/valnum.cpp
index 0a2421588b..400011a232 100644
--- a/tests/validators/valnum.cpp
+++ b/tests/validators/valnum.cpp
@@ -30,8 +30,8 @@ class NumValidatorTestCase : public CppUnit::TestCase
 public:
     NumValidatorTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( NumValidatorTestCase );
diff --git a/tests/window/clientsize.cpp b/tests/window/clientsize.cpp
index 421a442f43..27e13b4459 100644
--- a/tests/window/clientsize.cpp
+++ b/tests/window/clientsize.cpp
@@ -30,8 +30,8 @@ class ClientSizeTestCase : public CppUnit::TestCase
 public:
     ClientSizeTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( ClientSizeTestCase );
diff --git a/tests/window/setsize.cpp b/tests/window/setsize.cpp
index 56caaded36..fe10aea399 100644
--- a/tests/window/setsize.cpp
+++ b/tests/window/setsize.cpp
@@ -32,8 +32,8 @@ class SetSizeTestCase : public CppUnit::TestCase
 public:
     SetSizeTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( SetSizeTestCase );
diff --git a/tests/xml/xrctest.cpp b/tests/xml/xrctest.cpp
index a8e72084eb..1744640cf6 100644
--- a/tests/xml/xrctest.cpp
+++ b/tests/xml/xrctest.cpp
@@ -139,8 +139,8 @@ class XrcTestCase : public CppUnit::TestCase
 public:
     XrcTestCase() {}
 
-    virtual void setUp() { CreateXrc(); }
-    virtual void tearDown() { wxRemoveFile(TEST_XRC_FILE); }
+    virtual void setUp() wxOVERRIDE { CreateXrc(); }
+    virtual void tearDown() wxOVERRIDE { wxRemoveFile(TEST_XRC_FILE); }
 
 private:
     CPPUNIT_TEST_SUITE( XrcTestCase );

From a5b1a418bbe608ca5ffd0d49fb86fe81c43d364f Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 11:14:23 +0200
Subject: [PATCH 808/916] Use wxPrintf in interactive tests

Remove unneeded calls to c_str() and mb_str().
---
 tests/interactive/input.cpp  | 20 ++++----
 tests/interactive/output.cpp | 94 +++++++++++++++++-------------------
 2 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/tests/interactive/input.cpp b/tests/interactive/input.cpp
index fa3f751201..49f0f70e61 100644
--- a/tests/interactive/input.cpp
+++ b/tests/interactive/input.cpp
@@ -107,8 +107,8 @@ void InteractiveInputTestCase::TestDiskInfo()
         else
         {
             wxPrintf(wxT("%sKb total, %sKb free on '%s'.\n"),
-                    (total / 1024).ToString().c_str(),
-                    (free / 1024).ToString().c_str(),
+                    (total / 1024).ToString(),
+                    (free / 1024).ToString(),
                     pathname);
         }
 
@@ -166,7 +166,7 @@ void InteractiveInputTestCase::TestRegExInteractive()
             }
             else
             {
-                wxPrintf(wxT("Pattern matches at '%s'\n"), re.GetMatch(text).c_str());
+                wxPrintf(wxT("Pattern matches at '%s'\n"), re.GetMatch(text));
 
                 size_t start, len;
                 for ( size_t n = 1; ; n++ )
@@ -177,7 +177,7 @@ void InteractiveInputTestCase::TestRegExInteractive()
                     }
 
                     wxPrintf(wxT("Subexpr %u matched '%s'\n"),
-                             n, wxString(text + start, len).c_str());
+                             n, wxString(text + start, len));
                 }
             }
         }
@@ -235,7 +235,7 @@ void InteractiveInputTestCase::TestFtpInteractive()
     else
     {
         wxPrintf(wxT("--- Connected to %s, current directory is '%s'\n"),
-                 hostname, ftp.Pwd().c_str());
+                 hostname, ftp.Pwd());
     }
 
     wxChar buf[128];
@@ -263,16 +263,16 @@ void InteractiveInputTestCase::TestFtpInteractive()
             wxArrayString files;
             if ( !ftp.GetList(files, wildcard, start == wxT("LIST")) )
             {
-                wxPrintf(wxT("ERROR: failed to get %s of files\n"), start.c_str());
+                wxPrintf(wxT("ERROR: failed to get %s of files\n"), start);
             }
             else
             {
                 wxPrintf(wxT("--- %s of '%s' under '%s':\n"),
-                       start.c_str(), wildcard.c_str(), ftp.Pwd().c_str());
+                         start, wildcard, ftp.Pwd());
                 size_t count = files.GetCount();
                 for ( size_t n = 0; n < count; n++ )
                 {
-                    wxPrintf(wxT("\t%s\n"), files[n].c_str());
+                    wxPrintf(wxT("\t%s\n"), files[n]);
                 }
                 wxPuts(wxT("--- End of the file list"));
             }
@@ -286,7 +286,7 @@ void InteractiveInputTestCase::TestFtpInteractive()
                 wxPrintf(wxT(" (return code %c)"), ch);
             }
 
-            wxPrintf(wxT(", server reply:\n%s\n\n"), ftp.GetLastResult().c_str());
+            wxPrintf(wxT(", server reply:\n%s\n\n"), ftp.GetLastResult());
         }
     }
 
@@ -334,7 +334,7 @@ void InteractiveInputTestCase::TestDateTimeInteractive()
         }
 
         wxPrintf(wxT("%s: day %u, week of month %u/%u, week of year %u\n"),
-                 dt.Format(wxT("%b %d, %Y")).c_str(),
+                 dt.Format(wxT("%b %d, %Y")),
                  dt.GetDayOfYear(),
                  dt.GetWeekOfMonth(wxDateTime::Monday_First),
                  dt.GetWeekOfMonth(wxDateTime::Sunday_First),
diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
index 92bc35891f..d2ead1bbf6 100644
--- a/tests/interactive/output.cpp
+++ b/tests/interactive/output.cpp
@@ -104,17 +104,17 @@ void InteractiveOutputTestCase::TestDllListLoaded()
     for ( size_t n = 0; n < count; ++n )
     {
         const wxDynamicLibraryDetails& details = dlls[n];
-        printf("%-45s", (const char *)details.GetPath().mb_str());
+        wxPrintf("%-45s", details.GetPath());
 
         void *addr wxDUMMY_INITIALIZE(NULL);
         size_t len wxDUMMY_INITIALIZE(0);
         if ( details.GetAddress(&addr, &len) )
         {
-            printf(" %08lx:%08lx",
+            wxPrintf(" %08lx:%08lx",
                    (unsigned long)addr, (unsigned long)((char *)addr + len));
         }
 
-        printf(" %s\n", (const char *)details.GetVersion().mb_str());
+        wxPrintf(" %s\n", details.GetVersion());
     }
 
     wxPuts(wxEmptyString);
@@ -149,7 +149,7 @@ void InteractiveOutputTestCase::TestMimeEnum()
         if ( !filetype )
         {
             wxPrintf(wxT("   nothing known about the filetype '%s'!\n"),
-                   mimetypes[n].c_str());
+                     mimetypes[n]);
             continue;
         }
 
@@ -166,8 +166,7 @@ void InteractiveOutputTestCase::TestMimeEnum()
             extsAll += exts[e];
         }
 
-        wxPrintf(wxT("   %s: %s (%s)\n"),
-               mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
+        wxPrintf(wxT("   %s: %s (%s)\n"), mimetypes[n], desc, extsAll);
     }
 
     wxPuts(wxEmptyString);
@@ -194,7 +193,7 @@ void InteractiveOutputTestCase::TestMimeFilename()
         wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
         if ( !ft )
         {
-            wxPrintf(wxT("WARNING: extension '%s' is unknown.\n"), ext.c_str());
+            wxPrintf(wxT("WARNING: extension '%s' is unknown.\n"), ext);
         }
         else
         {
@@ -209,8 +208,7 @@ void InteractiveOutputTestCase::TestMimeFilename()
             else
                 cmd = wxString(wxT('"')) + cmd + wxT('"');
 
-            wxPrintf(wxT("To open %s (%s) run:\n   %s\n"),
-                     fname.c_str(), desc.c_str(), cmd.c_str());
+            wxPrintf(wxT("To open %s (%s) run:\n   %s\n"), fname, desc, cmd);
 
             delete ft;
         }
@@ -261,12 +259,12 @@ void InteractiveOutputTestCase::TestOsInfo()
     int major, minor;
     wxGetOsVersion(&major, &minor);
     wxPrintf(wxT("Running under: %s, version %d.%d\n"),
-            wxGetOsDescription().c_str(), major, minor);
+             wxGetOsDescription(), major, minor);
 
     wxPrintf(wxT("%ld free bytes of memory left.\n"), wxGetFreeMemory().ToLong());
 
     wxPrintf(wxT("Host name is %s (%s).\n"),
-           wxGetHostName().c_str(), wxGetFullHostName().c_str());
+             wxGetHostName(), wxGetFullHostName());
 
     wxPuts(wxEmptyString);
 #endif // TEST_INFO_FUNCTIONS
@@ -280,12 +278,12 @@ void InteractiveOutputTestCase::TestPlatformInfo()
     // get this platform
     wxPlatformInfo plat;
 
-    wxPrintf(wxT("Operating system family name is: %s\n"), plat.GetOperatingSystemFamilyName().c_str());
-    wxPrintf(wxT("Operating system name is: %s\n"), plat.GetOperatingSystemIdName().c_str());
-    wxPrintf(wxT("Port ID name is: %s\n"), plat.GetPortIdName().c_str());
-    wxPrintf(wxT("Port ID short name is: %s\n"), plat.GetPortIdShortName().c_str());
-    wxPrintf(wxT("Architecture is: %s\n"), plat.GetArchName().c_str());
-    wxPrintf(wxT("Endianness is: %s\n"), plat.GetEndiannessName().c_str());
+    wxPrintf(wxT("Operating system family name is: %s\n"), plat.GetOperatingSystemFamilyName());
+    wxPrintf(wxT("Operating system name is: %s\n"), plat.GetOperatingSystemIdName());
+    wxPrintf(wxT("Port ID name is: %s\n"), plat.GetPortIdName());
+    wxPrintf(wxT("Port ID short name is: %s\n"), plat.GetPortIdShortName());
+    wxPrintf(wxT("Architecture is: %s\n"), plat.GetArchName());
+    wxPrintf(wxT("Endianness is: %s\n"), plat.GetEndiannessName());
 
     wxPuts(wxEmptyString);
 #endif // TEST_INFO_FUNCTIONS
@@ -296,10 +294,10 @@ void InteractiveOutputTestCase::TestUserInfo()
 #ifdef TEST_INFO_FUNCTIONS
     wxPuts(wxT("*** Testing user info functions ***\n"));
 
-    wxPrintf(wxT("User id is:\t%s\n"), wxGetUserId().c_str());
-    wxPrintf(wxT("User name is:\t%s\n"), wxGetUserName().c_str());
-    wxPrintf(wxT("Home dir is:\t%s\n"), wxGetHomeDir().c_str());
-    wxPrintf(wxT("Email address:\t%s\n"), wxGetEmailAddress().c_str());
+    wxPrintf(wxT("User id is:\t%s\n"), wxGetUserId());
+    wxPrintf(wxT("User name is:\t%s\n"), wxGetUserName());
+    wxPrintf(wxT("Home dir is:\t%s\n"), wxGetHomeDir());
+    wxPrintf(wxT("Email address:\t%s\n"), wxGetEmailAddress());
 
     wxPuts(wxEmptyString);
 #endif // TEST_INFO_FUNCTIONS
@@ -332,23 +330,21 @@ public:
 protected:
     virtual void OnStackFrame(const wxStackFrame& frame)
     {
-        printf("[%2d] ", (int) frame.GetLevel());
+        wxPrintf("[%2d] ", (int) frame.GetLevel());
 
         wxString name = frame.GetName();
         if ( !name.empty() )
         {
-            printf("%-20.40s", (const char*)name.mb_str());
+            wxPrintf("%-20.40s", name);
         }
         else
         {
-            printf("0x%08lx", (unsigned long)frame.GetAddress());
+            wxPrintf("0x%08lx", (unsigned long)frame.GetAddress());
         }
 
         if ( frame.HasSourceLocation() )
         {
-            printf("\t%s:%d",
-                   (const char*)frame.GetFileName().mb_str(),
-                   (int)frame.GetLine());
+            wxPrintf("\t%s:%d", frame.GetFileName(), (int)frame.GetLine());
         }
 
         puts("");
@@ -356,9 +352,7 @@ protected:
         wxString type, val;
         for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ )
         {
-            printf("\t%s %s = %s\n", (const char*)type.mb_str(),
-                                     (const char*)name.mb_str(),
-                                     (const char*)val.mb_str());
+            wxPrintf("\t%s %s = %s\n", type, name, val);
         }
     }
 };
@@ -395,30 +389,30 @@ void InteractiveOutputTestCase::TestStandardPaths()
     wxTheApp->SetAppName(wxT("console"));
 
     wxStandardPathsBase& stdp = wxStandardPaths::Get();
-    wxPrintf(wxT("Config dir (sys):\t%s\n"), stdp.GetConfigDir().c_str());
-    wxPrintf(wxT("Config dir (user):\t%s\n"), stdp.GetUserConfigDir().c_str());
-    wxPrintf(wxT("Data dir (sys):\t\t%s\n"), stdp.GetDataDir().c_str());
-    wxPrintf(wxT("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir().c_str());
-    wxPrintf(wxT("Data dir (user):\t%s\n"), stdp.GetUserDataDir().c_str());
-    wxPrintf(wxT("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir().c_str());
-    wxPrintf(wxT("Documents dir:\t\t%s\n"), stdp.GetDocumentsDir().c_str());
-    wxPrintf(wxT("Cache dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Cache).c_str());
-    wxPrintf(wxT("Desktop dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Desktop).c_str());
-    wxPrintf(wxT("Downloads dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Downloads).c_str());
-    wxPrintf(wxT("Music dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Music).c_str());
-    wxPrintf(wxT("Pictures dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Pictures).c_str());
-    wxPrintf(wxT("Videos dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Videos).c_str());
-    wxPrintf(wxT("Executable path:\t%s\n"), stdp.GetExecutablePath().c_str());
-    wxPrintf(wxT("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir().c_str());
-    wxPrintf(wxT("Resources dir:\t\t%s\n"), stdp.GetResourcesDir().c_str());
+    wxPrintf(wxT("Config dir (sys):\t%s\n"), stdp.GetConfigDir());
+    wxPrintf(wxT("Config dir (user):\t%s\n"), stdp.GetUserConfigDir());
+    wxPrintf(wxT("Data dir (sys):\t\t%s\n"), stdp.GetDataDir());
+    wxPrintf(wxT("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir());
+    wxPrintf(wxT("Data dir (user):\t%s\n"), stdp.GetUserDataDir());
+    wxPrintf(wxT("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir());
+    wxPrintf(wxT("Documents dir:\t\t%s\n"), stdp.GetDocumentsDir());
+    wxPrintf(wxT("Cache dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Cache));
+    wxPrintf(wxT("Desktop dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Desktop));
+    wxPrintf(wxT("Downloads dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Downloads));
+    wxPrintf(wxT("Music dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Music));
+    wxPrintf(wxT("Pictures dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Pictures));
+    wxPrintf(wxT("Videos dir:\t\t%s\n"), stdp.GetUserDir(wxStandardPaths::Dir_Videos));
+    wxPrintf(wxT("Executable path:\t%s\n"), stdp.GetExecutablePath());
+    wxPrintf(wxT("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir());
+    wxPrintf(wxT("Resources dir:\t\t%s\n"), stdp.GetResourcesDir());
     wxPrintf(wxT("Localized res. dir:\t%s\n"),
-             stdp.GetLocalizedResourcesDir(wxT("fr")).c_str());
+             stdp.GetLocalizedResourcesDir(wxT("fr")));
     wxPrintf(wxT("Message catalogs dir:\t%s\n"),
              stdp.GetLocalizedResourcesDir
                   (
                     wxT("fr"),
                     wxStandardPaths::ResourceCat_Messages
-                  ).c_str());
+                  ));
 
     wxPuts("\n");
 #endif // TEST_STDPATHS
@@ -475,8 +469,8 @@ void InteractiveOutputTestCase::TestFSVolume()
 
         wxPrintf(wxT("%u: %s (%s), %s, %s, %s\n"),
                  n + 1,
-                 vol.GetDisplayName().c_str(),
-                 vol.GetName().c_str(),
+                 vol.GetDisplayName(),
+                 vol.GetName(),
                  volumeKinds[vol.GetKind()],
                  vol.IsWritable() ? wxT("rw") : wxT("ro"),
                  vol.GetFlags() & wxFS_VOL_REMOVABLE ? wxT("removable")

From a156cb5b6b46d028dcd74791151336d6fd62d1d2 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 11:22:54 +0200
Subject: [PATCH 809/916] CMake: Update cotire to version 1.8.0

---
 build/cmake/modules/cotire.cmake | 332 ++++++++++++++++++++++---------
 1 file changed, 234 insertions(+), 98 deletions(-)

diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake
index 62cd23db98..97275d6497 100644
--- a/build/cmake/modules/cotire.cmake
+++ b/build/cmake/modules/cotire.cmake
@@ -3,7 +3,7 @@
 # See the cotire manual for usage hints.
 #
 #=============================================================================
-# Copyright 2012-2017 Sascha Kratky
+# Copyright 2012-2018 Sascha Kratky
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -43,7 +43,7 @@ if (NOT CMAKE_SCRIPT_MODE_FILE)
 endif()
 
 set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
-set (COTIRE_CMAKE_MODULE_VERSION "1.7.10")
+set (COTIRE_CMAKE_MODULE_VERSION "1.8.0")
 
 # activate select policies
 if (POLICY CMP0025)
@@ -239,7 +239,13 @@ function (cotire_filter_language_source_files _language _target _sourceFilesVar
 				# add to excluded sources, if file has custom compile flags
 				list (APPEND _excludedSourceFiles "${_sourceFile}")
 			else()
-				list (APPEND _sourceFiles "${_sourceFile}")
+				get_source_file_property(_sourceCompileOptions "${_sourceFile}" COMPILE_OPTIONS)
+				if (_sourceCompileOptions)
+					# add to excluded sources, if file has list of custom compile options
+					list (APPEND _excludedSourceFiles "${_sourceFile}")
+				else()
+					list (APPEND _sourceFiles "${_sourceFile}")
+				endif()
 			endif()
 		endif()
 	endforeach()
@@ -721,7 +727,7 @@ function (cotire_get_target_compile_definitions _config _language _target _defin
 		endif()
 	endforeach()
 	# parse additional compile definitions from target compile flags
-	# and don't look at directory compile definitions, which we already handled
+	# and do not look at directory compile definitions, which we already handled
 	set (_targetFlags "")
 	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
 	cotire_filter_compile_flags("${_language}" "D" _definitions _ignore ${_targetFlags})
@@ -889,6 +895,9 @@ function (cotire_init_compile_cmd _cmdVar _language _compilerLauncher _compilerE
 	if (NOT _compilerArg1)
 		set (_compilerArg1 ${CMAKE_${_language}_COMPILER_ARG1})
 	endif()
+	if (WIN32)
+		file (TO_NATIVE_PATH "${_compilerExe}" _compilerExe)
+	endif()
 	string (STRIP "${_compilerArg1}" _compilerArg1)
 	if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
 		# compiler launcher is only supported for Makefile and Ninja
@@ -1083,12 +1092,11 @@ endmacro()
 
 macro (cotire_parse_line _line _headerFileVar _headerDepthVar)
 	if (MSVC)
-		# cl.exe /showIncludes output looks different depending on the language pack used, e.g.:
+		# cl.exe /showIncludes produces different output, depending on the language pack used, e.g.:
 		# English: "Note: including file:   C:\directory\file"
 		# German: "Hinweis: Einlesen der Datei:   C:\directory\file"
 		# We use a very general regular expression, relying on the presence of the : characters
 		if (_line MATCHES "( +)([a-zA-Z]:[^:]+)$")
-			# Visual Studio compiler output
 			string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
 			get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" ABSOLUTE)
 		else()
@@ -1246,11 +1254,19 @@ function (cotire_scan_includes _includesVar)
 		set (${_includesVar} "" PARENT_SCOPE)
 		return()
 	endif()
-	list (APPEND _cmd ${_existingSourceFiles})
+	# add source files to be scanned
+	if (WIN32)
+		foreach (_sourceFile ${_existingSourceFiles})
+			file (TO_NATIVE_PATH "${_sourceFile}" _sourceFileNative)
+			list (APPEND _cmd "${_sourceFileNative}")
+		endforeach()
+	else()
+		list (APPEND _cmd ${_existingSourceFiles})
+	endif()
 	if (COTIRE_VERBOSE)
 		message (STATUS "execute_process: ${_cmd}")
 	endif()
-	if (_option_COMPILER_ID MATCHES "MSVC")
+	if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
 	endif()
@@ -1486,11 +1502,16 @@ function (cotire_generate_prefix_header _prefixFile)
 	if (_unparsedLines)
 		if (COTIRE_VERBOSE OR _scanResult OR NOT _selectedHeaders)
 			list (LENGTH _unparsedLines _skippedLineCount)
-			message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesFile}")
+			if (WIN32)
+				file (TO_NATIVE_PATH "${_unparsedLinesFile}" _unparsedLinesLogPath)
+			else()
+				set (_unparsedLinesLogPath "${_unparsedLinesFile}")
+			endif()
+			message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesLogPath}")
 		endif()
 		string (REPLACE ";" "\n" _unparsedLines "${_unparsedLines}")
 	endif()
-	file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}")
+	file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}\n")
 endfunction()
 
 function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flagsVar)
@@ -1520,7 +1541,7 @@ function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flags
 			# append to list
 			list (APPEND _flags -H -E)
 			if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0")
-				list (APPEND _flags "-fdirectives-only")
+				list (APPEND _flags -fdirectives-only)
 			endif()
 		else()
 			# return as a flag string
@@ -1530,16 +1551,36 @@ function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flags
 			endif()
 		endif()
 	elseif (_compilerID MATCHES "Clang")
-		# Clang options used
-		# -H print the name of each header file used
-		# -E invoke preprocessor
-		# -fno-color-diagnostics don't prints diagnostics in color
-		if (_flags)
-			# append to list
-			list (APPEND _flags -H -E -fno-color-diagnostics)
-		else()
-			# return as a flag string
-			set (_flags "-H -E -fno-color-diagnostics")
+		if (UNIX)
+			# Clang options used
+			# -H print the name of each header file used
+			# -E invoke preprocessor
+			# -fno-color-diagnostics do not print diagnostics in color
+			# -Eonly just run preprocessor, no output
+			if (_flags)
+				# append to list
+				list (APPEND _flags -H -E -fno-color-diagnostics -Xclang -Eonly)
+			else()
+				# return as a flag string
+				set (_flags "-H -E -fno-color-diagnostics -Xclang -Eonly")
+			endif()
+		elseif (WIN32)
+			# Clang-cl.exe options used
+			# /TC treat all files named on the command line as C source files
+			# /TP treat all files named on the command line as C++ source files
+			# /EP preprocess to stdout without #line directives
+			# -H print the name of each header file used
+			# -fno-color-diagnostics do not print diagnostics in color
+			# -Eonly just run preprocessor, no output
+			set (_sourceFileTypeC "/TC")
+			set (_sourceFileTypeCXX "/TP")
+			if (_flags)
+				# append to list
+				list (APPEND _flags "${_sourceFileType${_language}}" /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly)
+			else()
+				# return as a flag string
+				set (_flags "${_sourceFileType${_language}} /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly")
+			endif()
 		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
@@ -1613,8 +1654,8 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 				set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
 			endif()
 		endif()
-	elseif (_compilerID MATCHES "GNU|Clang")
-		# GCC / Clang options used
+	elseif (_compilerID MATCHES "GNU")
+		# GCC options used
 		# -x specify the source language
 		# -c compile but do not link
 		# -o place output in file
@@ -1624,11 +1665,52 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 		set (_xLanguage_CXX "c++-header")
 		if (_flags)
 			# append to list
-			list (APPEND _flags "-x" "${_xLanguage_${_language}}" "-c" "${_prefixFile}" -o "${_pchFile}")
+			list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}")
 		else()
 			# return as a flag string
 			set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
 		endif()
+	elseif (_compilerID MATCHES "Clang")
+		if (UNIX)
+			# Clang options used
+			# -x specify the source language
+			# -c compile but do not link
+			# -o place output in file
+			# -fno-pch-timestamp disable inclusion of timestamp in precompiled headers (clang 4.0.0+)
+			set (_xLanguage_C "c-header")
+			set (_xLanguage_CXX "c++-header")
+			if (_flags)
+				# append to list
+				list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}")
+				if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0")
+					list (APPEND _flags -Xclang -fno-pch-timestamp)
+				endif()
+			else()
+				# return as a flag string
+				set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
+				if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0")
+					set (_flags "${_flags} -Xclang -fno-pch-timestamp")
+				endif()
+			endif()
+		elseif (WIN32)
+			# Clang-cl.exe options used
+			# /Yc creates a precompiled header file
+			# /Fp specifies precompiled header binary file name
+			# /FI forces inclusion of file
+			# /Zs syntax check only
+			# /TC treat all files named on the command line as C source files
+			# /TP treat all files named on the command line as C++ source files
+			set (_sourceFileTypeC "/TC")
+			set (_sourceFileTypeCXX "/TP")
+			if (_flags)
+				# append to list
+				list (APPEND _flags "${_sourceFileType${_language}}"
+						"/Yc${_prefixFile}" "/Fp${_pchFile}" "/FI${_prefixFile}" /Zs "${_hostFile}")
+			else()
+				# return as a flag string
+				set (_flags "/Yc\"${_prefixFile}\" /Fp\"${_pchFile}\" /FI\"${_prefixFile}\"")
+			endif()
+		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
 			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
@@ -1679,10 +1761,10 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 				if ("${_language}" STREQUAL "CXX")
 					list (APPEND _flags -Kc++)
 				endif()
-				list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-create" "${_pchName}" "-fsyntax-only" "${_hostFile}")
+				list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-create "${_pchName}" -fsyntax-only "${_hostFile}")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
 					if (NOT _pchSuppressMessages)
-						list (APPEND _flags "-Wpch-messages")
+						list (APPEND _flags -Wpch-messages)
 					endif()
 				endif()
 			else()
@@ -1742,23 +1824,46 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV
 		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
 		if (_flags)
 			# append to list
-			list (APPEND _flags "-Winvalid-pch" "-include" "${_prefixFile}")
+			list (APPEND _flags -Winvalid-pch -include "${_prefixFile}")
 		else()
 			# return as a flag string
 			set (_flags "-Winvalid-pch -include \"${_prefixFile}\"")
 		endif()
 	elseif (_compilerID MATCHES "Clang")
-		# Clang options used
-		# -include process include file as the first line of the primary source file
-		# -include-pch include precompiled header file
-		# -Qunused-arguments don't emit warning for unused driver arguments
-		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
-		if (_flags)
-			# append to list
-			list (APPEND _flags "-Qunused-arguments" "-include" "${_prefixFile}")
-		else()
-			# return as a flag string
-			set (_flags "-Qunused-arguments -include \"${_prefixFile}\"")
+		if (UNIX)
+			# Clang options used
+			# -include process include file as the first line of the primary source file
+			# note: ccache requires the -include flag to be used in order to process precompiled header correctly
+			if (_flags)
+				# append to list
+				list (APPEND _flags -include "${_prefixFile}")
+			else()
+				# return as a flag string
+				set (_flags "-include \"${_prefixFile}\"")
+			endif()
+		elseif (WIN32)
+			# Clang-cl.exe options used
+			# /Yu uses a precompiled header file during build
+			# /Fp specifies precompiled header binary file name
+			# /FI forces inclusion of file
+			if (_pchFile)
+				if (_flags)
+					# append to list
+					list (APPEND _flags "/Yu${_prefixFile}" "/Fp${_pchFile}" "/FI${_prefixFile}")
+				else()
+					# return as a flag string
+					set (_flags "/Yu\"${_prefixFile}\" /Fp\"${_pchFile}\" /FI\"${_prefixFile}\"")
+				endif()
+			else()
+				# no precompiled header, force inclusion of prefix header
+				if (_flags)
+					# append to list
+					list (APPEND _flags "/FI${_prefixFile}")
+				else()
+					# return as a flag string
+					set (_flags "/FI\"${_prefixFile}\"")
+				endif()
+			endif()
 		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
@@ -1808,10 +1913,10 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV
 				endif()
 				if (_flags)
 					# append to list
-					list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-use" "${_pchName}")
+					list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-use "${_pchName}")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
 						if (NOT _pchSuppressMessages)
-							list (APPEND _flags "-Wpch-messages")
+							list (APPEND _flags -Wpch-messages)
 						endif()
 					endif()
 				else()
@@ -1827,7 +1932,7 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV
 				# no precompiled header, force inclusion of prefix header
 				if (_flags)
 					# append to list
-					list (APPEND _flags "-include" "${_prefixFile}")
+					list (APPEND _flags -include "${_prefixFile}")
 				else()
 					# return as a flag string
 					set (_flags "-include \"${_prefixFile}\"")
@@ -1865,13 +1970,13 @@ function (cotire_precompile_prefix_header _prefixFile _pchFile _hostFile)
 	if (COTIRE_VERBOSE)
 		message (STATUS "execute_process: ${_cmd}")
 	endif()
-	if (_option_COMPILER_ID MATCHES "MSVC")
+	if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
-	elseif (_option_COMPILER_ID MATCHES "GNU|Clang")
+	elseif (_option_COMPILER_ID MATCHES "Clang" AND _option_COMPILER_VERSION VERSION_LESS "4.0.0")
 		if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR
 			_option_COMPILER_EXECUTABLE MATCHES "ccache")
-			# Newer versions of Clang and GCC seem to embed a compilation timestamp into the precompiled header binary,
+			# Newer versions of Clang embed a compilation timestamp into the precompiled header binary,
 			# which results in "file has been modified since the precompiled header was built" errors if ccache is used.
 			# We work around the problem by disabling ccache upon pre-compiling the prefix header.
 			set (ENV{CCACHE_DISABLE} "true")
@@ -1890,7 +1995,7 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 	set (_unsupportedCompiler
 		"Precompiled headers not supported for ${_language} compiler ${CMAKE_${_language}_COMPILER_ID}")
 	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC")
-		# supported since Visual Studio C++ 6.0
+		# PCH supported since Visual Studio C++ 6.0
 		# and CMake does not support an earlier version
 		set (${_msgVar} "" PARENT_SCOPE)
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU")
@@ -1901,8 +2006,16 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 			set (${_msgVar} "" PARENT_SCOPE)
 		endif()
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang")
-		# all Clang versions have PCH support
-		set (${_msgVar} "" PARENT_SCOPE)
+		if (UNIX)
+			# all Unix Clang versions have PCH support
+			set (${_msgVar} "" PARENT_SCOPE)
+		elseif (WIN32)
+			# only clang-cl is supported under Windows
+			get_filename_component(_compilerName "${CMAKE_${_language}_COMPILER}" NAME_WE)
+			if (NOT _compilerName MATCHES "cl$")
+				set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}. Use clang-cl instead." PARENT_SCOPE)
+			endif()
+		endif()
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel")
 		# Intel PCH support requires version >= 8.0.0
 		if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "8.0.0")
@@ -1913,19 +2026,25 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 	else()
 		set (${_msgVar} "${_unsupportedCompiler}." PARENT_SCOPE)
 	endif()
+	# check if ccache is used as a compiler launcher
 	get_target_property(_launcher ${_target} ${_language}_COMPILER_LAUNCHER)
-	if (CMAKE_${_language}_COMPILER MATCHES "ccache" OR _launcher MATCHES "ccache")
+	get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" REALPATH)
+	if (_realCompilerExe MATCHES "ccache" OR _launcher MATCHES "ccache")
+		# verify that ccache configuration is compatible with precompiled headers
+		# always check environment variable CCACHE_SLOPPINESS, because earlier versions of ccache
+		# do not report the "sloppiness" setting correctly upon printing ccache configuration
 		if (DEFINED ENV{CCACHE_SLOPPINESS})
-			if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros")
+			if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR
+				NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros")
 				set (${_msgVar}
 					"ccache requires the environment variable CCACHE_SLOPPINESS to be set to \"pch_defines,time_macros\"."
 					PARENT_SCOPE)
 			endif()
 		else()
-			if (_launcher MATCHES "ccache")
-				get_filename_component(_ccacheExe "${_launcher}" REALPATH)
+			if (_realCompilerExe MATCHES "ccache")
+				set (_ccacheExe "${_realCompilerExe}")
 			else()
-				get_filename_component(_ccacheExe "${CMAKE_${_language}_COMPILER}" REALPATH)
+				set (_ccacheExe "${_launcher}")
 			endif()
 			execute_process(
 				COMMAND "${_ccacheExe}" "--print-config"
@@ -1933,9 +2052,10 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 				RESULT_VARIABLE _result
 				OUTPUT_VARIABLE _ccacheConfig OUTPUT_STRIP_TRAILING_WHITESPACE
 				ERROR_QUIET)
-			if (_result OR NOT
-				_ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR NOT
-				_ccacheConfig MATCHES "sloppiness.*=.*pch_defines")
+			if (_result)
+				set (${_msgVar} "ccache configuration cannot be determined." PARENT_SCOPE)
+			elseif (NOT _ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR
+				NOT _ccacheConfig MATCHES "sloppiness.*=.*pch_defines")
 				set (${_msgVar}
 					"ccache requires configuration setting \"sloppiness\" to be set to \"pch_defines,time_macros\"."
 					PARENT_SCOPE)
@@ -2261,8 +2381,9 @@ endfunction()
 
 function (cotire_setup_pch_file_compilation _language _target _targetScript _prefixFile _pchFile _hostFile)
 	set (_sourceFiles ${ARGN})
-	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
-		# for Visual Studio and Intel, we attach the precompiled header compilation to the host file
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR
+		(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+		# for MSVC, Intel and Clang-cl, we attach the precompiled header compilation to the host file
 		# the remaining files include the precompiled header, see cotire_setup_pch_file_inclusion
 		if (_sourceFiles)
 			set (_flags "")
@@ -2307,8 +2428,9 @@ function (cotire_setup_pch_file_compilation _language _target _targetScript _pre
 endfunction()
 
 function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefixFile _pchFile _hostFile)
-	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
-		# for Visual Studio and Intel, we include the precompiled header in all but the host file
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR
+		(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+		# for MSVC, Intel and clang-cl, we include the precompiled header in all but the host file
 		# the host file does the precompiled header compilation, see cotire_setup_pch_file_compilation
 		set (_sourceFiles ${ARGN})
 		list (LENGTH _sourceFiles _numberOfSourceFiles)
@@ -2454,9 +2576,10 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
 		# if this is a single-language target without any excluded files
 		if (_wholeTarget)
 			set (_language "${_languages}")
-			# for Visual Studio and Intel, precompiled header inclusion is always done on the source file level
+			# for MSVC, Intel and clang-cl, precompiled header inclusion is always done on the source file level
 			# see cotire_setup_pch_file_inclusion
-			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT
+				(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
 				get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
 				if (_prefixFile)
 					get_property(_pchFile TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER)
@@ -2491,7 +2614,8 @@ function (cotire_setup_unity_generation_commands _language _target _targetScript
 			set_property (SOURCE "${_unityFile}" PROPERTY OBJECT_DEPENDS ${_objectDependsPaths})
 		endif()
 		if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
-			# unity file compilation results in potentially huge object file, thus use /bigobj by default unter MSVC and Windows Intel
+			# unity file compilation results in potentially huge object file,
+			# thus use /bigobj by default unter cl.exe and Windows Intel
 			set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS "/bigobj")
 		endif()
 		cotire_set_cmd_to_prologue(_unityCmd)
@@ -2697,6 +2821,9 @@ function (cotire_make_target_message _target _languages _disableMsg _targetMsgVa
 		else()
 			set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build.")
 		endif()
+		if (_disableMsg)
+			set (_targetMsg "${_targetMsg} ${_disableMsg}")
+		endif()
 	else()
 		if (_excludedStr)
 			set (_targetMsg "${_languagesStr} target ${_target} cotired ${_excludedStr}.")
@@ -2786,6 +2913,20 @@ function (cotire_choose_target_languages _target _targetLanguagesVar _wholeTarge
 			set (_targetUsePCH FALSE)
 		endif()
 	endif()
+	if (_targetAddSCU)
+		# disable unity builds if automatic Qt processing is used
+		get_target_property(_targetAutoMoc ${_target} AUTOMOC)
+		get_target_property(_targetAutoUic ${_target} AUTOUIC)
+		get_target_property(_targetAutoRcc ${_target} AUTORCC)
+		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
+			if (_disableMsg)
+				set (_disableMsg "${_disableMsg} Target uses automatic CMake Qt processing.")
+			else()
+				set (_disableMsg "Target uses automatic CMake Qt processing.")
+			endif()
+			set (_targetAddSCU FALSE)
+		endif()
+	endif()
 	set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER ${_targetUsePCH})
 	set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD ${_targetAddSCU})
 	cotire_make_target_message(${_target} "${_targetLanguages}" "${_disableMsg}" _targetMsg ${_allExcludedSourceFiles})
@@ -2813,7 +2954,11 @@ function (cotire_compute_unity_max_number_of_includes _target _maxIncludesVar)
 	set (_sourceFiles ${ARGN})
 	get_target_property(_maxIncludes ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES)
 	if (_maxIncludes MATCHES "(-j|--parallel|--jobs) ?([0-9]*)")
-		set (_numberOfThreads "${CMAKE_MATCH_2}")
+		if (DEFINED CMAKE_MATCH_2)
+			set (_numberOfThreads "${CMAKE_MATCH_2}")
+		else()
+			set (_numberOfThreads "")
+		endif()
 		if (NOT _numberOfThreads)
 			# use all available cores
 			ProcessorCount(_numberOfThreads)
@@ -2926,8 +3071,9 @@ function (cotire_setup_pch_target _languages _configurations _target)
 		set (_dependsFiles "")
 		foreach (_language ${_languages})
 			set (_props COTIRE_${_language}_PREFIX_HEADER COTIRE_${_language}_UNITY_SOURCE)
-			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
-				# Visual Studio and Intel only create precompiled header as a side effect
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT
+				(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+				# MSVC, Intel and clang-cl only create precompiled header as a side effect
 				list (INSERT _props 0 COTIRE_${_language}_PRECOMPILED_HEADER)
 			endif()
 			cotire_get_first_set_property_value(_dependsFile TARGET ${_target} ${_props})
@@ -2975,6 +3121,7 @@ function (cotire_collect_unity_target_sources _target _languages _unityTargetSou
 			list (APPEND _unityTargetSources ${_unityFiles})
 		endif()
 	endforeach()
+	# handle object libraries which are part of the target's sources
 	get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT)
 	if ("${_linkLibrariesStrategy}" MATCHES "^COPY_UNITY$")
 		cotire_filter_object_libraries(${_target} _objectLibraries ${_targetSourceFiles})
@@ -3019,21 +3166,6 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 	# determine unity target sources
 	set (_unityTargetSources "")
 	cotire_collect_unity_target_sources(${_target} "${_languages}" _unityTargetSources)
-	# handle automatic Qt processing
-	get_target_property(_targetAutoMoc ${_target} AUTOMOC)
-	get_target_property(_targetAutoUic ${_target} AUTOUIC)
-	get_target_property(_targetAutoRcc ${_target} AUTORCC)
-	if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
-		# if the original target sources are subject to CMake's automatic Qt processing,
-		# also include implicitly generated <targetname>_automoc.cpp file
-		if (CMAKE_VERSION VERSION_LESS "3.8.0")
-			list (APPEND _unityTargetSources "${_target}_automoc.cpp")
-			set_property (SOURCE "${_target}_automoc.cpp" PROPERTY GENERATED TRUE)
-		else()
-			list (APPEND _unityTargetSources "${_target}_autogen/moc_compilation.cpp")
-			set_property (SOURCE "${_target}_autogen/moc_compilation.cpp" PROPERTY GENERATED TRUE)
-		endif()
-	endif()
 	# prevent AUTOMOC, AUTOUIC and AUTORCC properties from being set when the unity target is created
 	set (CMAKE_AUTOMOC OFF)
 	set (CMAKE_AUTOUIC OFF)
@@ -3047,21 +3179,6 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 	else()
 		add_library(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources})
 	endif()
-	if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
-		# depend on original target's automoc target, if it exists
-		if (TARGET ${_target}_automoc)
-			add_dependencies(${_unityTargetName} ${_target}_automoc)
-		endif()
-	else()
-		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
-			# depend on the original target's implicity generated <targetname>_automoc target
-			if (CMAKE_VERSION VERSION_LESS "3.8.0")
-				add_dependencies(${_unityTargetName} ${_target}_automoc)
-			else()
-				add_dependencies(${_unityTargetName} ${_target}_autogen)
-			endif()
-		endif()
-	endif()
 	# copy output location properties
 	set (_outputDirProperties
 		ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>
@@ -3132,7 +3249,8 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED)
 	# copy link stuff
 	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
-		BUILD_WITH_INSTALL_RPATH INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
+		BUILD_WITH_INSTALL_RPATH BUILD_WITH_INSTALL_NAME_DIR
+		INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
 		LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED
 		LINK_FLAGS LINK_FLAGS_<CONFIG>
 		LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_<CONFIG>
@@ -3174,6 +3292,10 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES
 		ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH
 		ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE)
+	# copy CUDA platform specific stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		CUDA_PTX_COMPILATION CUDA_SEPARABLE_COMPILATION CUDA_RESOLVE_DEVICE_SYMBOLS
+		CUDA_EXTENSIONS CUDA_STANDARD CUDA_STANDARD_REQUIRED)
 	# use output name from original target
 	get_target_property(_targetOutputName ${_unityTargetName} OUTPUT_NAME)
 	if (NOT _targetOutputName)
@@ -3187,6 +3309,13 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 			set_property(TARGET ${_unityTargetName} PROPERTY ENABLE_EXPORTS TRUE)
 		endif()
 	endif()
+	# enable parallel compilation for MSVC
+	if (MSVC AND "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+		list (LENGTH _unityTargetSources _numberOfUnityTargetSources)
+		if (_numberOfUnityTargetSources GREATER 1)
+			set_property(TARGET ${_unityTargetName} APPEND PROPERTY COMPILE_OPTIONS "/MP")
+		endif()
+	endif()
 	cotire_init_target(${_unityTargetName})
 	cotire_add_to_unity_all_target(${_unityTargetName})
 	set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_TARGET_NAME "${_unityTargetName}")
@@ -3345,6 +3474,13 @@ function (cotire_target_link_libraries _target)
 					message (STATUS "unity target ${_unityTargetName} interface link libraries: ${_unityLinkInterfaceLibraries}")
 				endif()
 			endif()
+			get_target_property(_manualDependencies ${_target} MANUALLY_ADDED_DEPENDENCIES)
+			if (_manualDependencies)
+				cotire_map_libraries("${_linkLibrariesStrategy}" _unityManualDependencies ${_manualDependencies})
+				if (_unityManualDependencies)
+					add_dependencies("${_unityTargetName}" ${_unityManualDependencies})
+				endif()
+			endif()
 		endif()
 	endif()
 endfunction(cotire_target_link_libraries)
@@ -3641,7 +3777,7 @@ else()
 	set (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS "m;mm" CACHE STRING
 		"Ignore sources with the listed file extensions from the generated unity source.")
 
-	set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "3" CACHE STRING
+	set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "2" CACHE STRING
 		"Minimum number of sources in target required to enable use of precompiled header.")
 
 	if (NOT DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT)
@@ -3740,7 +3876,7 @@ else()
 		FULL_DOCS
 			"The variable can be set to an integer > 0."
 			"If a target contains less than that number of source files, cotire will not enable the use of the precompiled header for the target."
-			"If not defined, defaults to 3."
+			"If not defined, defaults to 2."
 	)
 
 	define_property(

From bfee89e3c43fba8e7ccd394c82981c1a3fa37bd2 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 11:23:46 +0200
Subject: [PATCH 810/916] CMake: Auto-enable wxUSE_STD_CONTAINERS when
 wxUSE_STL is enabled

---
 build/cmake/options.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index cb694379f3..4a3d18a533 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -43,7 +43,7 @@ endif()
 
 # STL options
 wx_option(wxUSE_STL "use standard C++ classes for everything" OFF)
-wx_dependent_option(wxUSE_STD_CONTAINERS "use standard C++ container classes" OFF "wxUSE_STL" OFF)
+wx_dependent_option(wxUSE_STD_CONTAINERS "use standard C++ container classes" ON "wxUSE_STL" OFF)
 
 wx_option(wxUSE_UNICODE "compile with Unicode support (NOT RECOMMENDED to be turned off)")
 if(NOT WIN32)

From 5da4e81e10beb4e693b83cec8572e7685a2b8883 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 11:58:01 +0200
Subject: [PATCH 811/916] Fix type casts and invalid format specifiers in
 interactive tests

---
 tests/interactive/input.cpp  |  2 +-
 tests/interactive/output.cpp | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/interactive/input.cpp b/tests/interactive/input.cpp
index 49f0f70e61..dee51c5fe7 100644
--- a/tests/interactive/input.cpp
+++ b/tests/interactive/input.cpp
@@ -176,7 +176,7 @@ void InteractiveInputTestCase::TestRegExInteractive()
                         break;
                     }
 
-                    wxPrintf(wxT("Subexpr %u matched '%s'\n"),
+                    wxPrintf(wxT("Subexpr %zu matched '%s'\n"),
                              n, wxString(text + start, len));
                 }
             }
diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
index d2ead1bbf6..98d0ac7595 100644
--- a/tests/interactive/output.cpp
+++ b/tests/interactive/output.cpp
@@ -110,8 +110,7 @@ void InteractiveOutputTestCase::TestDllListLoaded()
         size_t len wxDUMMY_INITIALIZE(0);
         if ( details.GetAddress(&addr, &len) )
         {
-            wxPrintf(" %08lx:%08lx",
-                   (unsigned long)addr, (unsigned long)((char *)addr + len));
+            wxPrintf(" %p:%p", addr, (void *)((char *)addr + len));
         }
 
         wxPrintf(" %s\n", details.GetVersion());
@@ -137,7 +136,7 @@ void InteractiveOutputTestCase::TestMimeEnum()
 
     size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes);
 
-    wxPrintf(wxT("*** All %lu known filetypes: ***\n"), static_cast<unsigned long>(count));
+    wxPrintf(wxT("*** All %zu known filetypes: ***\n"), count);
 
     wxArrayString exts;
     wxString desc;
@@ -261,7 +260,7 @@ void InteractiveOutputTestCase::TestOsInfo()
     wxPrintf(wxT("Running under: %s, version %d.%d\n"),
              wxGetOsDescription(), major, minor);
 
-    wxPrintf(wxT("%ld free bytes of memory left.\n"), wxGetFreeMemory().ToLong());
+    wxPrintf(wxT("%lld free bytes of memory left.\n"), wxGetFreeMemory());
 
     wxPrintf(wxT("Host name is %s (%s).\n"),
              wxGetHostName(), wxGetFullHostName());
@@ -330,7 +329,7 @@ public:
 protected:
     virtual void OnStackFrame(const wxStackFrame& frame)
     {
-        wxPrintf("[%2d] ", (int) frame.GetLevel());
+        wxPrintf("[%2zu] ", frame.GetLevel());
 
         wxString name = frame.GetName();
         if ( !name.empty() )
@@ -339,12 +338,12 @@ protected:
         }
         else
         {
-            wxPrintf("0x%08lx", (unsigned long)frame.GetAddress());
+            wxPrintf("0x%p", frame.GetAddress());
         }
 
         if ( frame.HasSourceLocation() )
         {
-            wxPrintf("\t%s:%d", frame.GetFileName(), (int)frame.GetLine());
+            wxPrintf("\t%s:%zu", frame.GetFileName(), frame.GetLine());
         }
 
         puts("");
@@ -456,7 +455,7 @@ void InteractiveOutputTestCase::TestFSVolume()
         return;
     }
 
-    wxPrintf(wxT("%u mounted volumes found:\n"), count);
+    wxPrintf(wxT("%zu mounted volumes found:\n"), count);
 
     for ( size_t n = 0; n < count; n++ )
     {
@@ -467,7 +466,7 @@ void InteractiveOutputTestCase::TestFSVolume()
             continue;
         }
 
-        wxPrintf(wxT("%u: %s (%s), %s, %s, %s\n"),
+        wxPrintf(wxT("%zu: %s (%s), %s, %s, %s\n"),
                  n + 1,
                  vol.GetDisplayName(),
                  vol.GetName(),

From 268f58855b698659344226e0f518a12020a85d8b Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 12:03:38 +0200
Subject: [PATCH 812/916] Fix type cast and unused parameter warning in dll/sdk
 sample

---
 samples/dll/sdk_exe.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/dll/sdk_exe.cpp b/samples/dll/sdk_exe.cpp
index 298a77eb17..b090eb6afc 100644
--- a/samples/dll/sdk_exe.cpp
+++ b/samples/dll/sdk_exe.cpp
@@ -39,7 +39,7 @@ namespace
 
 const TCHAR *MAIN_WIN_CLASS_NAME = _TEXT("my_exe_main_win_class");
 
-const int IDB_RUN_GUI_FROM_DLL = 100;
+const INT_PTR IDB_RUN_GUI_FROM_DLL = 100;
 
 // ----------------------------------------------------------------------------
 // globals
@@ -65,7 +65,7 @@ OnCommand(HWND /* hwnd */, int id, HWND /* hwndCtl */, UINT /* codeNotify */)
     }
 }
 
-void OnDestroy(HWND hwnd)
+void OnDestroy(HWND /* hwnd */)
 {
     wx_dll_cleanup();
 

From 5ea4e639b6f7f48727449fb691f7bc40826151fb Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 12:05:06 +0200
Subject: [PATCH 813/916] Fix type cast warning in thread test

---
 tests/thread/misc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/thread/misc.cpp b/tests/thread/misc.cpp
index 3eb5fcdbbb..d3a02c4f24 100644
--- a/tests/thread/misc.cpp
+++ b/tests/thread/misc.cpp
@@ -45,7 +45,7 @@ private:
 
 wxThread::ExitCode MyJoinableThread::Entry()
 {
-    unsigned long res = 1;
+    wxUIntPtr res = 1;
     for ( size_t n = 1; n < m_n; n++ )
     {
         res *= n;
@@ -244,7 +244,7 @@ void MiscThreadTestCase::TestJoinable()
     // calc 10! in the background
     MyJoinableThread thread(10);
     CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread.Run() );
-    CPPUNIT_ASSERT_EQUAL( 362880, (unsigned long)thread.Wait() );
+    CPPUNIT_ASSERT_EQUAL( 362880, (wxUIntPtr)thread.Wait() );
 }
 
 void MiscThreadTestCase::TestDetached()
@@ -285,7 +285,7 @@ void MiscThreadTestCase::TestSemaphore()
 
     for ( size_t n = 0; n < threads.GetCount(); n++ )
     {
-        CPPUNIT_ASSERT_EQUAL( 0, (long)threads[n]->Wait() );
+        CPPUNIT_ASSERT_EQUAL( 0, (wxUIntPtr)threads[n]->Wait() );
         delete threads[n];
     }
 }

From 8f9f319093f34f2cff5ce29e87e5b5809f2c3d22 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 12:25:59 +0200
Subject: [PATCH 814/916] CMake: Add missing test files

Update the file list to match the contents of tests/test.bkl.
---
 build/cmake/tests/base/CMakeLists.txt | 3 ++-
 build/cmake/tests/gui/CMakeLists.txt  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/cmake/tests/base/CMakeLists.txt b/build/cmake/tests/base/CMakeLists.txt
index 25f614e885..0b412b567c 100644
--- a/build/cmake/tests/base/CMakeLists.txt
+++ b/build/cmake/tests/base/CMakeLists.txt
@@ -56,7 +56,6 @@ set(TEST_SRC
     regex/wxregextest.cpp
     scopeguard/scopeguardtest.cpp
     strings/iostream.cpp
-    strings/hexconv.cpp
     strings/numformatter.cpp
     strings/strings.cpp
     strings/stdstrings.cpp
@@ -66,12 +65,14 @@ set(TEST_SRC
     strings/vararg.cpp
     strings/crt.cpp
     strings/vsnprintf.cpp
+    strings/hexconv.cpp
     streams/datastreamtest.cpp
     streams/ffilestream.cpp
     streams/fileback.cpp
     streams/filestream.cpp
     streams/iostreams.cpp
     streams/largefile.cpp
+    streams/lzmastream.cpp
     streams/memstream.cpp
     streams/socketstream.cpp
     streams/sstream.cpp
diff --git a/build/cmake/tests/gui/CMakeLists.txt b/build/cmake/tests/gui/CMakeLists.txt
index 9394ce3710..9043048348 100644
--- a/build/cmake/tests/gui/CMakeLists.txt
+++ b/build/cmake/tests/gui/CMakeLists.txt
@@ -23,6 +23,7 @@ set(TEST_GUI_SRC
     graphics/boundingbox.cpp
     graphics/clippingbox.cpp
     graphics/graphmatrix.cpp
+    graphics/graphpath.cpp
     config/config.cpp
     controls/bitmapcomboboxtest.cpp
     controls/bitmaptogglebuttontest.cpp
@@ -86,6 +87,7 @@ set(TEST_GUI_SRC
     image/rawbmp.cpp
     html/htmlparser.cpp
     html/htmlwindow.cpp
+    html/htmprint.cpp
     menu/accelentry.cpp
     menu/menu.cpp
     misc/guifuncs.cpp
@@ -97,6 +99,8 @@ set(TEST_GUI_SRC
     # non-GUI test) as sockets behave differently in console and GUI
     # applications.
     net/socket.cpp
+    persistence/tlw.cpp
+    persistence/dataview.cpp
     sizers/boxsizer.cpp
     sizers/gridsizer.cpp
     sizers/wrapsizer.cpp

From da9b4bc0a092af732b03cdc50d7828951d75eb33 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 12:51:02 +0200
Subject: [PATCH 815/916] Remove unused variable in graphpath test

---
 tests/graphics/graphpath.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/graphics/graphpath.cpp b/tests/graphics/graphpath.cpp
index 5f5d583bc7..6b106d60a9 100644
--- a/tests/graphics/graphpath.cpp
+++ b/tests/graphics/graphpath.cpp
@@ -385,7 +385,6 @@ static void TestCurrentPoint(wxGraphicsContext* gc)
         const wxDouble y = 140;
         const wxDouble r = 20;
         path.AddCircle(x, y, r);
-        wxPoint2DDouble cp0 = path.GetCurrentPoint();
         path.AddPath(path2);
         wxPoint2DDouble cp = path.GetCurrentPoint();
         WX_CHECK_POINT(cp, cp2, 1E-3);

From a7b8897846eae59718747be3b003d975cac4a519 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 29 Jul 2018 19:08:17 +0200
Subject: [PATCH 816/916] Fix running CMake tests under AppVeyor

---
 build/tools/appveyor-test.bat | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat
index 9de61f8488..6a26e19fed 100755
--- a/build/tools/appveyor-test.bat
+++ b/build/tools/appveyor-test.bat
@@ -44,9 +44,10 @@ exit /b 0
 
 :cmake
 if "%CONFIGURATION%"=="" set CONFIGURATION=Release
-cd build_cmake
-ctest -V -C %CONFIGURATION% --interactive-debug-mode 0 .
-if errorlevel 1 goto error
+cd ..\build_cmake
+ctest -V -C %CONFIGURATION% -R "test_[base|gui]" --interactive-debug-mode 0 .
+if errorlevel 1 goto :error
+goto :eof
 
 :error
 echo.

From 61c3160340cce1d7158d671110b08204b35ee060 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 30 Jul 2018 14:52:10 +0200
Subject: [PATCH 817/916] Install the new include/wx/osx/core/cfdictionary.h
 header

Add the new header to the list in build/files and regenerate all the
files derived from it.

This should have been part of 342e4454238b32617fcd1fa49a1117d80a19237a
---
 Makefile.in               | 16 +++++++++++-----
 build/bakefiles/files.bkl |  1 +
 build/cmake/files.cmake   |  1 +
 build/files               |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 94c92f2eef..a4792e10f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2440,6 +2440,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR =  \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
 	wx/osx/carbon/region.h \
+	wx/osx/core/cfdictionary.h \
 	wx/unix/app.h \
 	wx/unix/apptbase.h \
 	wx/unix/apptrait.h \
@@ -2472,7 +2473,8 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
-	wx/osx/carbon/region.h
+	wx/osx/carbon/region.h \
+	wx/osx/core/cfdictionary.h
 @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR)
 COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2494,7 +2496,8 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
-	wx/osx/carbon/region.h
+	wx/osx/carbon/region.h \
+	wx/osx/core/cfdictionary.h
 @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
 COND_TOOLKIT_X11_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2516,7 +2519,8 @@ COND_TOOLKIT_X11_BASE_OSX_HDR =  \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
-	wx/osx/carbon/region.h
+	wx/osx/carbon/region.h \
+	wx/osx/core/cfdictionary.h
 @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
 COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2538,7 +2542,8 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
-	wx/osx/carbon/region.h
+	wx/osx/carbon/region.h \
+	wx/osx/core/cfdictionary.h
 @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
 COND_TOOLKIT__BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2560,7 +2565,8 @@ COND_TOOLKIT__BASE_OSX_HDR =  \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
-	wx/osx/carbon/region.h
+	wx/osx/carbon/region.h \
+	wx/osx/core/cfdictionary.h
 @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
 @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
 COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 7e08bfd60d..c464f898f0 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -199,6 +199,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/private.h
     wx/osx/core/colour.h
     wx/osx/carbon/region.h
+    wx/osx/core/cfdictionary.h
 </set>
 
 <!-- Base files used by OS X ports (not Carbon) -->
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index e8dfb59328..e503ef5777 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -127,6 +127,7 @@ set(BASE_COREFOUNDATION_HDR
     wx/osx/core/evtloop.h
     wx/osx/core/objcid.h
     wx/osx/core/private.h
+    wx/osx/core/cfdictionary.h
 )
 
 set(BASE_OSX_SHARED_SRC
diff --git a/build/files b/build/files
index 54cb655f3a..396ed5075a 100644
--- a/build/files
+++ b/build/files
@@ -145,6 +145,7 @@ BASE_COREFOUNDATION_SRC =
 BASE_COREFOUNDATION_HDR =
     wx/osx/carbon/region.h
     wx/osx/core/cfdataref.h
+    wx/osx/core/cfdictionary.h
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/colour.h

From 4430ab866101ca8c6be5abc2b178b4c1c34aeb14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?=
 <catalinr@users.noreply.github.com>
Date: Mon, 30 Jul 2018 04:51:46 +0300
Subject: [PATCH 818/916] Disable wxRearrangeCtrl without wxCheckListBox in
 wxMSW

Add a check ensuring that if wxCheckListBox is disabled, then so is
wxRearrangeCtrl, to avoid build errors that would happen otherwise.

Closes https://github.com/wxWidgets/wxWidgets/pull/866
---
 include/wx/msw/chkconf.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 72c3007f97..4ef7be5d7f 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -202,6 +202,10 @@
 #       undef wxUSE_CHECKLISTBOX
 #       define wxUSE_CHECKLISTBOX 0
 #   endif
+#   if !wxUSE_CHECKLISTBOX
+#       undef wxUSE_REARRANGECTRL
+#       define wxUSE_REARRANGECTRL 0
+#   endif
 #endif
 
 /*

From a02efd1fc7eeffcf3ab2fc9805da03c98c5cd051 Mon Sep 17 00:00:00 2001
From: Vitaly Stakhovsky <vvs31415@gitlab.com>
Date: Mon, 30 Jul 2018 15:04:36 +0200
Subject: [PATCH 819/916] Implement wxFontDialog::SetTitle() in wxMSW

Base class SetTitle() implementation didnd't work for this class as it
used the (invalid) HWND of not yet existing dialog, so add a hook
procedure for the common font dialog, similar to the existing one for
wxColourDialog, which allows us to set the dialog title when the dialog
is really created.

Closes https://github.com/wxWidgets/wxWidgets/pull/865

Closes #18177.
---
 docs/changes.txt         |  1 +
 include/wx/msw/fontdlg.h |  4 ++++
 src/msw/fontdlg.cpp      | 44 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/docs/changes.txt b/docs/changes.txt
index 74ef379423..53be80064f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -124,6 +124,7 @@ wxMSW:
 - Fix positioning windows at positions >= SHORT_MAX (Cătălin Răceanu).
 - Honour alignment flags for multiline buttons using custom colours too.
 - Support MSVC auto-linking when using monolithic build too (PB).
+- Implement wxFontDialog::SetTitle() (Vitaly Stakhovsky).
 - Fix build in ANSI (non-Unicode) mode.
 
 wxOSX:
diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h
index 24b608e716..38d0d463bc 100644
--- a/include/wx/msw/fontdlg.h
+++ b/include/wx/msw/fontdlg.h
@@ -25,8 +25,12 @@ public:
         : wxFontDialogBase(parent, data) { Create(parent, data); }
 
     virtual int ShowModal() wxOVERRIDE;
+    virtual void SetTitle(const wxString& title) wxOVERRIDE;
+    virtual wxString GetTitle() const wxOVERRIDE;
 
 protected:
+    wxString m_title;
+
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog);
 };
 
diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 749272eea6..2f7e6bb8d5 100644
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -49,10 +49,45 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog);
 // implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// font dialog hook proc used for setting the dialog title if necessary
+// ----------------------------------------------------------------------------
+
+static
+UINT_PTR CALLBACK
+wxFontDialogHookProc(HWND hwnd,
+                     UINT uiMsg,
+                     WPARAM WXUNUSED(wParam),
+                     LPARAM lParam)
+{
+    if ( uiMsg == WM_INITDIALOG )
+    {
+        CHOOSEFONT *pCH = (CHOOSEFONT *)lParam;
+        wxFontDialog * const
+            dialog = reinterpret_cast<wxFontDialog *>(pCH->lCustData);
+
+        ::SetWindowText(hwnd, dialog->GetTitle().t_str());
+    }
+
+    return 0;
+}
+
 // ----------------------------------------------------------------------------
 // wxFontDialog
 // ----------------------------------------------------------------------------
 
+void wxFontDialog::SetTitle(const wxString& title)
+{
+    // Just store the title here, we can't set it right now because the dialog
+    // doesn't exist yet -- it will be created only when ShowModal() is called.
+    m_title = title;
+}
+
+wxString wxFontDialog::GetTitle() const
+{
+    return m_title;
+}
+
 int wxFontDialog::ShowModal()
 {
     WX_HOOK_MODAL_DIALOG();
@@ -71,6 +106,15 @@ int wxFontDialog::ShowModal()
     chooseFontStruct.hwndOwner = hWndParent;
     chooseFontStruct.lpLogFont = &logFont;
 
+    // Currently we only use the hook to set the title, so only set it up if
+    // we really need to do this.
+    if ( !m_title.empty() )
+    {
+        flags |= CF_ENABLEHOOK;
+        chooseFontStruct.lCustData = (LPARAM)this;
+        chooseFontStruct.lpfnHook = wxFontDialogHookProc;
+    }
+
     if ( m_fontData.m_initialFont.IsOk() )
     {
         flags |= CF_INITTOLOGFONTSTRUCT;

From 4bda27c96cf1faae1bc78e9b5202f52cbc0ba304 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 30 Jul 2018 16:32:12 +0200
Subject: [PATCH 820/916] Adding wrapper for CFArray, updating other wrappers

---
 Makefile.in                        |  22 +++-
 build/bakefiles/files.bkl          |   2 +
 build/cmake/files.cmake            |   2 +
 build/files                        |   2 +
 include/wx/osx/core/cfarray.h      | 110 +++++++++++++++++
 include/wx/osx/core/cfdictionary.h | 190 ++++++++---------------------
 include/wx/osx/core/cfref.h        |  14 +++
 include/wx/osx/core/cftype.h       | 130 ++++++++++++++++++++
 include/wx/osx/core/private.h      |   1 +
 9 files changed, 332 insertions(+), 141 deletions(-)
 create mode 100644 include/wx/osx/core/cfarray.h
 create mode 100644 include/wx/osx/core/cftype.h

diff --git a/Makefile.in b/Makefile.in
index a4792e10f8..f0363aebb4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2441,6 +2441,8 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR =  \
 	wx/osx/core/colour.h \
 	wx/osx/carbon/region.h \
 	wx/osx/core/cfdictionary.h \
+	wx/osx/core/cfarray.h \
+	wx/osx/core/cftype.h \
 	wx/unix/app.h \
 	wx/unix/apptbase.h \
 	wx/unix/apptrait.h \
@@ -2474,7 +2476,9 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
 	wx/osx/carbon/region.h \
-	wx/osx/core/cfdictionary.h
+	wx/osx/core/cfdictionary.h \
+	wx/osx/core/cfarray.h \
+	wx/osx/core/cftype.h
 @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR)
 COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2497,7 +2501,9 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
 	wx/osx/carbon/region.h \
-	wx/osx/core/cfdictionary.h
+	wx/osx/core/cfdictionary.h \
+	wx/osx/core/cfarray.h \
+	wx/osx/core/cftype.h
 @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
 COND_TOOLKIT_X11_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2520,7 +2526,9 @@ COND_TOOLKIT_X11_BASE_OSX_HDR =  \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
 	wx/osx/carbon/region.h \
-	wx/osx/core/cfdictionary.h
+	wx/osx/core/cfdictionary.h \
+	wx/osx/core/cfarray.h \
+	wx/osx/core/cftype.h
 @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
 COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2543,7 +2551,9 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
 	wx/osx/carbon/region.h \
-	wx/osx/core/cfdictionary.h
+	wx/osx/core/cfdictionary.h \
+	wx/osx/core/cfarray.h \
+	wx/osx/core/cftype.h
 @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
 COND_TOOLKIT__BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2566,7 +2576,9 @@ COND_TOOLKIT__BASE_OSX_HDR =  \
 	wx/osx/core/private.h \
 	wx/osx/core/colour.h \
 	wx/osx/carbon/region.h \
-	wx/osx/core/cfdictionary.h
+	wx/osx/core/cfdictionary.h \
+	wx/osx/core/cfarray.h \
+	wx/osx/core/cftype.h
 @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
 @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
 COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index c464f898f0..ea64e2d1d6 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -200,6 +200,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/colour.h
     wx/osx/carbon/region.h
     wx/osx/core/cfdictionary.h
+    wx/osx/core/cfarray.h
+    wx/osx/core/cftype.h
 </set>
 
 <!-- Base files used by OS X ports (not Carbon) -->
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index e503ef5777..c8edde689c 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -128,6 +128,8 @@ set(BASE_COREFOUNDATION_HDR
     wx/osx/core/objcid.h
     wx/osx/core/private.h
     wx/osx/core/cfdictionary.h
+    wx/osx/core/cfarray.h
+    wx/osx/core/cftype.h
 )
 
 set(BASE_OSX_SHARED_SRC
diff --git a/build/files b/build/files
index 396ed5075a..9f7f68c0b5 100644
--- a/build/files
+++ b/build/files
@@ -145,7 +145,9 @@ BASE_COREFOUNDATION_SRC =
 BASE_COREFOUNDATION_HDR =
     wx/osx/carbon/region.h
     wx/osx/core/cfdataref.h
+    wx/osx/core/cfarray.h
     wx/osx/core/cfdictionary.h
+    wx/osx/core/cftype.h
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/colour.h
diff --git a/include/wx/osx/core/cfarray.h b/include/wx/osx/core/cfarray.h
new file mode 100644
index 0000000000..b16c075625
--- /dev/null
+++ b/include/wx/osx/core/cfarray.h
@@ -0,0 +1,110 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/core/cfarrayref.h
+// Purpose:     wxCFArrayRef class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     2018/07/27
+// Copyright:   (c) 2018 Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+/*! @header     wx/osx/core/cfarrayref.h
+ @abstract   wxCFArrayRef class
+ */
+
+#ifndef _WX_OSX_COREFOUNDATION_CFARRAYREF_H__
+#define _WX_OSX_COREFOUNDATION_CFARRAYREF_H__
+
+#include "wx/osx/core/cfref.h"
+#include "wx/osx/core/cftype.h"
+
+#include <CoreFoundation/CFArray.h>
+
+template <typename T, typename E>
+class wxCFArrayRefCommon : public wxCFRef<T>
+{
+public:
+    typedef wxCFRef<T> super_type;
+    typedef size_t size_type;
+
+    wxCFArrayRefCommon(T r)
+        : super_type(r)
+    {
+    }
+
+    wxCFArrayRefCommon(const wxCFArrayRefCommon& otherRef)
+        : super_type(otherRef)
+    {
+    }
+
+    size_type size() const
+    {
+        return (size_type)CFArrayGetCount(this->m_ptr);
+    }
+
+    bool empty() const
+    {
+        return size() == 0;
+    }
+
+    wxCFRef<E> at(size_type idx)
+    {
+        wxASSERT(idx < size());
+
+        CFTypeRef val = CFArrayGetValueAtIndex(this->m_ptr, idx);
+        if (val)
+            ::CFRetain(val);
+        return wxCFRefFromGet<E>(val);
+    }
+
+    wxCFRef<E> operator[](size_type idx) { return at(idx); }
+    wxCFRef<E> front() { return at(0); }
+    wxCFRef<E> back() { return at(size() - 1); }
+};
+
+
+template <typename E>
+class wxCFArrayRef : public wxCFArrayRefCommon<CFArrayRef, E>
+{
+public:
+    wxCFArrayRef(CFArrayRef r)
+        : wxCFArrayRefCommon<CFArrayRef, E>(r)
+    {
+    }
+
+    wxCFArrayRef(const wxCFArrayRef& otherRef)
+        : wxCFArrayRefCommon<CFArrayRef, E>(otherRef)
+    {
+    }
+};
+
+template <typename E>
+class wxCFMutableArrayRef : public wxCFArrayRefCommon<CFMutableArrayRef, E>
+{
+public:
+    wxCFMutableArrayRef()
+        : wxCFArrayRefCommon<CFMutableArrayRef, E>(CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks))
+    {
+    }
+
+    wxCFMutableArrayRef(CFMutableArrayRef r)
+        : wxCFArrayRefCommon<CFMutableArrayRef, E>(r)
+    {
+    }
+
+    wxCFMutableArrayRef(const wxCFMutableArrayRef& otherRef)
+        : wxCFArrayRefCommon<CFMutableArrayRef, E>(otherRef)
+    {
+    }
+
+    void push_back(E v)
+    {
+        CFArrayAppendValue(this->m_ptr, v);
+    }
+
+    void clear()
+    {
+        CFArrayRemoveAllValues(this->m_ptr);
+    }
+};
+
+#endif //ifndef _WX_OSX_COREFOUNDATION_CFARRAYREF_H__
diff --git a/include/wx/osx/core/cfdictionary.h b/include/wx/osx/core/cfdictionary.h
index e3aeec32bb..2088450060 100644
--- a/include/wx/osx/core/cfdictionary.h
+++ b/include/wx/osx/core/cfdictionary.h
@@ -11,134 +11,29 @@
  @abstract   wxCFDictionaryRef class
  */
 
-#ifndef _WX_OSX_COREFOUNDATION_CFICTIONARYREF_H__
-#define _WX_OSX_COREFOUNDATION_CFICTIONARYREF_H__
+#ifndef _WX_OSX_COREFOUNDATION_CFDICTIONARYREF_H__
+#define _WX_OSX_COREFOUNDATION_CFDICTIONARYREF_H__
 
 #include "wx/osx/core/cfref.h"
 #include "wx/osx/core/cfstring.h"
+#include "wx/osx/core/cftype.h"
 
 #include <CoreFoundation/CFDictionary.h>
 
-#ifndef WX_PRECOMP
-#include "wx/string.h"
-#endif
-
-class wxCFTypeRef : public wxCFRef<CFTypeRef>
-{
-public:
-    typedef wxCFRef<CFTypeRef> super_type;
-
-    wxCFTypeRef(CFTypeRef d)
-        : super_type(d)
-    {
-    }
-
-    template <typename V>
-    bool GetValue(V* ptr) const;
-
-    template <typename V>
-    bool GetValue(V* ptr, V defaultValue) const
-    {
-        bool hasKey = GetValue(ptr);
-
-        if (!hasKey)
-            *ptr = defaultValue;
-
-        return hasKey;
-    }
-
-    template <typename V>
-    bool GetValue(V& ref) const
-    {
-        return GetValue(&ref);
-    }
-
-    template <typename V>
-    bool GetValue(V& ref, V defaultValue) const
-    {
-        bool hasKey = GetValue(ref);
-
-        if (!hasKey)
-            ref = defaultValue;
-
-        return hasKey;
-    }
-
-    // spezialization through overload
-    
-    bool GetValue(CGFloat* ptr) const
-    {
-        if ( m_ptr )
-            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberCGFloatType, ptr);
-        
-        return m_ptr;
-    }
-
-    bool GetValue(int32_t* ptr) const
-    {
-        if ( m_ptr )
-            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt32Type, ptr);
-        
-        return m_ptr;
-    }
-    
-    bool GetValue(uint32_t* ptr) const
-    {
-        if ( m_ptr )
-            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt32Type, ptr);
-        
-        return m_ptr;
-    }
-    
-    bool GetValue(int64_t* ptr) const
-    {
-        if ( m_ptr )
-            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt64Type, ptr);
-        
-        return m_ptr;
-    }
-    
-    bool GetValue(uint64_t* ptr) const
-    {
-        if ( m_ptr )
-            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt64Type, ptr);
-        
-        return m_ptr;
-    }
-
-    bool GetValue(wxString *s) const
-    {
-        if ( m_ptr )
-            *s = wxCFStringRef::AsString((CFStringRef)m_ptr);
-        
-        return m_ptr;
-        
-    }
-
-};
-
-class wxCFNumberRef : public wxCFTypeRef
-{
-public:
-    wxCFNumberRef(CGFloat v)
-    : wxCFTypeRef(CFNumberCreate( NULL, kCFNumberCGFloatType, &v))
-    {
-    }
-    
-    wxCFNumberRef(int v)
-    : wxCFTypeRef(CFNumberCreate( NULL, kCFNumberIntType, &v))
-    {
-    }
-};
-
 /*! @class wxCFDictionaryRef
  @discussion Properly retains/releases reference to CoreFoundation data objects
  */
-template<typename T> class wxCFDictionaryRefCommon : public wxCFRef< T >
+template <typename T>
+class wxCFDictionaryRefCommon : public wxCFRef<T>
 {
 public:
     typedef wxCFRef<T> super_type;
 
+    explicit wxCFDictionaryRefCommon()
+        : super_type()
+    {
+    }
+
     /*! @method     wxCFDictionaryRef
      @abstract   Assumes ownership of r and creates a reference to it.
      @param r        The dictionary reference to assume ownership of.  May be NULL.
@@ -151,8 +46,9 @@ public:
      using an operator refType() in a different ref-holding class type.
      */
     explicit wxCFDictionaryRefCommon(T r)
-    :   super_type(r)
-    {}
+        : super_type(r)
+    {
+    }
 
     /*! @method     wxCFDictionaryRef
      @abstract   Copies a ref holder of the same type
@@ -161,47 +57,69 @@ public:
      the object will be explicitly retained by this new ref.
      */
     wxCFDictionaryRefCommon(const wxCFDictionaryRefCommon& otherRef)
-    :  super_type( otherRef )
-    {}
-
-    wxCFTypeRef GetValue(const void *key)
+        : super_type(otherRef)
     {
-        CFTypeRef val = CFDictionaryGetValue( this->m_ptr, key);
-        if ( val )
+    }
+
+    wxCFTypeRef GetValue(const void* key)
+    {
+        CFTypeRef val = CFDictionaryGetValue(this->m_ptr, key);
+        if (val)
             ::CFRetain(val);
         return val;
     }
 };
 
-class wxCFDictionaryRef : public wxCFDictionaryRefCommon< CFDictionaryRef >
+class wxCFMutableDictionaryRef;
+
+class wxCFDictionaryRef : public wxCFDictionaryRefCommon<CFDictionaryRef>
 {
 public:
+    wxCFDictionaryRef()
+    {
+    }
+
     explicit wxCFDictionaryRef(CFDictionaryRef r)
-    :   wxCFDictionaryRefCommon(r)
-    {}
+        : wxCFDictionaryRefCommon(r)
+    {
+    }
+
+    wxCFDictionaryRef& operator=(const wxCFMutableDictionaryRef& other);
 };
 
-class wxCFMutableDictionaryRef : public wxCFDictionaryRefCommon< CFMutableDictionaryRef >
+class wxCFMutableDictionaryRef : public wxCFDictionaryRefCommon<CFMutableDictionaryRef>
 {
 public:
-    wxCFMutableDictionaryRef() : wxCFDictionaryRefCommon(CFDictionaryCreateMutable(kCFAllocatorDefault, 0,&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks))
+    wxCFMutableDictionaryRef()
+        : wxCFDictionaryRefCommon(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks))
     {
     }
 
     explicit wxCFMutableDictionaryRef(CFMutableDictionaryRef r)
-    :   wxCFDictionaryRefCommon(r)
-    {}
+        : wxCFDictionaryRefCommon(r)
+    {
+    }
 
-    void SetValue(const void *key, const void *data)
+    void SetValue(const void* key, const void* data)
     {
-        CFDictionarySetValue( this->m_ptr, key, data);
+        CFDictionarySetValue(this->m_ptr, key, data);
     }
-    
-    void SetValue(const void*key, CGFloat v)
+
+    void SetValue(const void* key, CGFloat v)
     {
-        SetValue( key, wxCFNumberRef(v));
+        SetValue(key, wxCFNumberRef(v));
     }
+
+    friend class wxCFDictionaryRef;
 };
 
-#endif //ifndef _WX_OSX_COREFOUNDATION_CFICTIONARYREF_H__
+inline wxCFDictionaryRef& wxCFDictionaryRef::operator=(const wxCFMutableDictionaryRef& otherRef)
+{
+    wxCFRetain(otherRef.m_ptr);
+    wxCFRelease(m_ptr);
+    m_ptr = (CFDictionaryRef)otherRef.m_ptr;
 
+    return *this;
+}
+
+#endif //ifndef _WX_OSX_COREFOUNDATION_CFDICTIONARYREF_H__
diff --git a/include/wx/osx/core/cfref.h b/include/wx/osx/core/cfref.h
index c4a6b3c17a..54580da695 100644
--- a/include/wx/osx/core/cfref.h
+++ b/include/wx/osx/core/cfref.h
@@ -165,6 +165,19 @@ public:
     :   m_ptr(NULL)
     {}
 
+    /*! @method     wxCFRef
+        @abstract   Assumes ownership of p and creates a reference to it.
+     @param p        The raw core foundation reference to assume ownership of.  May be NULL.
+     @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
+     to transfer ownership of that reference to this ref holder.  If the object comes from
+     a Create or Copy method then this is the correct behaviour.  If the object comes from
+     a Get method then you must CFRetain it yourself before passing it to this constructor.
+     A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
+     */
+    wxCFRef(refType p) : m_ptr(p)
+    {
+        
+    }
     /*! @method     wxCFRef
         @abstract   Assumes ownership of p and creates a reference to it.
         @templatefield otherType    Any type.
@@ -177,6 +190,7 @@ public:
                     This method is templated and takes an otherType *p.  This prevents implicit conversion
                     using an operator refType() in a different ref-holding class type.
     */
+    
     template <class otherType>
     explicit wxCFRef(otherType *p)
     :   m_ptr(p) // Implicit conversion from otherType* to refType should occur.
diff --git a/include/wx/osx/core/cftype.h b/include/wx/osx/core/cftype.h
new file mode 100644
index 0000000000..0b6fbc4c2f
--- /dev/null
+++ b/include/wx/osx/core/cftype.h
@@ -0,0 +1,130 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/core/cftype.h
+// Purpose:     wxCFDictionaryRef class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     2018/07/27
+// Copyright:   (c) 2018 Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+/*! @header     wx/osx/core/cftype.h
+ @abstract   wxCFTypeRef class and derived classes
+ */
+
+#ifndef _WX_OSX_COREFOUNDATION_CFTYPEREF_H__
+#define _WX_OSX_COREFOUNDATION_CFTYPEREF_H__
+
+#include "wx/osx/core/cfref.h"
+#include "wx/osx/core/cfstring.h"
+
+#ifndef WX_PRECOMP
+#include "wx/string.h"
+#endif
+
+class wxCFTypeRef : public wxCFRef<CFTypeRef>
+{
+public:
+    typedef wxCFRef<CFTypeRef> super_type;
+
+    wxCFTypeRef(CFTypeRef d)
+        : super_type(d)
+    {
+    }
+
+    template <typename V>
+    bool GetValue(V* ptr) const;
+
+    template <typename V>
+    bool GetValue(V* ptr, V defaultValue) const
+    {
+        bool hasKey = GetValue(ptr);
+
+        if (!hasKey)
+            *ptr = defaultValue;
+
+        return hasKey;
+    }
+
+    template <typename V>
+    bool GetValue(V& ref) const
+    {
+        return GetValue(&ref);
+    }
+
+    template <typename V>
+    bool GetValue(V& ref, V defaultValue) const
+    {
+        bool hasKey = GetValue(ref);
+
+        if (!hasKey)
+            ref = defaultValue;
+
+        return hasKey;
+    }
+
+    // spezialization through overload
+
+    bool GetValue(CGFloat* ptr) const
+    {
+        if (m_ptr)
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberCGFloatType, ptr);
+
+        return m_ptr;
+    }
+
+    bool GetValue(int32_t* ptr) const
+    {
+        if (m_ptr)
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt32Type, ptr);
+
+        return m_ptr;
+    }
+
+    bool GetValue(uint32_t* ptr) const
+    {
+        if (m_ptr)
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt32Type, ptr);
+
+        return m_ptr;
+    }
+
+    bool GetValue(int64_t* ptr) const
+    {
+        if (m_ptr)
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt64Type, ptr);
+
+        return m_ptr;
+    }
+
+    bool GetValue(uint64_t* ptr) const
+    {
+        if (m_ptr)
+            CFNumberGetValue((CFNumberRef)m_ptr, kCFNumberSInt64Type, ptr);
+
+        return m_ptr;
+    }
+
+    bool GetValue(wxString* s) const
+    {
+        if (m_ptr)
+            *s = wxCFStringRef::AsString((CFStringRef)m_ptr);
+
+        return m_ptr;
+    }
+};
+
+class wxCFNumberRef : public wxCFTypeRef
+{
+public:
+    wxCFNumberRef(CGFloat v)
+        : wxCFTypeRef(CFNumberCreate(NULL, kCFNumberCGFloatType, &v))
+    {
+    }
+
+    wxCFNumberRef(int v)
+        : wxCFTypeRef(CFNumberCreate(NULL, kCFNumberIntType, &v))
+    {
+    }
+};
+
+#endif //ifndef _WX_OSX_COREFOUNDATION_CFTYPEREF_H__
diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 3175109d38..d5acfa3e13 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -19,6 +19,7 @@
 
 #include "wx/osx/core/cfstring.h"
 #include "wx/osx/core/cfdataref.h"
+#include "wx/osx/core/cfarray.h"
 #include "wx/osx/core/cfdictionary.h"
 
 // platform specific Clang analyzer support

From d553859812149507b93dd8ccedb191350b1db6e0 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 30 Jul 2018 18:03:01 +0200
Subject: [PATCH 821/916] Cleanup accessor code

---
 include/wx/osx/core/cfarray.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/wx/osx/core/cfarray.h b/include/wx/osx/core/cfarray.h
index b16c075625..1b58597bf0 100644
--- a/include/wx/osx/core/cfarray.h
+++ b/include/wx/osx/core/cfarray.h
@@ -50,10 +50,7 @@ public:
     {
         wxASSERT(idx < size());
 
-        CFTypeRef val = CFArrayGetValueAtIndex(this->m_ptr, idx);
-        if (val)
-            ::CFRetain(val);
-        return wxCFRefFromGet<E>(val);
+        return wxCFRefFromGet((E)CFArrayGetValueAtIndex(this->m_ptr, idx));
     }
 
     wxCFRef<E> operator[](size_type idx) { return at(idx); }

From e3a728d6377857dc2b0f6dfb58e71f097a635cf2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 25 Jul 2018 20:16:44 +0200
Subject: [PATCH 822/916] Assert on invalid date in wxCalendarCtrl::SetDate()
 in all ports

This was done in wxMSW and wxQt but not in the native GTK+ nor the
generic version, even though they still asserted when actually trying to
use the invalid parameter later.

Make things more clear and consistent by asserting immediately and also
document the behaviour more clearly.
---
 interface/wx/calctrl.h   | 3 ++-
 src/generic/calctrlg.cpp | 2 ++
 src/gtk/calctrl.cpp      | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/interface/wx/calctrl.h b/interface/wx/calctrl.h
index 40bd51493d..a756e458e3 100644
--- a/interface/wx/calctrl.h
+++ b/interface/wx/calctrl.h
@@ -469,7 +469,8 @@ public:
 
         The @a date parameter must be valid and in the currently valid range as
         set by SetDateRange(), otherwise the current date is not changed and
-        the function returns @false.
+        the function returns @false and, additionally, triggers an assertion
+        failure if the date is invalid.
     */
     virtual bool SetDate(const wxDateTime& date);
 
diff --git a/src/generic/calctrlg.cpp b/src/generic/calctrlg.cpp
index 58875a3066..3c5b8ce4e9 100644
--- a/src/generic/calctrlg.cpp
+++ b/src/generic/calctrlg.cpp
@@ -434,6 +434,8 @@ bool wxGenericCalendarCtrl::EnableMonthChange(bool enable)
 
 bool wxGenericCalendarCtrl::SetDate(const wxDateTime& date)
 {
+    wxCHECK_MSG( date.IsValid(), false, "invalid date" );
+
     bool retval = true;
 
     bool sameMonth = m_date.GetMonth() == date.GetMonth(),
diff --git a/src/gtk/calctrl.cpp b/src/gtk/calctrl.cpp
index 221fa53ef5..fbeb93edf8 100644
--- a/src/gtk/calctrl.cpp
+++ b/src/gtk/calctrl.cpp
@@ -198,7 +198,9 @@ bool wxGtkCalendarCtrl::EnableMonthChange(bool enable)
 
 bool wxGtkCalendarCtrl::SetDate(const wxDateTime& date)
 {
-    if ( date.IsValid() && !IsInValidRange(date) )
+    wxCHECK_MSG( date.IsValid(), false, "invalid date" );
+
+    if ( !IsInValidRange(date) )
         return false;
 
     g_signal_handlers_block_by_func(m_widget,

From 9293634af148aea2cb6dfb11bd981b95f204d07e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 30 Jul 2018 21:48:48 +0200
Subject: [PATCH 823/916] Avoid assertion failure when typing into generic
 wxDatePickerCtrl

Don't call wxCalendarCtrl::SetDate() if the current date is invalid,
this would just result in an assertion failure.
---
 src/generic/datectlg.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index d5abccfd3a..f2a13d143a 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -192,7 +192,8 @@ private:
         if ( (dt.IsValid() && (!dtOld.IsValid() || dt != dtOld)) ||
                 (!dt.IsValid() && dtOld.IsValid()) )
         {
-            SetDate(dt);
+            if ( dt.IsValid() )
+                SetDate(dt);
             SendDateEvent(dt);
         }
     }

From b8401d2fb592b93cc16b54d3c1dab03f5a447a98 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 30 Jul 2018 22:03:21 +0200
Subject: [PATCH 824/916] Fix return value of
 wxCalendarComboPopup::ParseDateTime()

Don't pretend that empty string represents a valid date, this made no
sense and resulted in unwanted events with an invalid date on clearing
the text part of the generic wxDatePickerCtrl.
---
 src/generic/datectlg.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index f2a13d143a..94f5906fed 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -125,12 +125,9 @@ public:
     {
         wxASSERT(pDt);
 
-        if ( !s.empty() )
-        {
-            pDt->ParseFormat(s, m_format);
-            if ( !pDt->IsValid() )
-                return false;
-        }
+        pDt->ParseFormat(s, m_format);
+        if ( !pDt->IsValid() )
+            return false;
 
         return true;
     }
@@ -253,7 +250,7 @@ private:
     virtual void SetStringValue(const wxString& s) wxOVERRIDE
     {
         wxDateTime dt;
-        if ( !s.empty() && ParseDateTime(s, &dt) )
+        if ( ParseDateTime(s, &dt) )
             SetDate(dt);
         //else: keep the old value
     }

From d406f23e6787240cafc36b091fb6e5fbe2381e0b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 30 Jul 2018 22:05:32 +0200
Subject: [PATCH 825/916] Fix behaviour on focus loss in generic
 wxDatePickerCtrl

Don't send any events if the date is invalid when leaving the control.
Also, for the controls without wxDP_ALLOWNONE style, ensure that we
revert to the valid date we had before when this happens, as such
controls must, by definition, always have a valid sate.

Note that there already was a check for wxDP_ALLOWNONE, added back in
aae5ec8bbe0b14bd2f43708186428e3c09d10739 (and cherry-picked to master as
d6781628fda216a01fa99ae3e49805b1a98b6ef2), but it seemed to be reversed,
as it only set the date to invalid if the control did not have this
style.
---
 src/generic/datectlg.cpp | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 94f5906fed..f50a1bba65 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -180,18 +180,33 @@ private:
                 dt = dtOld;
         }
 
-        m_combo->SetText(GetStringValueFor(dt));
-
-        if ( !dt.IsValid() && HasDPFlag(wxDP_ALLOWNONE) )
-            return;
-
-        // notify that we had to change the date after validation
-        if ( (dt.IsValid() && (!dtOld.IsValid() || dt != dtOld)) ||
-                (!dt.IsValid() && dtOld.IsValid()) )
+        if ( dt.IsValid() )
         {
-            if ( dt.IsValid() )
-                SetDate(dt);
-            SendDateEvent(dt);
+            // Set it at wxCalendarCtrl level.
+            SetDate(dt);
+
+            // And show it in the text field.
+            m_combo->SetText(GetStringValue());
+
+            // And if the date has really changed, send an event about it.
+            if ( dt != dtOld )
+                SendDateEvent(dt);
+        }
+        else // Invalid date currently entered.
+        {
+            if ( HasDPFlag(wxDP_ALLOWNONE) )
+            {
+                // Clear the text part to indicate that the date is invalid.
+                // Would it be better to indicate this in some more clear way,
+                // e.g. maybe by using "[none]" or something like this?
+                m_combo->SetText(wxString());
+            }
+            else
+            {
+                // Restore the original value, as we can't have invalid value
+                // in this control.
+                m_combo->SetText(GetStringValue());
+            }
         }
     }
 

From d7351536c1a1f1eb3c46966e7baad386f2965861 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 30 Jul 2018 22:32:29 +0200
Subject: [PATCH 826/916] Change the data in generic wxDatePickerCtrl
 immediately

Accept the new date typed into the text control immediately if it's
valid. This is more consistent with the native MSW control behaviour and
avoids semi-duplicated events on text change and then on focus loss that
occurred before.
---
 src/generic/datectlg.cpp | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index f50a1bba65..5ddadc3933 100644
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -121,6 +121,34 @@ public:
         return m_combo->GetTextCtrl()->IsEmpty();
     }
 
+    // This is public because it is used by wxDatePickerCtrlGeneric itself to
+    // change the date when the text control field changes. The reason it's
+    // done there and not in this class itself is mostly historic.
+    void ChangeDateAndNotifyIfValid()
+    {
+        wxDateTime dt;
+        if ( !ParseDateTime(m_combo->GetValue(), &dt) )
+        {
+            // The user must be in the process of updating the date, don't do
+            // anything -- we'll take care of ensuring it's valid on focus loss
+            // later.
+            return;
+        }
+
+        if ( dt == GetDate() )
+        {
+            // No need to send event if the date hasn't changed.
+            return;
+        }
+
+        // We change the date immediately, as it's more consistent with the
+        // native MSW version and avoids another event on focus loss.
+        SetDate(dt);
+
+        SendDateEvent(dt);
+    }
+
+private:
     bool ParseDateTime(const wxString& s, wxDateTime* pDt)
     {
         wxASSERT(pDt);
@@ -144,8 +172,6 @@ public:
         datePicker->GetEventHandler()->ProcessEvent(event);
     }
 
-private:
-
     void OnCalKey(wxKeyEvent & ev)
     {
         if (ev.GetKeyCode() == WXK_ESCAPE && !ev.HasModifiers())
@@ -488,13 +514,8 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
     ev.SetId(GetId());
     GetParent()->GetEventHandler()->ProcessEvent(ev);
 
-    // We'll create an additional event if the date is valid.
-    // If the date isn't valid, the user's probably in the middle of typing
-    wxDateTime dt;
-    if ( !m_popup || !m_popup->ParseDateTime(m_combo->GetValue(), &dt) )
-        return;
-
-    m_popup->SendDateEvent(dt);
+    if ( m_popup )
+        m_popup->ChangeDateAndNotifyIfValid();
 }
 
 #endif // wxUSE_DATEPICKCTRL

From 11e6a40a971ceb571ffc8fcc0c45eeefbbae0a1a Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 31 Jul 2018 07:17:10 +0200
Subject: [PATCH 827/916] make sure your CFColors are created in the same
 default colorspace as the bitmaps, allowing roundtrip fidelity

see 24dbe9775c1901b24a514ead28923227922b30af
---
 src/osx/core/colour.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index 2fbb616e0d..05034106cb 100644
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -67,14 +67,11 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     m_green = g;
     m_blue = b;
     m_alpha = a ;
-
+    
     CGColorRef col = 0 ;
-#if wxOSX_USE_COCOA_OR_CARBON 
-    col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) );
-#else
     CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ;
     col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
-#endif
+    
     wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
     m_cgColour.reset( col );
 }
@@ -87,8 +84,10 @@ void wxColour::InitRGBColor( const RGBColor& col )
     m_green = col.green >> 8;
     m_alpha = wxALPHA_OPAQUE;
     CGColorRef cfcol;
-    cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
-                                        (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );
+    CGFloat components[4] = { (CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
+        (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ;
+    cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
+    
     wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color");
     m_cgColour.reset( cfcol );
 }

From 49e20a961d4670a9fd027c45cc22d0d2f1dfbddd Mon Sep 17 00:00:00 2001
From: Blake-Eryx <Blake-Eryx@users.noreply.github.com>
Date: Tue, 31 Jul 2018 13:16:40 +0200
Subject: [PATCH 828/916] Fix misspellings in comments and documentation

No real changes.

Closes https://github.com/wxWidgets/wxWidgets/pull/870
---
 include/wx/fswatcher.h                 | 2 +-
 include/wx/html/htmlwin.h              | 2 +-
 include/wx/msw/ole/safearray.h         | 4 ++--
 include/wx/osx/core/cfdataref.h        | 2 +-
 include/wx/osx/core/cfdictionary.h     | 2 +-
 include/wx/osx/core/cfref.h            | 4 ++--
 include/wx/private/fontmgr.h           | 4 ++--
 include/wx/richtext/richtextbuffer.h   | 2 +-
 include/wx/richtext/richtextctrl.h     | 4 ++--
 interface/wx/richtext/richtextbuffer.h | 2 +-
 interface/wx/richtext/richtextctrl.h   | 2 +-
 src/common/xpmdecod.cpp                | 2 +-
 src/gtk/radiobox.cpp                   | 2 +-
 src/html/chm.cpp                       | 8 ++++----
 src/motif/dcclient.cpp                 | 2 +-
 src/msw/mediactrl_wmp10.cpp            | 2 +-
 src/msw/menu.cpp                       | 4 ++--
 src/msw/ole/activex.cpp                | 2 +-
 src/osx/menu_osx.cpp                   | 4 ++--
 19 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h
index a29ff834e6..388fbc9c0f 100644
--- a/include/wx/fswatcher.h
+++ b/include/wx/fswatcher.h
@@ -337,7 +337,7 @@ public:
     int GetWatchedPathsCount() const;
 
     /**
-     * Retrevies all watched paths and places them in wxArrayString. Returns
+     * Retrieves all watched paths and places them in wxArrayString. Returns
      * the number of paths.
      *
      * TODO think about API here: we need to return more information (like is
diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index b91304d16e..8a81f1bd52 100644
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -146,7 +146,7 @@ protected:
     /**
         Virtual dtor.
 
-        It is not really needed in this case but at leats it prevents gcc from
+        It is not really needed in this case, but at least it prevents gcc from
         complaining about its absence.
      */
     virtual ~wxHtmlWindowMouseHelper() { }
diff --git a/include/wx/msw/ole/safearray.h b/include/wx/msw/ole/safearray.h
index fb5c70a399..02d052d54f 100644
--- a/include/wx/msw/ole/safearray.h
+++ b/include/wx/msw/ole/safearray.h
@@ -294,7 +294,7 @@ public:
         Converts the array to a wxVariant with the list type, regardless of the
         underlying SAFEARRAY type.
 
-        If the array is multidimensional, it is flattened using the alghoritm
+        If the array is multidimensional, it is flattened using the algorithm
         originally employed in wxConvertOleToVariant().
     */
     bool ConvertToVariant(wxVariant& variant) const
@@ -327,7 +327,7 @@ public:
         Converts an array to an ArrayString.
 
         Can be called only for wxSafeArray<VT_BSTR>. If the array is
-        multidimensional, it is flattened using the alghoritm originally
+        multidimensional, it is flattened using the algorithm originally
         employed in wxConvertOleToVariant().
     */
     bool ConvertToArrayString(wxArrayString& strings) const
diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h
index 54e7498243..8917451b16 100644
--- a/include/wx/osx/core/cfdataref.h
+++ b/include/wx/osx/core/cfdataref.h
@@ -40,7 +40,7 @@ public:
                     to transfer ownership of that reference to this ref holder.  If the object comes from
                     a Create or Copy method then this is the correct behaviour.  If the object comes from
                     a Get method then you must CFRetain it yourself before passing it to this constructor.
-                    A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
+                    A handy way to do this is to use the non-member wxCFRefFromGet factory function.
                     This method is templated and takes an otherType *p.  This prevents implicit conversion
                     using an operator refType() in a different ref-holding class type.
     */
diff --git a/include/wx/osx/core/cfdictionary.h b/include/wx/osx/core/cfdictionary.h
index 2088450060..5c2c3b4f93 100644
--- a/include/wx/osx/core/cfdictionary.h
+++ b/include/wx/osx/core/cfdictionary.h
@@ -41,7 +41,7 @@ public:
      to transfer ownership of that reference to this ref holder.  If the object comes from
      a Create or Copy method then this is the correct behaviour.  If the object comes from
      a Get method then you must CFRetain it yourself before passing it to this constructor.
-     A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
+     A handy way to do this is to use the non-member wxCFRefFromGet factory function.
      This method is templated and takes an otherType *p.  This prevents implicit conversion
      using an operator refType() in a different ref-holding class type.
      */
diff --git a/include/wx/osx/core/cfref.h b/include/wx/osx/core/cfref.h
index 54580da695..b441693779 100644
--- a/include/wx/osx/core/cfref.h
+++ b/include/wx/osx/core/cfref.h
@@ -172,7 +172,7 @@ public:
      to transfer ownership of that reference to this ref holder.  If the object comes from
      a Create or Copy method then this is the correct behaviour.  If the object comes from
      a Get method then you must CFRetain it yourself before passing it to this constructor.
-     A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
+     A handy way to do this is to use the non-member wxCFRefFromGet factory function.
      */
     wxCFRef(refType p) : m_ptr(p)
     {
@@ -186,7 +186,7 @@ public:
                     to transfer ownership of that reference to this ref holder.  If the object comes from
                     a Create or Copy method then this is the correct behaviour.  If the object comes from
                     a Get method then you must CFRetain it yourself before passing it to this constructor.
-                    A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
+                    A handy way to do this is to use the non-member wxCFRefFromGet factory function.
                     This method is templated and takes an otherType *p.  This prevents implicit conversion
                     using an operator refType() in a different ref-holding class type.
     */
diff --git a/include/wx/private/fontmgr.h b/include/wx/private/fontmgr.h
index c00270a6b1..76f2210f6e 100644
--- a/include/wx/private/fontmgr.h
+++ b/include/wx/private/fontmgr.h
@@ -70,7 +70,7 @@ public:
 
         @param ptSize   point size of the font to create; note that this is
                         a float and not integer, it should be wxFont's point
-                        size multipled by wxDC's scale factor
+                        size multiplied by wxDC's scale factor
         @param aa       should the font be antialiased?
      */
     virtual wxFontInstance *GetFontInstance(float ptSize, bool aa);
@@ -98,7 +98,7 @@ public:
     /// Returns name of the bundle
     virtual wxString GetName() const = 0;
 
-    /// Returns true if the font is fixe-width
+    /// Returns true if the font is fixed-width
     virtual bool IsFixed() const = 0;
 
     /// Type of faces in the bundle
diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 3320f27ba1..a3a900dde1 100644
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -505,7 +505,7 @@ public:
 
     /**
         Partial equality test. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a dim sare present. If @a weakTest is
+        have to be present if those attributes of @a dims are present. If @a weakTest is
         @false, the function will fail if an attribute is present in @a dims but not
         in this object.
 
diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index a15fe4e681..075f10df2a 100644
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -1247,7 +1247,7 @@ public:
     bool EndParagraphSpacing() { return GetBuffer().EndParagraphSpacing(); }
 
     /**
-        Begins appling line spacing. @e spacing is a multiple, where 10 means
+        Begins applying line spacing. @e spacing is a multiple, where 10 means
         single-spacing, 15 means 1.5 spacing, and 20 means double spacing.
 
         The ::wxTextAttrLineSpacing constants are defined for convenience.
@@ -1497,7 +1497,7 @@ public:
     virtual bool WordLeft(int noPages = 1, int flags = 0);
 
     /**
-        Move a nuber of words to the right.
+        Move a number of words to the right.
     */
     virtual bool WordRight(int noPages = 1, int flags = 0);
 
diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h
index b86c9bd32f..b58125debd 100644
--- a/interface/wx/richtext/richtextbuffer.h
+++ b/interface/wx/richtext/richtextbuffer.h
@@ -385,7 +385,7 @@ public:
 
     /**
         Partial equality test. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a dim sare present. If @a weakTest is
+        have to be present if those attributes of @a dims are present. If @a weakTest is
         @false, the function will fail if an attribute is present in @a dims but not
         in this object.
 
diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h
index da43e12720..3af29d13a5 100644
--- a/interface/wx/richtext/richtextctrl.h
+++ b/interface/wx/richtext/richtextctrl.h
@@ -1453,7 +1453,7 @@ public:
     virtual bool WordLeft(int noPages = 1, int flags = 0);
 
     /**
-        Move a nuber of words to the right.
+        Move a number of words to the right.
     */
     virtual bool WordRight(int noPages = 1, int flags = 0);
 
diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index f76418958c..4449f2a699 100644
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -246,7 +246,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
 * A hard coded rgb.txt. To keep it short I removed all colornames with        *
 * trailing numbers, Blue3 etc, except the GrayXX. Sorry Grey-lovers I prefer  *
 * Gray ;-). But Grey is recognized on lookups, only on save Gray will be      *
-* used, maybe you want to do some substitue there too.                        *
+* used, maybe you want to do some substitute there too.                        *
 *                                                                             *
 * To save memory the RGBs are coded in one long value, as done by the RGB     *
 * macro.                                                                      *
diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 635fba4a87..b75e127ecd 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -290,7 +290,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                          // So far we assumed that label doesn't contain mnemonic
                          // and therefore single underscore characters were not
                          // replaced by two underscores. Now we have to double
-                         // all exisiting underscore characters.
+                         // all existing underscore characters.
                          label.Replace(wxS("_"), wxS("__"));
                          label += wxS('_');
                      }
diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index 1ae32fb805..37012f4e23 100644
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -201,7 +201,7 @@ bool wxChmTools::Contains(const wxString& pattern)
 /**
  * Find()
  *
- * Finds the next file descibed by a pattern in the archive, starting
+ * Finds the next file described by a pattern in the archive, starting
  * the file given by second parameter
  *
  * @param pattern   The file-pattern to search for. May contain '*' and/or '?'
@@ -410,7 +410,7 @@ private:
 /**
  * Constructor
  * @param archive  The name of the .chm archive. Remember that archive must
- *                 be local file accesible via fopen, fread functions!
+ *                 be local file accessible via fopen, fread functions!
  * @param filename The Name of the file to be extracted from archive
  * @param simulate if true than class should simulate .HHP-File based on #SYSTEM
  *                 if false than class does nothing if it doesn't find .hhp
@@ -553,8 +553,8 @@ wxFileOffset wxChmInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
 
 /**
  * Help Browser tries to read the contents of the
- * file by interpreting a .hhp file in the Archiv.
- * For .chm doesn't include such a file, we need
+ * file by interpreting a .hhp file in the Archive.
+ * Because .chm doesn't include such a file, we need
  * to rebuild the information based on stored
  * system-files.
  */
diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index a259100ee7..6bf809572f 100644
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -2058,7 +2058,7 @@ void wxWindowDCImpl::SetDCClipping( WXRegion userRegion )
                           m_clipRegion );
     }
     // intersect the user region, if any, with the
-    // exisiting clip region
+    // existing clip region
     else // if( userRegion )
     {
         if( !m_clipRegion )
diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index d6a80fbacf..955303ca58 100644
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -29,7 +29,7 @@
 //
 // The ActiveX control itself is particularly stubborn, calling
 // IOleInPlaceSite::OnPosRectChange every file change trying to set itself
-// to something different then what we told it to before.
+// to something different from what we told it to before.
 //
 // The docs are at
 // http://msdn.microsoft.com/library/en-us/wmplay10/mmp_sdk/windowsmediaplayer10sdk.asp
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 1378f51131..4ebd6a5d2d 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -356,7 +356,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     // Update radio groups data if we're inserting a new menu item.
     // Inserting radio and non-radio item has a different impact
     // on radio groups so we have to handle each case separately.
-    // (Inserting a radio item in the middle of exisiting group extends
+    // (Inserting a radio item in the middle of existing group extends
     // the group, but inserting non-radio item breaks it into two subgroups.)
     //
     bool checkInitially = false;
@@ -372,7 +372,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     {
         if ( m_radioData->UpdateOnInsertNonRadio(pos) )
         {
-            // One of the exisiting groups has been split into two subgroups.
+            // One of the existing groups has been split into two subgroups.
             wxFAIL_MSG(wxS("Inserting non-radio item inside a radio group?"));
         }
     }
diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index b2f65a6b3c..2225a2998a 100644
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -429,7 +429,7 @@ public:
            //
            // Result of several hours and days of bug hunting -
            // this is called by an object when it wants to resize
-           // itself to something different then our parent window -
+           // itself to something different from our parent window -
            // don't let it :)
            //
 //            m_window->m_oleInPlaceObject->SetObjectRects(
diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp
index 0351c2dce6..f9d1f0d792 100644
--- a/src/osx/menu_osx.cpp
+++ b/src/osx/menu_osx.cpp
@@ -136,7 +136,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *item, size_t pos)
     // Update radio groups if we're inserting a new menu item.
     // Inserting radio and non-radio item has a different impact
     // on radio groups, so we have to handle each case separately.
-    // (Inserting a radio item in the middle of exisiting groups extends this group,
+    // (Inserting a radio item in the middle of existing groups extends this group,
     // but inserting a non-radio item breaks it into two subgroups.)
     bool check = false;
     if ( item->IsRadio() )
@@ -151,7 +151,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *item, size_t pos)
     {
         if ( m_radioData->UpdateOnInsertNonRadio(pos) )
         {
-            // One of the exisiting groups has been split into two subgroups.
+            // One of the existing groups has been split into two subgroups.
             wxFAIL_MSG(wxS("Inserting non-radio item inside a radio group?"));
         }
     }

From 148079c61858ad04a8faa7fa9c2e2949753f35b6 Mon Sep 17 00:00:00 2001
From: mill-j <mill-j@trac.wxwidgets.org>
Date: Tue, 31 Jul 2018 18:41:39 +0200
Subject: [PATCH 829/916] Fix building wxQt under HaikuOS and make it default

Recognize HaikuOS and work around several platforms with socket-related
functions there.

Also make wxQt the default port under this platform.

See #9168.
---
 build/aclocal/bakefile.m4 |   4 +-
 configure                 | 130 ++++++++++++++++++++++++++++++++++++--
 configure.in              |  52 +++++++++++++--
 docs/changes.txt          |   1 +
 4 files changed, 175 insertions(+), 12 deletions(-)

diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index c45c736cc1..438c071bf6 100644
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -385,7 +385,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
       ;;
 
       powerpc-apple-macos* | \
-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+      *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
       *-*-mirbsd* | \
       *-*-sunos4* | \
       *-*-osf* | \
@@ -435,7 +435,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
-      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | \
       *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
diff --git a/configure b/configure
index 779605646c..283e60c3a5 100755
--- a/configure
+++ b/configure
@@ -3807,6 +3807,7 @@ USE_OSF=                            USE_SGI=
 USE_SOLARIS=                        USE_SUN=                            USE_SUNOS=                          USE_SVR4=                           USE_SYSV=                           USE_VMS=
 USE_ULTRIX=
 USE_UNIXWARE=
+USE_HAIKU=
 
 USE_ALPHA=
 
@@ -4022,6 +4023,13 @@ case "${host}" in
 
   ;;
 
+  *-*-haiku* )
+    USE_HAIKU=1
+    $as_echo "#define __HAIKU__ 1" >>confdefs.h
+
+    DEFAULT_DEFAULT_wxUSE_QT=1
+  ;;
+
   *)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&5
 $as_echo "$as_me: WARNING: *** System type ${host} is unknown, assuming generic Unix and continuing nevertheless." >&2;}
@@ -32013,6 +32021,50 @@ fi
 $as_echo "$ac_cv_lib_socket_inet_addr" >&6; }
 if test "x$ac_cv_lib_socket_inet_addr" = xyes; then :
   INET_LINK="socket"
+else
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnetwork" >&5
+$as_echo_n "checking for inet_addr in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_inet_addr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnetwork  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inet_addr ();
+int
+main ()
+{
+return inet_addr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_network_inet_addr=yes
+else
+  ac_cv_lib_network_inet_addr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_inet_addr" >&5
+$as_echo "$ac_cv_lib_network_inet_addr" >&6; }
+if test "x$ac_cv_lib_network_inet_addr" = xyes; then :
+  INET_LINK="network"
+
+fi
+
+
 
 fi
 
@@ -33454,6 +33506,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test "x$ac_cv_func_gethostbyname" = xyes; then :
    $as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
 
+else
+
+                                    case "${host}" in
+                  *-*-haiku* )
+                    $as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Defining HAVE_GETHOSTBYNAME unconditionally under ${host}." >&5
+$as_echo "$as_me: WARNING: Defining HAVE_GETHOSTBYNAME unconditionally under ${host}." >&2;}
+                    ;;
+                  esac
+
+
 fi
 
       fi
@@ -33582,6 +33646,18 @@ if test "x$ac_cv_func_getservbyname" = xyes; then :
 _ACEOF
   $as_echo "#define HAVE_GETSERVBYNAME 1" >>confdefs.h
 
+else
+
+                                    case "${host}" in
+                  *-*-haiku* )
+                    $as_echo "#define HAVE_GETSERVBYNAME 1" >>confdefs.h
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Defining HAVE_GETSERVBYNAME unconditionally under ${host}." >&5
+$as_echo "$as_me: WARNING: Defining HAVE_GETSERVBYNAME unconditionally under ${host}." >&2;}
+                    ;;
+                  esac
+
+
 fi
 done
 
@@ -36140,9 +36216,55 @@ if test "x$ac_cv_lib_socket_socket" = xyes; then :
                     fi
 else
 
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: socket library not found - sockets will be disabled" >&5
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
+$as_echo_n "checking for socket in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnetwork  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
+int
+main ()
+{
+return socket ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_network_socket=yes
+else
+  ac_cv_lib_network_socket=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5
+$as_echo "$ac_cv_lib_network_socket" >&6; }
+if test "x$ac_cv_lib_network_socket" = xyes; then :
+  if test "$INET_LINK" != " -lnetwork"; then
+                                INET_LINK="$INET_LINK -lnetwork"
+                            fi
+else
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: socket library not found - sockets will be disabled" >&5
 $as_echo "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;}
-                        wxUSE_SOCKETS=no
+                                wxUSE_SOCKETS=no
+
+
+fi
+
 
 
 fi
@@ -40090,7 +40212,7 @@ fi
       ;;
 
       powerpc-apple-macos* | \
-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+      *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
       *-*-mirbsd* | \
       *-*-sunos4* | \
       *-*-osf* | \
@@ -40130,7 +40252,7 @@ fi
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
-      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | \
       *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
diff --git a/configure.in b/configure.in
index 7720f2f5d9..08a9f46b1a 100644
--- a/configure.in
+++ b/configure.in
@@ -87,6 +87,7 @@ USE_SYSV=                           dnl any System V
 USE_VMS=
 USE_ULTRIX=
 USE_UNIXWARE=
+USE_HAIKU=
 
 dnl hardware platform
 USE_ALPHA=
@@ -294,6 +295,12 @@ case "${host}" in
     AC_DEFINE(__BEOS__)
   ;;
 
+  *-*-haiku* )
+    USE_HAIKU=1
+    AC_DEFINE(__HAIKU__)
+    DEFAULT_DEFAULT_wxUSE_QT=1
+  ;;
+
   *)
     AC_MSG_WARN([*** System type ${host} is unknown, assuming generic Unix and continuing nevertheless.])
     AC_MSG_WARN([*** Please report the build results to wx-dev@googlegroups.com.])
@@ -4483,7 +4490,7 @@ fi
 WX_CHECK_FUNCS(strtok_r, [], [], [#define _REENTRANT])
 
 dnl check for inet_addr and inet_aton (these may live either in libc, or in
-dnl libnsl or libresolv or libsocket)
+dnl libnsl or libresolv or libsocket or libnetwork under Haiku)
 INET_LINK=
 AC_CHECK_FUNCS(inet_addr,
     AC_DEFINE(HAVE_INET_ADDR),
@@ -4495,7 +4502,12 @@ AC_CHECK_FUNCS(inet_addr,
                     INET_LINK="resolv",
                     [
                         AC_CHECK_LIB(socket, inet_addr,
-                            INET_LINK="socket"
+                            INET_LINK="socket",
+                            [
+				AC_CHECK_LIB(network, inet_addr,
+                                   INET_LINK="network"
+                                )
+                            ]
                         )
                     ]
                 )
@@ -5043,7 +5055,17 @@ dnl AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO), [
       AX_FUNC_WHICH_GETHOSTBYNAME_R
       if test "x$ac_cv_func_which_gethostbyname_r" = "xno" -o \
               "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then
-          AC_CHECK_FUNC(gethostbyname, [ AC_DEFINE(HAVE_GETHOSTBYNAME) ])
+          AC_CHECK_FUNC(gethostbyname, [ AC_DEFINE(HAVE_GETHOSTBYNAME) ],
+              [
+                  dnl Under HaikuOS it is not yet detected
+                  case "${host}" in
+                  *-*-haiku* )
+                    AC_DEFINE(HAVE_GETHOSTBYNAME)
+                    AC_MSG_WARN([Defining HAVE_GETHOSTBYNAME unconditionally under ${host}.])
+                    ;;
+                  esac
+              ]
+           )
       fi
       dnl A similar test for getservbyname_r
       dnl I'm tempted to just not do this test which is taking much time and
@@ -5052,7 +5074,17 @@ dnl AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO), [
       AC_raf_FUNC_WHICH_GETSERVBYNAME_R
       if test "x$ac_cv_func_which_getservbyname_r" = "xno" -o \
               "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then
-          AC_CHECK_FUNCS(getservbyname,[ AC_DEFINE(HAVE_GETSERVBYNAME) ])
+          AC_CHECK_FUNCS(getservbyname,[ AC_DEFINE(HAVE_GETSERVBYNAME) ],
+              [
+                  dnl Under HaikuOS it is not yet detected
+                  case "${host}" in
+                  *-*-haiku* )
+                    AC_DEFINE(HAVE_GETSERVBYNAME)
+                    AC_MSG_WARN([Defining HAVE_GETSERVBYNAME unconditionally under ${host}.])
+                    ;;
+                  esac
+              ]
+           )
       fi
       dnl For gethostbyaddr_r, we currently do no separate test, instead, we
       dnl silently assume it's available exactly if gethostbyname_r is
@@ -6083,8 +6115,16 @@ if test "$wxUSE_SOCKETS" = "yes"; then
                         INET_LINK="$INET_LINK -lsocket"
                     fi,
                     [
-                        AC_MSG_WARN([socket library not found - sockets will be disabled])
-                        wxUSE_SOCKETS=no
+                        dnl under Haiku, socket is in libnetwork
+                        AC_CHECK_LIB(network, socket,
+                            if test "$INET_LINK" != " -lnetwork"; then
+                                INET_LINK="$INET_LINK -lnetwork"
+                            fi,
+                            [
+                                AC_MSG_WARN([socket library not found - sockets will be disabled])
+                                wxUSE_SOCKETS=no
+                            ]
+                        )
                     ]
                 )
             ]
diff --git a/docs/changes.txt b/docs/changes.txt
index 53be80064f..684d8617a9 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -95,6 +95,7 @@ All:
 - Add wxLZMA{Input,Output}Stream classes using external liblzma.
 - Make wxList and wxVector iterators conform to input iterator requirements.
 - Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
+- Fix build issues under HaikuOS (mill-j).
 
 All (GUI):
 

From 95857a1f71bd0c19e3059ebf0eea28e9bb8b7602 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Tue, 31 Jul 2018 23:00:49 -0400
Subject: [PATCH 830/916] Give an error when trying to use wxGLCanvas on
 non-X11 display

Currently, wxGLCanvas on wxGTK is only supported on X11 displays.  If a
user attempts to use wxGLCanvas on Wayland, for example, the application
will core dump.  This change adds an error message and a suggested
workaround until wxGLCanvas is supported on Wayland.

See #17702.

Closes https://github.com/wxWidgets/wxWidgets/pull/871
---
 src/gtk/glcanvas.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 5cfdb34f40..61fd25ee2c 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -222,6 +222,19 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
 
 #endif // WXWIN_COMPATIBILITY_2_8
 
+static bool IsAvailable()
+{
+#ifdef GDK_WINDOWING_X11
+    if ( !GDK_IS_X11_DISPLAY(gdk_display_get_default()) )
+#endif
+    {
+        wxSafeShowMessage(_("Fatal Error"), _("wxGLCanvas is only supported on X11 currently.  You may be able to\nwork around this by setting environment variable GDK_BACKEND=x11 before starting\nyour program."));
+        return false;
+    }
+
+    return true;
+}
+
 bool wxGLCanvas::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxPoint& pos,
@@ -231,6 +244,9 @@ bool wxGLCanvas::Create(wxWindow *parent,
                         const int *attribList,
                         const wxPalette& palette)
 {
+    if ( !IsAvailable() )
+        return false;
+
     // Separate 'GLXFBConfig/XVisual' attributes.
     // Also store context attributes for wxGLContext ctor
     wxGLAttributes dispAttrs;
@@ -249,6 +265,9 @@ bool wxGLCanvas::Create(wxWindow *parent,
                         const wxString& name,
                         const wxPalette& palette)
 {
+    if ( !IsAvailable() )
+        return false;
+
 #if wxUSE_PALETTE
     wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
 #endif // wxUSE_PALETTE

From c83f3b39424fd0d6690a64ba05277c77c077b861 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 1 Aug 2018 12:02:51 +0200
Subject: [PATCH 831/916] Clarify wxDateTime::GetTicks() limitation even more

Explain that this function exists only for interoperability purposes and
that GetValue() should be preferred for anything else.

Closes #18182.
---
 interface/wx/datetime.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/interface/wx/datetime.h b/interface/wx/datetime.h
index a643280209..0851e59b2e 100644
--- a/interface/wx/datetime.h
+++ b/interface/wx/datetime.h
@@ -572,9 +572,13 @@ public:
     /**
         Returns the number of seconds since Jan 1, 1970 UTC.
 
-        If the date is not in the range covered by 32 bit @c time_t type, @c -1
-        is returned, use GetValue() if you work with dates outside of this
-        range.
+        This function is provided solely for interoperability with the standard
+        C library and other libraries using @c time_t values. If you just need
+        to get the value represented by this object as a number, use GetValue()
+        instead, which doesn't lose precision and covers the entire supported
+        range of dates, unlike this one which is limited to the range of
+        positive 32 bit values, i.e. from Jan 1, 1970 to around Jan 19, 2038
+        and returns @c -1 for the dates outside of it.
 
         Additionally, this method must be called on an initialized date object
         and an assertion failure occurs if it is called on an object for which

From 9d47b1956eb499efaf7187818089d4543dc32726 Mon Sep 17 00:00:00 2001
From: Vitaly Stakhovsky <vvs31415@gitlab.com>
Date: Thu, 2 Aug 2018 01:10:14 +0200
Subject: [PATCH 832/916] Tidy up wxGenericFontDialog code a little

Make the (originally) auto-generated code of this dialog slightly more
readable by replacing some auto-generated variable names with more clear
ones.

Also avoid using FindWindow(), this is useless and we already have the
window pointers.

Closes https://github.com/wxWidgets/wxWidgets/pull/872
---
 include/wx/generic/fontdlgg.h |  4 +-
 src/generic/fontdlgg.cpp      | 82 ++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index 4d01c899e4..0df6d3b0ce 100644
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -78,7 +78,9 @@ private:
     wxChoice *m_colourChoice;
     wxCheckBox *m_underLineCheckBox;
 
-#if !USE_SPINCTRL_FOR_POINT_SIZE
+#if USE_SPINCTRL_FOR_POINT_SIZE
+    wxSpinCtrl *m_pointSizeSpin;
+#else
     wxChoice   *m_pointSizeChoice;
 #endif
 
diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 4908035680..dd1dbcc60e 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -371,36 +371,37 @@ void wxGenericFontDialog::CreateWidgets()
     wxStaticText* itemStaticText6 = new wxStaticText( this, wxID_STATIC, _("&Font family:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
 
-    wxChoice* itemChoice7 = new wxChoice( this, wxID_FONT_FAMILY, wxDefaultPosition, wxDefaultSize, 5, families, 0 );
-    itemChoice7->SetHelpText(_("The font family."));
+    m_familyChoice = new wxChoice( this, wxID_FONT_FAMILY, wxDefaultPosition, wxDefaultSize, 5, families, 0 );
+    m_familyChoice->SetHelpText(_("The font family."));
     if (ShowToolTips())
-        itemChoice7->SetToolTip(_("The font family."));
-    itemBoxSizer5->Add(itemChoice7, 0, wxALIGN_LEFT|wxALL, 5);
+        m_familyChoice->SetToolTip(_("The font family."));
+    itemBoxSizer5->Add(m_familyChoice, 0, wxALIGN_LEFT|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
     itemGridSizer4->Add(itemBoxSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
     wxStaticText* itemStaticText9 = new wxStaticText( this, wxID_STATIC, _("&Style:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
 
-    wxChoice* itemChoice10 = new wxChoice( this, wxID_FONT_STYLE, wxDefaultPosition, wxDefaultSize, 3, styles, 0 );
-    itemChoice10->SetHelpText(_("The font style."));
+    m_styleChoice = new wxChoice( this, wxID_FONT_STYLE, wxDefaultPosition, wxDefaultSize, 3, styles, 0 );
+    m_styleChoice->SetHelpText(_("The font style."));
     if (ShowToolTips())
-        itemChoice10->SetToolTip(_("The font style."));
-    itemBoxSizer8->Add(itemChoice10, 0, wxALIGN_LEFT|wxALL, 5);
+        m_styleChoice->SetToolTip(_("The font style."));
+    itemBoxSizer8->Add(m_styleChoice, 0, wxALIGN_LEFT|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
     itemGridSizer4->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
     wxStaticText* itemStaticText12 = new wxStaticText( this, wxID_STATIC, _("&Weight:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer11->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
 
-    wxChoice* itemChoice13 = new wxChoice( this, wxID_FONT_WEIGHT, wxDefaultPosition, wxDefaultSize, 3, weights, 0 );
-    itemChoice13->SetHelpText(_("The font weight."));
+    m_weightChoice = new wxChoice( this, wxID_FONT_WEIGHT, wxDefaultPosition, wxDefaultSize, 3, weights, 0 );
+    m_weightChoice->SetHelpText(_("The font weight."));
     if (ShowToolTips())
-        itemChoice13->SetToolTip(_("The font weight."));
-    itemBoxSizer11->Add(itemChoice13, 0, wxALIGN_LEFT|wxALL, 5);
+        m_weightChoice->SetToolTip(_("The font weight."));
+    itemBoxSizer11->Add(m_weightChoice, 0, wxALIGN_LEFT|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer14 = new wxBoxSizer(wxVERTICAL);
     itemGridSizer4->Add(itemBoxSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
+    m_colourChoice = NULL;
     if (m_fontData.GetEnableEffects())
     {
         wxStaticText* itemStaticText15 = new wxStaticText( this, wxID_STATIC, _("C&olour:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -410,11 +411,11 @@ void wxGenericFontDialog::CreateWidgets()
         if (is_pda)
             colourSize.x = 100;
 
-        wxChoice* itemChoice16 = new wxChoice( this, wxID_FONT_COLOUR, wxDefaultPosition, colourSize, NUM_COLS, wxColourDialogNames, 0 );
-        itemChoice16->SetHelpText(_("The font colour."));
+        m_colourChoice = new wxChoice( this, wxID_FONT_COLOUR, wxDefaultPosition, colourSize, NUM_COLS, wxColourDialogNames, 0 );
+        m_colourChoice->SetHelpText(_("The font colour."));
         if (ShowToolTips())
-            itemChoice16->SetToolTip(_("The font colour."));
-        itemBoxSizer14->Add(itemChoice16, 0, wxALIGN_LEFT|wxALL, 5);
+            m_colourChoice->SetToolTip(_("The font colour."));
+        itemBoxSizer14->Add(m_colourChoice, 0, wxALIGN_LEFT|wxALL, 5);
     }
 
     wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);
@@ -423,30 +424,30 @@ void wxGenericFontDialog::CreateWidgets()
     itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
 
 #if USE_SPINCTRL_FOR_POINT_SIZE
-    wxSpinCtrl* spinCtrl = new wxSpinCtrl(this, wxID_FONT_SIZE, wxT("12"), wxDefaultPosition, wxSize(80, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 500, 12);
-    spinCtrl->SetHelpText(_("The font point size."));
+    m_pointSizeSpin = new wxSpinCtrl(this, wxID_FONT_SIZE, wxT("12"), wxDefaultPosition, wxSize(80, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 500, 12);
+    m_pointSizeSpin->SetHelpText(_("The font point size."));
     if (ShowToolTips())
-        spinCtrl->SetToolTip(_("The font point size."));
-
-    itemBoxSizer17->Add(spinCtrl, 0, wxALIGN_LEFT|wxALL, 5);
+        m_pointSizeSpin->SetToolTip(_("The font point size."));
+    itemBoxSizer17->Add(m_pointSizeSpin, 0, wxALIGN_LEFT|wxALL, 5);
 #else
-    wxChoice* itemChoice19 = new wxChoice( this, wxID_FONT_SIZE, wxDefaultPosition, wxDefaultSize, 40, pointSizes, 0 );
-    itemChoice19->SetHelpText(_("The font point size."));
+    m_pointSizeChoice = new wxChoice( this, wxID_FONT_SIZE, wxDefaultPosition, wxDefaultSize, 40, pointSizes, 0 );
+    m_pointSizeChoice->SetHelpText(_("The font point size."));
     if (ShowToolTips())
-        itemChoice19->SetToolTip(_("The font point size."));
-    itemBoxSizer17->Add(itemChoice19, 0, wxALIGN_LEFT|wxALL, 5);
+        m_pointSizeChoice->SetToolTip(_("The font point size."));
+    itemBoxSizer17->Add(m_pointSizeChoice, 0, wxALIGN_LEFT|wxALL, 5);
 #endif
 
+    m_underLineCheckBox = NULL;
     if (m_fontData.GetEnableEffects())
     {
         wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxVERTICAL);
         itemGridSizer4->Add(itemBoxSizer20, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
-        wxCheckBox* itemCheckBox21 = new wxCheckBox( this, wxID_FONT_UNDERLINE, _("&Underline"), wxDefaultPosition, wxDefaultSize, 0 );
-        itemCheckBox21->SetValue(false);
-        itemCheckBox21->SetHelpText(_("Whether the font is underlined."));
+        m_underLineCheckBox = new wxCheckBox( this, wxID_FONT_UNDERLINE, _("&Underline"), wxDefaultPosition, wxDefaultSize, 0 );
+        m_underLineCheckBox->SetValue(false);
+        m_underLineCheckBox->SetHelpText(_("Whether the font is underlined."));
         if (ShowToolTips())
-            itemCheckBox21->SetToolTip(_("Whether the font is underlined."));
-        itemBoxSizer20->Add(itemCheckBox21, 0, wxALIGN_LEFT|wxALL, 5);
+            m_underLineCheckBox->SetToolTip(_("Whether the font is underlined."));
+        itemBoxSizer20->Add(m_underLineCheckBox, 0, wxALIGN_LEFT|wxALL, 5);
     }
 
     if (!is_pda)
@@ -455,12 +456,11 @@ void wxGenericFontDialog::CreateWidgets()
     wxStaticText* itemStaticText23 = new wxStaticText( this, wxID_STATIC, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer3->Add(itemStaticText23, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
 
-    wxFontPreviewer* itemWindow24 = new wxFontPreviewer( this );
-    m_previewer = itemWindow24;
-    itemWindow24->SetHelpText(_("Shows the font preview."));
+    m_previewer = new wxFontPreviewer( this );
+    m_previewer->SetHelpText(_("Shows the font preview."));
     if (ShowToolTips())
-        itemWindow24->SetToolTip(_("Shows the font preview."));
-    itemBoxSizer3->Add(itemWindow24, 1, wxGROW|wxALL, 5);
+        m_previewer->SetToolTip(_("Shows the font preview."));
+    itemBoxSizer3->Add(m_previewer, 1, wxGROW|wxALL, 5);
 
     wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL);
     itemBoxSizer3->Add(itemBoxSizer25, 0, wxGROW, 5);
@@ -492,12 +492,6 @@ void wxGenericFontDialog::CreateWidgets()
     itemBoxSizer25->Add(itemButton28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 #endif
 
-    m_familyChoice = (wxChoice*) FindWindow(wxID_FONT_FAMILY);
-    m_styleChoice = (wxChoice*) FindWindow(wxID_FONT_STYLE);
-    m_weightChoice = (wxChoice*) FindWindow(wxID_FONT_WEIGHT);
-    m_colourChoice = (wxChoice*) FindWindow(wxID_FONT_COLOUR);
-    m_underLineCheckBox = (wxCheckBox*) FindWindow(wxID_FONT_UNDERLINE);
-
     m_familyChoice->SetStringSelection( wxFontFamilyIntToString(m_dialogFont.GetFamily()) );
     m_styleChoice->SetStringSelection(wxFontStyleIntToString(m_dialogFont.GetStyle()));
     m_weightChoice->SetStringSelection(wxFontWeightIntToString(m_dialogFont.GetWeight()));
@@ -517,9 +511,8 @@ void wxGenericFontDialog::CreateWidgets()
     }
 
 #if USE_SPINCTRL_FOR_POINT_SIZE
-    spinCtrl->SetValue(m_dialogFont.GetPointSize());
+    m_pointSizeSpin->SetValue(m_dialogFont.GetPointSize());
 #else
-    m_pointSizeChoice = (wxChoice*) FindWindow(wxID_FONT_SIZE);
     m_pointSizeChoice->SetSelection(m_dialogFont.GetPointSize()-1);
 #endif
 
@@ -578,8 +571,7 @@ void wxGenericFontDialog::DoChangeFont()
     wxFontWeight fontWeight = wxFontWeightStringToInt(m_weightChoice->GetStringSelection());
     wxFontStyle fontStyle = wxFontStyleStringToInt(m_styleChoice->GetStringSelection());
 #if USE_SPINCTRL_FOR_POINT_SIZE
-    wxSpinCtrl* fontSizeCtrl = wxDynamicCast(FindWindow(wxID_FONT_SIZE), wxSpinCtrl);
-    int fontSize = fontSizeCtrl->GetValue();
+    int fontSize = m_pointSizeSpin->GetValue();
 #else
     int fontSize = wxAtoi(m_pointSizeChoice->GetStringSelection());
 #endif

From b91ab1724c8f459e8dad10f5c5d58d6caa9a2077 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 29 Jul 2018 22:39:12 +0200
Subject: [PATCH 833/916] Try to better explain how to use wxWidgets from user
 projects

Notably mention the need to add the path to the build-specific setup.h
file.

Also refer to CMake to help people using this build system.

Closes https://github.com/wxWidgets/wxWidgets/pull/864
---
 docs/msw/install.txt | 55 ++++++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index f5093ee160..edc62025ae 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -27,6 +27,12 @@ Otherwise, or if you want to build a configuration of the library
 different from the default one, you need to build the library from
 sources before using it.
 
+If you use CMake, please see
+
+    https://docs.wxwidgets.org/trunk/overview_cmake.html
+
+for building wxWidgets using it.
+
 The first step, which you may have already performed, unless you are
 reading this file online, is to download the source archive and
 uncompress it in any directory. It is strongly advised to avoid using
@@ -491,21 +497,35 @@ LDFLAGS
 Building Applications Using wxWidgets
 =====================================
 
-NB: The makefiles and project files provided with wxWidgets samples show which
-    flags should be used when building applications using wxWidgets so in case
-    of a problem, e.g. if the instructions here are out of date, you can always
-    simply copy a makefile or project file from %WXWIN%\samples\minimal or some
-    other sample and adapt it to your application.
+If you want to use CMake for building your project, please see
 
-Independently of the compiler and make/IDE you are using you must do the
-following to use wxWidgets sources under the directory $WXWIN (notice that
+    https://docs.wxwidgets.org/trunk/overview_cmake.html#cmake_apps
+
+Otherwise follow the instructions below for "manual" setup of your project.
+
+We suppose that wxWidgets sources are under the directory $WXWIN (notice that
 different tool chains refer to environment variables such as WXWIN in
-different ways, e.g. MSVC users should use $(WXWIN) instead of just $WXWIN):
+different ways, e.g. MSVC users should use $(WXWIN) instead of just
+$WXWIN). And we will use <wx-lib-dir> as a shortcut for the subdirectory of
+$WXWIN\lib which is composed from several parts separated by underscore:
+first, a compiler-specific prefix (e.g. "vc" for MSVC, "gcc" for g++ or the
+value of COMPILER_PREFIX if you set it explicitly), then optional "x64" if
+building in 64 bits and finally either "lib" or "dll" depending on whether
+static or dynamic wx libraries are being used.
+
+For example, WXWIN could be "c:\wxWidgets\3.4.5" and <wx-lib-dir> could be
+"c:\wxWidgets\3.4.5\lib\vc_x64_lib" for 64-bit static libraries built with
+MSVC.
+
+Here is what you need to do:
 
 * Add $WXWIN\include to the
   - compiler
   - resource compiler
   include paths.
+* If using MSVC, prepend $WXWIN\include\msvc to the include paths too.
+  Otherwise, append <wx-lib-dir>\mswu[d] to the include paths, where "d" should
+  be used for debug builds only.
 * Define the following symbols for the preprocessor:
   - __WXMSW__ to ensure you use the correct wxWidgets port.
   - _UNICODE unless you want to use deprecated ANSI build of wxWidgets.
@@ -513,8 +533,12 @@ different ways, e.g. MSVC users should use $(WXWIN) instead of just $WXWIN):
   - WXUSINGDLL if you are using DLL build of wxWidgets.
 * If using MSVC 7 only (i.e. not for later versions), also define
   wxUSE_RC_MANIFEST=1 and WX_CPU_X86.
-* Add $WXWIN\lib\prefix_lib-or-dll to the libraries path. The prefix depends
-  on the compiler, by default it is "vc" for MSVC, "gcc" for g++ and so on.
+* Add <wx-lib-dir> directory described above to the libraries path.
+
+When using MSVC, the libraries are linked automatically using "#pragma
+comment(lib)" feature of this compiler. With all the other compilers you also
+need to:
+
 * Add the list of libraries to link with to the linker input. The exact list
   depends on which libraries you use and whether you built wxWidgets in
   monolithic or default multlib mode and basically should include all the
@@ -524,8 +548,9 @@ different ways, e.g. MSVC users should use $(WXWIN) instead of just $WXWIN):
   (all wxWidgets applications use the base library).
 
 
-Microsoft Visual C++ users can simplify the linker setup by prepending
-"$(WXWIN)\include\msvc" to the include path (it must come before the
-"$(WXWIN)\include" part!) and omitting the last step: the required libraries
-will be linked in automatically using the "#pragma comment(lib)" feature of
-this compiler.
+Finally, please notice that the makefiles and project files provided with
+wxWidgets samples show which flags should be used when building applications
+using wxWidgets and always work, so in case of a problem, e.g. if the
+instructions here are out of date, you can always simply copy a makefile or
+project file from $WXWIN\samples\minimal or some other sample and adapt it to
+your application.

From 3c0ea566fd60abcc614f27b2d9c3cf571830a58d Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Mon, 30 Jul 2018 23:53:07 +0200
Subject: [PATCH 834/916] CMake: copy data files of test projects

Add headers to source files so they are included in IDE projects.
---
 build/cmake/functions.cmake              | 22 ++++++++-
 build/cmake/tests/base/CMakeLists.txt    | 22 ++++++++-
 build/cmake/tests/drawing/CMakeLists.txt | 19 +++++++-
 build/cmake/tests/gui/CMakeLists.txt     | 58 +++++++++++++++++++++++-
 4 files changed, 117 insertions(+), 4 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index e70cf91763..84fe6e3f7d 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -753,8 +753,17 @@ macro(wx_dependent_option option doc default depends force)
 endmacro()
 
 # wx_add_test(<name> [src...])
+# Optionally:
+# DATA followed by required data files
+# RES followed by WIN32 .rc files
 function(wx_add_test name)
-    wx_list_add_prefix(test_src "${wxSOURCE_DIR}/tests/" ${ARGN})
+    cmake_parse_arguments(TEST "" "" "DATA;RES" ${ARGN})
+    wx_list_add_prefix(test_src "${wxSOURCE_DIR}/tests/" ${TEST_UNPARSED_ARGUMENTS})
+    if(WIN32 AND TEST_RES)
+        foreach(res ${TEST_RES})
+            list(APPEND test_src ${wxSOURCE_DIR}/tests/${res})
+        endforeach()
+    endif()
     if(wxBUILD_PRECOMP AND MSVC)
         # Add dummy source file to be used by cotire for PCH creation
         list(INSERT test_src 0 "${wxSOURCE_DIR}/tests/dummy.cpp")
@@ -765,6 +774,17 @@ function(wx_add_test name)
     if(wxBUILD_SHARED)
         target_compile_definitions(${name} PRIVATE WXUSINGDLL)
     endif()
+    if(TEST_DATA)
+        # Copy data files to output directory
+        foreach(data_file ${TEST_DATA})
+            list(APPEND cmds COMMAND ${CMAKE_COMMAND}
+                -E copy ${wxSOURCE_DIR}/tests/${data_file}
+                ${wxOUTPUT_DIR}/${wxPLATFORM_LIB_DIR}/${data_file})
+        endforeach()
+        add_custom_command(
+            TARGET ${name} ${cmds}
+            COMMENT "Copying test data files...")
+    endif()
     wx_set_common_target_properties(${name})
     set_target_properties(${name} PROPERTIES FOLDER "Tests")
     set_target_properties(${name} PROPERTIES
diff --git a/build/cmake/tests/base/CMakeLists.txt b/build/cmake/tests/base/CMakeLists.txt
index 0b412b567c..9cab7a5079 100644
--- a/build/cmake/tests/base/CMakeLists.txt
+++ b/build/cmake/tests/base/CMakeLists.txt
@@ -92,13 +92,33 @@ set(TEST_SRC
     weakref/evtconnection.cpp
     weakref/weakref.cpp
     xlocale/xlocale.cpp
+
+    testprec.h
+    testableframe.h
+    testdate.h
+    testfile.h
+    archive/archivetest.h
+    streams/bstream.h
     )
 
 if(wxUSE_XML)
     list(APPEND TEST_SRC xml/xmltest.cpp)
 endif()
 
-wx_add_test(test_base ${TEST_SRC})
+set(TEST_DATA
+    intl/fr/internat.mo
+    intl/fr/internat.po
+    intl/ja/internat.mo
+    intl/ja/internat.po
+    horse.bmp
+    horse.png
+    horse.xpm
+    testdata.fc
+    )
+
+wx_add_test(test_base ${TEST_SRC}
+    DATA ${TEST_DATA}
+    )
 target_compile_definitions(test_base PRIVATE wxUSE_GUI=0 wxUSE_BASE=1)
 if(wxUSE_SOCKETS)
     wx_exe_link_libraries(test_base net)
diff --git a/build/cmake/tests/drawing/CMakeLists.txt b/build/cmake/tests/drawing/CMakeLists.txt
index f9dbc7c0cf..888f6b79e6 100644
--- a/build/cmake/tests/drawing/CMakeLists.txt
+++ b/build/cmake/tests/drawing/CMakeLists.txt
@@ -20,8 +20,25 @@ set(TEST_DRAWING_SRC
     drawing/plugindriver.cpp
     drawing/basictest.cpp
     drawing/fonttest.cpp
+
+    testprec.h
+    testableframe.h
+    testimage.h
+    drawing/gcfactory.h
+    drawing/plugin.h
+    drawing/pluginsample.cpp
+    drawing/testimagefile.h
+    )
+
+set(TEST_DRAWING_DATA
+    drawing/references/image_test_image_cairo-1.8_2_ref.png
+    drawing/references/image_test_image_cg-10.5_2_ref.png
+    drawing/references/image_test_image_gdiplus-6.1_2_ref.png
+    )
+
+wx_add_test(test_drawing ${TEST_DRAWING_SRC}
+    DATA ${TEST_DRAWING_DATA}
     )
-wx_add_test(test_drawing ${TEST_DRAWING_SRC})
 if(wxUSE_SOCKETS)
     wx_exe_link_libraries(test_drawing net)
 endif()
diff --git a/build/cmake/tests/gui/CMakeLists.txt b/build/cmake/tests/gui/CMakeLists.txt
index 9043048348..450e75e0c2 100644
--- a/build/cmake/tests/gui/CMakeLists.txt
+++ b/build/cmake/tests/gui/CMakeLists.txt
@@ -109,8 +109,64 @@ set(TEST_GUI_SRC
     window/clientsize.cpp
     window/setsize.cpp
     xml/xrctest.cpp
+
+    testprec.h
+    testableframe.h
+    asserthelper.h
+    testdate.h
+    testfile.h
+    testimage.h
+    controls/bookctrlbasetest.h
+    controls/itemcontainertest.h
+    controls/listbasetest.h
+    controls/pickerbasetest.h
+    controls/textentrytest.h
+    persistence/testpersistence.h
+    )
+
+set(TEST_GUI_DATA
+    horse.ani
+    horse.bmp
+    horse.cur
+    horse.gif
+    horse.ico
+    horse.jpg
+    horse.pcx
+    horse.png
+    horse.pnm
+    horse.tga
+    horse.tif
+    horse.xpm
+    image/horse_grey.bmp
+    image/horse_grey_flipped.bmp
+    image/horse_rle4.bmp
+    image/horse_rle4_flipped.bmp
+    image/horse_rle8.bmp
+    image/horse_rle8_flipped.bmp
+    image/cross_bicubic_256x256.png
+    image/cross_bilinear_256x256.png
+    image/cross_box_average_256x256.png
+    image/cross_nearest_neighb_256x256.png
+    image/horse_bicubic_50x50.png
+    image/horse_bicubic_100x100.png
+    image/horse_bicubic_150x150.png
+    image/horse_bicubic_300x300.png
+    image/horse_bilinear_50x50.png
+    image/horse_bilinear_100x100.png
+    image/horse_bilinear_150x150.png
+    image/horse_bilinear_300x300.png
+    image/horse_box_average_50x50.png
+    image/horse_box_average_100x100.png
+    image/horse_box_average_150x150.png
+    image/horse_box_average_300x300.png
+    intl/ja/internat.mo
+    intl/ja/internat.po
+    )
+
+wx_add_test(test_gui ${TEST_GUI_SRC}
+    DATA ${TEST_GUI_DATA}
+    RES ../samples/sample.rc
     )
-wx_add_test(test_gui ${TEST_GUI_SRC})
 wx_exe_link_libraries(test_gui core)
 if(wxUSE_RICHTEXT)
     wx_exe_link_libraries(test_gui richtext)

From f074557f003961ee8bd1a82db3d1e15757344d30 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Mon, 30 Jul 2018 23:54:21 +0200
Subject: [PATCH 835/916] Check all error codes of AppVeyor tests

A test might return a different error code than 1,
for example when a segfault occurs.
---
 build/tools/appveyor-test.bat | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat
index 6a26e19fed..9e04331ea0 100755
--- a/build/tools/appveyor-test.bat
+++ b/build/tools/appveyor-test.bat
@@ -9,27 +9,27 @@ goto %TOOLSET%
 :msbuild
 PATH=C:\projects\wxwidgets\lib\vc_x64_dll;%PATH%
 .\vc_x64_mswudll\test.exe
-if errorlevel 1 goto :error
+if %errorlevel% NEQ 0 goto :error
 .\vc_x64_mswudll\test_gui.exe
 goto :eof
 
 :nmake
 if "%BUILD%"=="debug" set debug_suffix=d
 .\vc_mswu%debug_suffix%\test.exe
-if errorlevel 1 goto :error
+if %errorlevel% NEQ 0 goto :error
 .\vc_mswu%debug_suffix%\test_gui.exe
 goto :eof
 
 :mingw
 .\gcc_mswud\test.exe
-if errorlevel 1 goto :error
+if %errorlevel% NEQ 0 goto :error
 .\gcc_mswud\test_gui.exe
 goto :eof
 
 :msys2
 PATH=C:\projects\wxwidgets\lib;%PATH%
 .\test.exe
-if errorlevel 1 goto :error
+if %errorlevel% NEQ 0 goto :error
 .\test_gui.exe
 goto :eof
 
@@ -46,7 +46,7 @@ exit /b 0
 if "%CONFIGURATION%"=="" set CONFIGURATION=Release
 cd ..\build_cmake
 ctest -V -C %CONFIGURATION% -R "test_[base|gui]" --interactive-debug-mode 0 .
-if errorlevel 1 goto :error
+if %errorlevel% NEQ 0 goto :error
 goto :eof
 
 :error

From 33ea26c8b6f54a77e460449251965d2b70967f96 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 31 Jul 2018 00:12:17 +0200
Subject: [PATCH 836/916] Use same ctest command on Travis and AppVeyor

Do not run the GUI tests on Travis, these fail with:
Error: Unable to initialize GTK+, is DISPLAY set properly?
---
 build/tools/appveyor-test.bat | 2 +-
 build/tools/travis-ci.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat
index 9e04331ea0..3149c807eb 100755
--- a/build/tools/appveyor-test.bat
+++ b/build/tools/appveyor-test.bat
@@ -45,7 +45,7 @@ exit /b 0
 :cmake
 if "%CONFIGURATION%"=="" set CONFIGURATION=Release
 cd ..\build_cmake
-ctest -V -C %CONFIGURATION% -R "test_[base|gui]" --interactive-debug-mode 0 .
+ctest -V -C %CONFIGURATION% -R "test_[base|gui]" --output-on-failure --interactive-debug-mode 0 .
 if %errorlevel% NEQ 0 goto :error
 goto :eof
 
diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh
index be740109bc..2eb544ff69 100755
--- a/build/tools/travis-ci.sh
+++ b/build/tools/travis-ci.sh
@@ -29,7 +29,7 @@ case $wxTOOLSET in
         if [ "$wxCMAKE_TESTS" != "OFF" ]; then
             echo 'travis_fold:start:testing'
             echo 'Testing...'
-            ctest . -C Debug -V --output-on-failure
+            ctest -V -C Debug -R "test_base" --output-on-failure --interactive-debug-mode 0 .
             echo 'travis_fold:end:testing'
         fi
         ;;

From f3ae302b4d8f7caac3cf1756fcf72c689272e05c Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 31 Jul 2018 00:17:54 +0200
Subject: [PATCH 837/916] Prevent segfault in vararg test with MinGW

The segmentation fault is caused by swscanf with __USE_MINGW_ANSI_STDIO=1.
See https://sourceforge.net/p/mingw-w64/mailman/message/36118530/
---
 tests/strings/vararg.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index a03c7b48c7..b84b01ba3e 100644
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -200,7 +200,6 @@ void VarArgTestCase::Sscanf()
 {
     int i = 0;
     char str[20];
-    wchar_t wstr[20];
 
     wxString input("42 test");
 
@@ -208,10 +207,18 @@ void VarArgTestCase::Sscanf()
     CPPUNIT_ASSERT( i == 42 );
     CPPUNIT_ASSERT( wxString(str) == "test" );
 
+#if !(defined(__MINGW32__) && \
+      defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO == 1)
+    // disable this test on mingw with __USE_MINGW_ANSI_STDIO=1
+    // to prevent a segmentation fault. See:
+    // https://sourceforge.net/p/mingw-w64/mailman/message/36118530/
+    wchar_t wstr[20];
+
     i = 0;
     wxSscanf(input, L"%d %s", &i, &wstr);
     CPPUNIT_ASSERT( i == 42 );
     CPPUNIT_ASSERT( wxString(wstr) == "test" );
+#endif
 }
 
 void VarArgTestCase::RepeatedPrintf()

From bcfc9a8a26a7a0ff1011312775d7bcbf8db1895d Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 2 Aug 2018 20:49:23 +0200
Subject: [PATCH 838/916] Fix printf tests for recent MinGW versions

The default mantissa length was changed from 3 to 2 in MinGW 5.0.4.
Fix the test for printing pointer addresses in 64bit MinGW.
---
 tests/strings/strings.cpp   |  4 +---
 tests/strings/vsnprintf.cpp | 41 +++++++++++++++----------------------
 tests/testprec.h            | 31 +++++++++++++++-------------
 3 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 7e960ecb64..0829970c41 100644
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -849,9 +849,7 @@ void StringTestCase::FromDouble()
     } testData[] =
     {
         { 1.23,             -1, "1.23" },
-        // All MSVC versions until MSVC 14 used 3 digits for the exponent
-        // unnecessarily, account for this non-standard behaviour.
-#if defined(wxUSING_VC_CRT_IO) && !wxCHECK_VISUALC_VERSION(14)
+#if defined(wxDEFAULT_MANTISSA_SIZE_3)
         { -3e-10,           -1, "-3e-010" },
 #else
         { -3e-10,           -1, "-3e-10" },
diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp
index 9fe7232fd7..92dda3937d 100644
--- a/tests/strings/vsnprintf.cpp
+++ b/tests/strings/vsnprintf.cpp
@@ -71,12 +71,6 @@ int r;
     CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) );          \
     ASSERT_STR_EQUAL( wxT(expected), buf );
 
-#define CMP3i(expected, fmt, y)                        \
-    r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt), y);     \
-    CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) );          \
-    WX_ASSERT_MESSAGE( ("Expected \"%s\", got \"%s\"", expected, buf), \
-                       wxStricmp(expected, buf) == 0 );
-
 #define CMP2(expected, fmt)                           \
     r=wxSnprintf(buf, MAX_TEST_LEN, wxT(fmt));        \
     CPPUNIT_ASSERT_EQUAL( r, wxStrlen(buf) );          \
@@ -241,22 +235,23 @@ void VsnprintfTestCase::P()
     // the system sprintf() for actual formatting so the results are still
     // different under different systems).
 
-#ifdef wxUSING_VC_CRT_IO
-    // MSVC always prints pointers as %8X on 32 bit systems and as %16X on 64
-    // bit systems.
+#if defined(__VISUALC__) || (defined(__MINGW32__) && \
+        (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO))
     #if SIZEOF_VOID_P == 4
-        CMP3i("00ABCDEF", "%p", (void*)0xABCDEF);
+        CMP3("00ABCDEF", "%p", (void*)0xABCDEF);
         CMP3("00000000", "%p", (void*)NULL);
     #elif SIZEOF_VOID_P == 8
-        CMP3i("0000ABCDEFABCDEF", "%p", (void*)0xABCDEFABCDEF);
+        CMP3("0000ABCDEFABCDEF", "%p", (void*)0xABCDEFABCDEF);
         CMP3("0000000000000000", "%p", (void*)NULL);
     #endif
 #elif defined(__MINGW32__)
-    // mingw32 uses MSVC CRT in old versions but is own implementation now
-    // which is somewhere in the middle as it uses %8x, so to catch both cases
-    // we use case-insensitive comparison here.
-    CMP3("0xabcdef", "%p", (void*)0xABCDEF);
-    CMP3("0", "%p", (void*)NULL);
+    #if SIZEOF_VOID_P == 4
+        CMP3("00abcdef", "%p", (void*)0xABCDEF);
+        CMP3("00000000", "%p", (void*)NULL);
+    #elif SIZEOF_VOID_P == 8
+        CMP3("0000abcdefabcdef", "%p", (void*)0xABCDEFABCDEF);
+        CMP3("0000000000000000", "%p", (void*)NULL);
+    #endif
 #elif defined(__GNUG__)
     // glibc prints pointers as %#x except for NULL pointers which are printed
     // as '(nil)'.
@@ -275,13 +270,10 @@ void VsnprintfTestCase::N()
 
 void VsnprintfTestCase::E()
 {
-    // NB: there are no standards about the minimum exponent width
-    //     (and the width of the %e conversion specifier refers to the
-    //      mantissa, not to the exponent).
-    //     Since newer MSVC versions use 3 digits as minimum exponent
-    //     width while GNU libc uses 2 digits as minimum width, here we
-    //     workaround this problem using for the exponent values with at
-    //     least three digits.
+    // NB: Use at least three digits for the exponent to workaround
+    //     differences between MSVC, MinGW and GNU libc.
+    //     See wxUSING_MANTISSA_SIZE_3 in testprec.h as well.
+    //
     //     Some examples:
     //       printf("%e",2.342E+02);
     //     -> under MSVC7.1 prints:      2.342000e+002
@@ -601,8 +593,7 @@ void VsnprintfTestCase::GlibcMisc1()
 {
     CMP3("     ",    "%5.s", "xyz");
     CMP3("   33",    "%5.f", 33.3);
-#ifdef wxUSING_VC_CRT_IO
-    // see the previous notes about the minimum width of mantissa:
+#if defined(wxDEFAULT_MANTISSA_SIZE_3)
     CMP3("  3e+008", "%8.e", 33.3e7);
     CMP3("  3E+008", "%8.E", 33.3e7);
     CMP3("3e+001",    "%.g",  33.3);
diff --git a/tests/testprec.h b/tests/testprec.h
index 03f5f624ce..d0bdb41aae 100644
--- a/tests/testprec.h
+++ b/tests/testprec.h
@@ -36,21 +36,24 @@
     #endif
 #endif
 
-// Define wxUSING_VC_CRT_IO when using MSVC CRT STDIO library as its standard
-// functions give different results from glibc ones in several cases (of
-// course, any code relying on this is not portable and probably won't work,
-// i.e. will result in tests failures, with other platforms/compilers which
-// should have checks for them added as well).
+// Define wxUSING_MANTISSA_SIZE_3 for certain versions of MinGW and MSVC.
+// These use a CRT which prints the exponent with a minimum of 3
+// digits instead of 2.
 //
-// Notice that MinGW uses VC CRT by default but may use its own printf()
-// implementation if __USE_MINGW_ANSI_STDIO is defined. And finally also notice
-// that testing for __USE_MINGW_ANSI_STDIO directly results in a warning with
-// -Wundef if it involves an operation with undefined __MINGW_FEATURES__ so
-// test for the latter too to avoid it.
-#if defined(__VISUALC__) || \
-    (defined(__MINGW32__) && \
-     (!defined(__MINGW_FEATURES__) || !__USE_MINGW_ANSI_STDIO))
-    #define wxUSING_VC_CRT_IO
+// This happens for all MSVC compilers before version 14 (VS2015).
+// And for MinGW when it does not define or set __USE_MINGW_ANSI_STDIO.
+// Since MinGW 5.0.4 it uses at least 2 digits for the exponent:
+// https://sourceforge.net/p/mingw-w64/mailman/message/36333746/
+
+#if (defined(__MINGW64_VERSION_MAJOR) && (__MINGW64_VERSION_MAJOR > 5 || \
+        (__MINGW64_VERSION_MAJOR == 5 && __MINGW64_VERSION_MINOR >= 0) || \
+        (__MINGW64_VERSION_MAJOR == 5 && __MINGW64_VERSION_MINOR == 0 && __MINGW64_VERSION_BUGFIX >= 4)))
+#define wxMINGW_WITH_FIXED_MANTISSA
+#endif
+#if (defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(14)) || \
+        (defined(__MINGW32__) && !defined(wxMINGW_WITH_FIXED_MANTISSA) && \
+        (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO))
+    #define wxDEFAULT_MANTISSA_SIZE_3
 #endif
 
 // thrown when assert fails in debug build

From 14c83f79a6482da0045ab86d11c726944e81c13b Mon Sep 17 00:00:00 2001
From: Vitaly Stakhovsky <vvs31415@gitlab.com>
Date: Thu, 2 Aug 2018 23:52:41 +0200
Subject: [PATCH 839/916] Fix typo in "aquamarine" colour name in generic
 wxFontDialog

Closes https://github.com/wxWidgets/wxWidgets/pull/876
---
 src/generic/fontdlgg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index dd1dbcc60e..f5dbd57c93 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -233,7 +233,7 @@ static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),
                     wxT("FIREBRICK"),
                     wxT("CORAL"),
                     wxT("FOREST GREEN"),
-                    wxT("AQUARAMINE"),
+                    wxT("AQUAMARINE"),
                     wxT("BLUE"),
                     wxT("NAVY"),
                     wxT("THISTLE"),

From 6907a59bc38921f0b627bff01909047c4abcfc12 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 3 Aug 2018 09:39:38 -0700
Subject: [PATCH 840/916] Remove unneeded compile-time Cairo version checks.

The code will compile with any Cairo version.
---
 src/generic/graphicc.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 0e644ce02a..8fa298175f 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -2015,7 +2015,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
         // context operations on our own.
         // Bug 96482 was fixed in Cairo 1.15.12 so this workaround needs
         // to be applied only for older Cairo versions.
-#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 15, 12)
         if ( cairo_version() < CAIRO_VERSION_ENCODE(1, 15, 12) )
         {
             wxCoord orgX, orgY;
@@ -2029,7 +2028,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
                 adjustTransformFromDC = true;
             }
         }
-#endif // Cairo < 1.15.12
 
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 4)
         if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 15, 4) )
@@ -2159,7 +2157,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, HDC handle )
     // DC to Cairo and to apply original DC transformation to the Cairo
     // context operations on our own.
     // We believe this bug will be fixed in the next Cairo version.
-#if CAIRO_VERSION <= CAIRO_VERSION_ENCODE(1, 15, 2)
     if ( cairo_version() <= CAIRO_VERSION_ENCODE(1, 15, 2) )
     {
         POINT devOrg;
@@ -2188,7 +2185,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, HDC handle )
             adjustTransformFromDC = true;
         }
     }
-#endif // Cairo <= 1.15.2
     m_mswSurface = cairo_win32_surface_create(handle);
     Init( cairo_create(m_mswSurface) );
     if ( adjustTransformFromDC )

From 85bdd1be9f470db928641ea41e208953d29fa156 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Fri, 3 Aug 2018 09:53:36 -0700
Subject: [PATCH 841/916] Update Cairo version check.

Should presumably have been part of 3f18576dee.
---
 src/generic/graphicc.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 8fa298175f..ce232060ad 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -2156,8 +2156,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, HDC handle )
     // bug 96482) so in this case we would need to pass non-transformed
     // DC to Cairo and to apply original DC transformation to the Cairo
     // context operations on our own.
-    // We believe this bug will be fixed in the next Cairo version.
-    if ( cairo_version() <= CAIRO_VERSION_ENCODE(1, 15, 2) )
+    if ( cairo_version() < CAIRO_VERSION_ENCODE(1, 15, 12) )
     {
         POINT devOrg;
         ::GetViewportOrgEx(handle, &devOrg);

From e136f349441b3675547b41806e7a924bb81bbda0 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 5 Aug 2018 14:21:50 +0200
Subject: [PATCH 842/916] Removing extra semicola

---
 include/wx/zipstrm.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 6191dcda81..2a6231303a 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -321,8 +321,8 @@ public:
     int  GetLevel() const                       { return m_level; }
     void WXZIPFIX SetLevel(int level);
 
-    void SetFormat(wxZipArchiveFormat format)   { m_format = format; };
-    wxZipArchiveFormat GetFormat() const        { return m_format; };
+    void SetFormat(wxZipArchiveFormat format)   { m_format = format; }
+    wxZipArchiveFormat GetFormat() const        { return m_format; }
 
 protected:
     virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size) wxOVERRIDE;

From 47c2623282613abd15a1c953ffbe796ab6a3f95d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 7 Aug 2018 12:02:16 +0200
Subject: [PATCH 843/916] Fix documentation URLs in wxMSW installation
 instructions

HTTPS URLs are not valid for docs.wxwidgets.org domain, so use HTTP.
---
 docs/msw/install.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index edc62025ae..2d515e7788 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -29,7 +29,7 @@ sources before using it.
 
 If you use CMake, please see
 
-    https://docs.wxwidgets.org/trunk/overview_cmake.html
+    http://docs.wxwidgets.org/trunk/overview_cmake.html
 
 for building wxWidgets using it.
 
@@ -499,7 +499,7 @@ Building Applications Using wxWidgets
 
 If you want to use CMake for building your project, please see
 
-    https://docs.wxwidgets.org/trunk/overview_cmake.html#cmake_apps
+    http://docs.wxwidgets.org/trunk/overview_cmake.html#cmake_apps
 
 Otherwise follow the instructions below for "manual" setup of your project.
 

From 71ad5ba545b981214d2e49a7efcd4063e430db58 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 8 Aug 2018 08:04:02 +0200
Subject: [PATCH 844/916] turning of undefined macros warning, force to using
 gnu++11 and libc++ as we do in command line builds

---
 build/osx/wx.xcconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/osx/wx.xcconfig b/build/osx/wx.xcconfig
index 42339d528b..32562b63dd 100644
--- a/build/osx/wx.xcconfig
+++ b/build/osx/wx.xcconfig
@@ -5,7 +5,7 @@
 WXPLATFORM = __WXOSX_$(WXTOOLKITUPPER)__
 PRODUCT_NAME = wx_osx_$(WXTOOLKIT)
 
-OTHER_CFLAGS = -Wall -Wundef -fno-strict-aliasing -fno-common -fvisibility=hidden 
+OTHER_CFLAGS = -Wall -Wno-undef -fno-strict-aliasing -fno-common -fvisibility=hidden 
 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -fvisibility-inlines-hidden
 
 GCC_PREFIX_HEADER = $(WXROOT)/include/wx/wxprec.h
@@ -17,3 +17,5 @@ WX_PREPROCESSOR_DEFINITIONS = WXBUILDING $(WXPLATFORM) __WX__ _FILE_OFFSET_BITS=
 GCC_PREPROCESSOR_DEFINITIONS = $(WX_PREPROCESSOR_DEFINITIONS)
 GCC_PFE_FILE_C_DIALECTS = c++ objective-c++
 GCC_C_LANGUAGE_STANDARD = gnu99
+CLANG_CXX_LANGUAGE_STANDARD = gnu++11
+CLANG_CXX_LIBRARY = libc++

From e09d11c7acf768a40adb156c5a32fffb53231432 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 8 Aug 2018 08:07:59 +0200
Subject: [PATCH 845/916] silence warning about unused var in SDK < 10.14

---
 src/osx/carbon/utilscocoa.mm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index 22305a4c91..a492649cb2 100644
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -597,6 +597,8 @@ wxOSXEffectiveAppearanceSetter::wxOSXEffectiveAppearanceSetter()
         formerAppearance = NSAppearance.currentAppearance;
         NSAppearance.currentAppearance = NSApp.effectiveAppearance;
     }
+#else
+    wxUnusedVar(formerAppearance);
 #endif
 }
 

From de1322a02d1b00fd4d235a6d3cfda32de7401cda Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sat, 11 Aug 2018 11:51:49 -0700
Subject: [PATCH 846/916] Fix DrawItemSelectionRect() for focused state

---
 src/gtk/renderer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 47aa1978a8..55ad311725 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -760,7 +760,10 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow* win,
 #ifdef __WXGTK3__
         GtkStyleContext* sc = gtk_widget_get_style_context(treeWidget);
         gtk_style_context_save(sc);
-        gtk_style_context_set_state(sc, GTK_STATE_FLAG_SELECTED);
+        int state = GTK_STATE_FLAG_SELECTED;
+        if (flags & wxCONTROL_FOCUSED)
+            state |= GTK_STATE_FLAG_FOCUSED;
+        gtk_style_context_set_state(sc, GtkStateFlags(state));
         gtk_style_context_add_class(sc, GTK_STYLE_CLASS_CELL);
         gtk_render_background(sc, drawable, rect.x - x_diff, rect.y, rect.width, rect.height);
         gtk_style_context_restore(sc);

From e1a7f560405ab1aba2c1adb517c3968ae0ecf42a Mon Sep 17 00:00:00 2001
From: Blake-Eryx <Blake-Eryx@users.noreply.github.com>
Date: Tue, 14 Aug 2018 17:15:39 +0200
Subject: [PATCH 847/916] Fix spelling and punctuation errors in comments and
 documentation

Fix several occurrences of misspelling "trivial" as "trival"; use "from"
rather than "than"; add missing articles and commas.

Closes https://github.com/wxWidgets/wxWidgets/pull/874
---
 docs/doxygen/groups/funcmacro_env.h   |  6 +++---
 docs/doxygen/overviews/windowsizing.h |  2 +-
 docs/doxygen/overviews/xrc_format.h   |  2 +-
 include/wx/odcombo.h                  |  2 +-
 include/wx/propgrid/propgrid.h        |  2 +-
 interface/wx/dynarray.h               | 22 +++++++++++-----------
 interface/wx/font.h                   |  2 +-
 interface/wx/grid.h                   |  4 ++--
 interface/wx/hashmap.h                |  2 +-
 interface/wx/hashset.h                |  2 +-
 interface/wx/html/htmlwin.h           |  4 ++--
 interface/wx/htmllbox.h               |  6 +++---
 interface/wx/hyperlink.h              |  2 +-
 interface/wx/image.h                  |  4 ++--
 interface/wx/systhemectrl.h           |  2 +-
 interface/wx/timectrl.h               |  6 +++---
 interface/wx/zipstrm.h                |  4 ++--
 samples/dialogs/dialogs.cpp           |  2 +-
 src/common/addremovectrl.cpp          |  2 +-
 src/common/gifdecod.cpp               |  2 +-
 src/common/sizer.cpp                  |  2 +-
 src/common/zipstrm.cpp                |  4 ++--
 src/generic/hyperlinkg.cpp            |  6 +++---
 src/propgrid/propgridiface.cpp        |  2 +-
 24 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/docs/doxygen/groups/funcmacro_env.h b/docs/doxygen/groups/funcmacro_env.h
index fe55b19674..34f5ae043f 100644
--- a/docs/doxygen/groups/funcmacro_env.h
+++ b/docs/doxygen/groups/funcmacro_env.h
@@ -15,11 +15,11 @@ variables in a portable way. They are currently implemented under Win32 and
 POSIX-like systems (Unix).
 
 Remember that these functions add/change/delete environment variables of the
-current process only. Child processes copy the environment variables of the parent
+current process only. Child processes copy the environment variables of the parent,
 but do not share them (a wxSetEnv() in the parent process won't change the value
-returned by wxGetEnv() in the child process and viceversa).
+returned by wxGetEnv() in the child process and vice versa).
 
-For more evoluted interprocess communication tecniques see @ref overview_ipc.
+For more advanced interprocess communication techniques see @ref overview_ipc.
 
 */
 
diff --git a/docs/doxygen/overviews/windowsizing.h b/docs/doxygen/overviews/windowsizing.h
index 942c8af65d..9b75a36246 100644
--- a/docs/doxygen/overviews/windowsizing.h
+++ b/docs/doxygen/overviews/windowsizing.h
@@ -90,7 +90,7 @@ some simple explanations of things.
     sizers when determining what the requirements of each item in the sizer is,
     and is used for calculating the overall minimum needs of the sizer.
 
-@li wxWindow::SetInitialSize(): this is a little different than the typical size
+@li wxWindow::SetInitialSize(): this is a little different from the typical size
     setters. Rather than just setting an "initial size" attribute it actually sets
     the minimal size to the value passed in, blends that value with the best size,
     and then sets the size of the widget to be the result.
diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 92cea1ff7c..02270bebcc 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -1349,7 +1349,7 @@ must be of wxMDIChildFrame type.
 wxMDIChildFrame supports the same properties that @ref xrc_wxfrane and
 @ref xrc_wxmdiparentframe do.
 
-wxMDIChildFrame can only be used as as immediate child of @ref
+wxMDIChildFrame can only be used as immediate child of @ref
 xrc_wxmdiparentframe.
 
 wxMDIChildFrame may have optional children: either exactly one
diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index 64cfc64fcf..622e51a748 100644
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -182,7 +182,7 @@ protected:
 
     wxFont                  m_useFont;
 
-    //wxString                m_stringValue; // displayed text (may be different than m_strings[m_value])
+    //wxString                m_stringValue; // displayed text (may be different from m_strings[m_value])
     int                     m_value; // selection
     int                     m_itemHover; // on which item the cursor is
     int                     m_itemHeight; // default item height (calculate from font size
diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 5c5508601f..99f899a0ed 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -582,7 +582,7 @@ enum wxPG_INTERNAL_FLAGS
     wxPG_FL_VALUE_CHANGE_IN_EVENT       = 0x10000000,
     // Editor control width should not change on resize
     wxPG_FL_FIXED_WIDTH_EDITOR          = 0x20000000,
-    // Width of panel can be different than width of grid
+    // Width of panel can be different from width of grid
     wxPG_FL_HAS_VIRTUAL_WIDTH           = 0x40000000,
     // Prevents RecalculateVirtualSize re-entrancy
     wxPG_FL_RECALCULATING_VIRTUAL_SIZE  = 0x80000000
diff --git a/interface/wx/dynarray.h b/interface/wx/dynarray.h
index 548a5c8b6a..710292a466 100644
--- a/interface/wx/dynarray.h
+++ b/interface/wx/dynarray.h
@@ -670,9 +670,9 @@ public:
     This macro declares a new object array class named @a name and containing
     the elements of type @e T.
 
-    An exported array is used when compiling wxWidgets as a DLL under Windows
-    and the array needs to be visible outside the DLL. An user exported array
-    needed for exporting an array from a user DLL.
+    An exported array is used when compiling wxWidgets as a DLL under Windows,
+    and the array needs to be visible outside the DLL. A user-exported array
+    is needed for exporting an array from a user DLL.
 
     Example:
 
@@ -681,8 +681,8 @@ public:
     WX_DECLARE_OBJARRAY(MyClass, wxArrayOfMyClass); // note: not "MyClass *"!
     @endcode
 
-    You must use WX_DEFINE_OBJARRAY() macro to define the array class,
-    otherwise you would get link errors.
+    You must use the WX_DEFINE_OBJARRAY() macro to define the array class;
+    otherwise, you will get link errors.
 */
 #define WX_DECLARE_OBJARRAY(T, name)
 #define WX_DECLARE_EXPORTED_OBJARRAY(T, name)
@@ -695,8 +695,8 @@ public:
     elements of type @a T.
 
     An exported array is used when compiling wxWidgets as a DLL under Windows
-    and the array needs to be visible outside the DLL. An user exported array
-    needed for exporting an array from a user DLL.
+    and the array needs to be visible outside the DLL. A user-exported array
+    is needed for exporting an array from a user DLL.
 
     Example:
 
@@ -728,8 +728,8 @@ public:
     destructor will not be called.
 
     An exported array is used when compiling wxWidgets as a DLL under Windows
-    and the array needs to be visible outside the DLL. An user exported array
-    needed for exporting an array from a user DLL.
+    and the array needs to be visible outside the DLL. A user-exported array
+    is needed for exporting an array from a user DLL.
 
     Example of usage:
 
@@ -760,8 +760,8 @@ public:
     the elements of type @e T.
 
     An exported array is used when compiling wxWidgets as a DLL under Windows
-    and the array needs to be visible outside the DLL. An user exported array
-    needed for exporting an array from a user DLL.
+    and the array needs to be visible outside the DLL. A user-exported array
+    is needed for exporting an array from a user DLL.
 
     Example:
 
diff --git a/interface/wx/font.h b/interface/wx/font.h
index 1fcb7ab4b3..d1204b49dd 100644
--- a/interface/wx/font.h
+++ b/interface/wx/font.h
@@ -749,7 +749,7 @@ public:
         Returns @true if the font is a fixed width (or monospaced) font,
         @false if it is a proportional one or font is invalid.
 
-        Note that this function under some platforms is different than just testing
+        Note that this function under some platforms is different from just testing
         for the font family being equal to @c wxFONTFAMILY_TELETYPE because native
         platform-specific functions are used for the check (resulting in a more
         accurate return value).
diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 39820c5716..c5926dbff0 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -4645,7 +4645,7 @@ protected:
     /**
         Get the minimal width of the given column/row.
 
-        The value returned by this function may be different than that returned
+        The value returned by this function may be different from that returned
         by GetColMinimalAcceptableWidth() if SetColMinimalWidth() had been
         called for this column.
     */
@@ -4664,7 +4664,7 @@ protected:
     /**
         Returns the minimal size for the given column.
 
-        The value returned by this function may be different than that returned
+        The value returned by this function may be different from that returned
         by GetRowMinimalAcceptableHeight() if SetRowMinimalHeight() had been
         called for this row.
     */
diff --git a/interface/wx/hashmap.h b/interface/wx/hashmap.h
index da3b1b4032..4b45a3078d 100644
--- a/interface/wx/hashmap.h
+++ b/interface/wx/hashmap.h
@@ -86,7 +86,7 @@
                          wxIntegerEqual,
                          MyHash );
 
-    // using an user-defined class for keys
+    // using a user-defined class for keys
     class MyKey { ... };
 
     // hashing function
diff --git a/interface/wx/hashset.h b/interface/wx/hashset.h
index 7d1743bc9e..a069cb5d93 100644
--- a/interface/wx/hashset.h
+++ b/interface/wx/hashset.h
@@ -73,7 +73,7 @@
                             wxIntegerEqual,
                             MySet );
 
-        // using an user-defined class for keys
+        // using a user-defined class for keys
         class MyKey { ... };
 
         // hashing function
diff --git a/interface/wx/html/htmlwin.h b/interface/wx/html/htmlwin.h
index d6b03dd7d4..36fd69d41c 100644
--- a/interface/wx/html/htmlwin.h
+++ b/interface/wx/html/htmlwin.h
@@ -143,7 +143,7 @@ public:
     @event{EVT_HTML_CELL_HOVER(id, func)}
         The mouse passed over a wxHtmlCell.
     @event{EVT_HTML_LINK_CLICKED(id, func)}
-        A wxHtmlCell which contains an hyperlink was clicked.
+        A wxHtmlCell which contains a hyperlink was clicked.
     @endEventTable
 
     @library{wxhtml}
@@ -555,7 +555,7 @@ wxEventType wxEVT_HTML_LINK_CLICKED;
 
     @beginEventTable{wxHtmlLinkEvent}
     @event{EVT_HTML_LINK_CLICKED(id, func)}
-        User clicked on an hyperlink.
+        User clicked on a hyperlink.
     @endEventTable
 
     @library{wxhtml}
diff --git a/interface/wx/htmllbox.h b/interface/wx/htmllbox.h
index 22717f7907..234467fe7d 100644
--- a/interface/wx/htmllbox.h
+++ b/interface/wx/htmllbox.h
@@ -10,7 +10,7 @@
 
     wxHtmlListBox is an implementation of wxVListBox which shows HTML content in
     the listbox rows. This is still an abstract base class and you will need to
-    derive your own class from it (see htlbox sample for the example) but you will
+    derive your own class from it (see htlbox sample for the example), but you will
     only need to override a single wxHtmlListBox::OnGetItem function.
 
     @beginEventEmissionTable{wxHtmlCellEvent,wxHtmlLinkEvent}
@@ -19,7 +19,7 @@
     @event{EVT_HTML_CELL_HOVER(id, func)}
         The mouse passed over a wxHtmlCell.
     @event{EVT_HTML_LINK_CLICKED(id, func)}
-        A wxHtmlCell which contains an hyperlink was clicked.
+        A wxHtmlCell which contains a hyperlink was clicked.
     @endEventTable
 
     @library{wxhtml}
@@ -191,7 +191,7 @@ protected:
     @event{EVT_HTML_CELL_HOVER(id, func)}
         The mouse passed over a wxHtmlCell. See wxHtmlCellEvent.
     @event{EVT_HTML_LINK_CLICKED(id, func)}
-        A wxHtmlCell which contains an hyperlink was clicked. See wxHtmlLinkEvent
+        A wxHtmlCell which contains a hyperlink was clicked. See wxHtmlLinkEvent
     @endEventTable
 
     @library{wxhtml}
diff --git a/interface/wx/hyperlink.h b/interface/wx/hyperlink.h
index cb94ed1db7..57f5595e92 100644
--- a/interface/wx/hyperlink.h
+++ b/interface/wx/hyperlink.h
@@ -18,7 +18,7 @@
 
     @beginEventTable{wxHyperlinkEvent}
     @event{EVT_HYPERLINK(id, func)}
-        User clicked on an hyperlink.
+        User clicked on a hyperlink.
     @endEventTable
 
     @library{wxadv}
diff --git a/interface/wx/image.h b/interface/wx/image.h
index 9a6f39737f..c3d47af52b 100644
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -245,7 +245,7 @@ public:
     wxBitmapType GetType() const;
 
     /**
-        Loads a image from a stream, putting the resulting data into @a image.
+        Loads an image from a stream, putting the resulting data into @a image.
 
         If the image file contains more than one image and the image handler is
         capable of retrieving these individually, @a index indicates which image
@@ -269,7 +269,7 @@ public:
                           bool verbose = true, int index = -1);
 
     /**
-        Saves a image in the output stream.
+        Saves an image in the output stream.
 
         @param image
             The image object which is to be affected by this operation.
diff --git a/interface/wx/systhemectrl.h b/interface/wx/systhemectrl.h
index c8fc4d8f88..60a4405027 100644
--- a/interface/wx/systhemectrl.h
+++ b/interface/wx/systhemectrl.h
@@ -59,7 +59,7 @@ template <class C>
 class wxSystemThemedControl : public C
 {
 public:
-    /// Trival default constructor.
+    /// Trivial default constructor.
     wxSystemThemedControl();
 
     /**
diff --git a/interface/wx/timectrl.h b/interface/wx/timectrl.h
index 5b25143048..619eda5d22 100644
--- a/interface/wx/timectrl.h
+++ b/interface/wx/timectrl.h
@@ -150,11 +150,11 @@ public:
         The date part of @a dt is ignored, only the time part is displayed in
         the control. The @a dt object must however be valid.
 
-        In particular notice that it is a bad idea to use default wxDateTime
+        In particular, notice that it is a bad idea to use default wxDateTime
         constructor from hour, minute and second values as it uses the today
-        date for the date part which means that some times can be invalid if
+        date for the date part, which means that some values can be invalid if
         today happens to be the day of DST change. For example, when switching
-        to summer time the time 2:00 typically doesn't exist as the clocks jump
+        to summer time, the time 2:00 typically doesn't exist as the clocks jump
         directly to 3:00. To avoid this problem, use a fixed date on which DST
         is known not to change (e.g. Jan 1, 2012) for the date part of the
         argument or use SetTime().
diff --git a/interface/wx/zipstrm.h b/interface/wx/zipstrm.h
index e07b8c8f24..6261a4bcae 100644
--- a/interface/wx/zipstrm.h
+++ b/interface/wx/zipstrm.h
@@ -598,11 +598,11 @@ public:
         Set the format of the archive.
 
         The normal zip format is limited to single files and the complete
-        archive smaller than 4GB with less then 65k files. If any of these
+        archive smaller than 4GB with less than 65k files. If any of these
         limits are exceeded, this class will automatically create a ZIP64 file,
         so in most situations calling SetFormat() is not necessary.
 
-        However to support single entries with more than 4GB of data
+        However, to support single entries with more than 4GB of data
         (compressed or original) whose sizes are unknown when adding the
         entry with PutNextEntry(), the format has to be set to
         wxZIP_FORMAT_ZIP64 before adding such entries.
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 3fbfd99aeb..73277ab1f3 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -3855,7 +3855,7 @@ void TestRichMessageDialog::AddAdditionalTextOptions(wxSizer *sizer)
     wxSizer * const sizerMsgs = new wxStaticBoxSizer(wxVERTICAL, this,
                                                      "&Additional Elements");
 
-    // add a option to show a check box.
+    // add an option to show a check box.
     wxSizer * const sizerCheckBox = new wxBoxSizer(wxHORIZONTAL);
     sizerCheckBox->Add(new wxStaticText(this, wxID_ANY, "&Check box:"),
                        wxSizerFlags().Centre().Border(wxRIGHT));
diff --git a/src/common/addremovectrl.cpp b/src/common/addremovectrl.cpp
index f5595e269e..754604ef11 100644
--- a/src/common/addremovectrl.cpp
+++ b/src/common/addremovectrl.cpp
@@ -54,7 +54,7 @@ wxAddRemoveCtrl::Create(wxWindow* parent,
         return false;
 
     // We don't do anything here, the buttons are created when we're given the
-    // adaptor to use them with in SetAdaptor().
+    // adaptor to use them with SetAdaptor().
     return true;
 }
 
diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index 7872120eb7..af945d6589 100644
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -177,7 +177,7 @@ bool wxGIFDecoder::ConvertToImage(unsigned int frame, wxImage *image) const
         }
         else if ( transparency == wxIMAGE_OPTION_GIF_TRANSPARENCY_UNCHANGED )
         {
-            // Leave the GIF exactly as as it was, just adjust (in the least
+            // Leave the GIF exactly as it was, just adjust (in the least
             // noticeable way, by just flipping a single bit) non-transparent
             // pixels colour,
             for (i = 0; i < GetNcolours(frame); i++)
diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index b0b94674b0..ba50b6c9c0 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -2378,7 +2378,7 @@ void wxBoxSizer::RecalcSizes()
 
             wxCoord maxMajor = GetSizeInMajorDir(item->GetMaxSizeWithBorder());
 
-            // must be nonzero, fixed-size items were dealt with in previous loop
+            // must be nonzero, fixed-size items were dealt with in the previous loop
             const int propItem = item->GetProportion();
 
             // is the desired size of this item small enough?
diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 5269de93f7..a14bd674ef 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -281,7 +281,7 @@ inline wxUint64 wxZipHeader::Read64()
 
 /////////////////////////////////////////////////////////////////////////////
 // Stored input stream
-// Trival decompressor for files which are 'stored' in the zip file.
+// Trivial decompressor for files which are 'stored' in the zip file.
 
 class wxStoredInputStream : public wxFilterInputStream
 {
@@ -328,7 +328,7 @@ size_t wxStoredInputStream::OnSysRead(void *buffer, size_t size)
 
 /////////////////////////////////////////////////////////////////////////////
 // Stored output stream
-// Trival compressor for files which are 'stored' in the zip file.
+// Trivial compressor for files which are 'stored' in the zip file.
 
 class wxStoredOutputStream : public wxFilterOutputStream
 {
diff --git a/src/generic/hyperlinkg.cpp b/src/generic/hyperlinkg.cpp
index bc5239ce52..133a9371d6 100644
--- a/src/generic/hyperlinkg.cpp
+++ b/src/generic/hyperlinkg.cpp
@@ -66,14 +66,14 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
         return false;
 
-    // set to non empty strings both the url and the label
+    // set to non-empty strings both the url and the label
     SetURL(url.empty() ? label : url);
     SetLabel(label.empty() ? url : label);
 
     Init();
     SetForegroundColour(m_normalColour);
 
-    // by default the font of an hyperlink control is underlined
+    // by default the font of a hyperlink control is underlined
     wxFont f = GetFont();
     f.SetUnderlined(true);
     SetFont(f);
@@ -84,7 +84,7 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     // connect our event handlers:
     // NOTE: since this class is the base class of the GTK+'s native implementation
     //       of wxHyperlinkCtrl, we cannot use the static macros in wxBEGIN/wxEND_EVENT_TABLE
-    //       blocks, otherwise the GTK+'s native impl of wxHyperlinkCtrl would not
+    //       blocks; otherwise, the GTK+'s native impl of wxHyperlinkCtrl would not
     //       behave correctly (as we intercept events doing things which interfere
     //       with GTK+'s native handling):
 
diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp
index ea19305d7f..9d2e86c45c 100644
--- a/src/propgrid/propgridiface.cpp
+++ b/src/propgrid/propgridiface.cpp
@@ -796,7 +796,7 @@ TRET wxPropertyGridInterface::GetPropertyValueAs##BIGNAME( wxPGPropArg id ) cons
     return (TRET)value.Get##BIGNAME(); \
 }
 
-// String is different than others.
+// String is different from others.
 wxString wxPropertyGridInterface::GetPropertyValueAsString( wxPGPropArg id ) const
 {
     wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxEmptyString)

From d9d05bc2217ddf9e20161ffeb061a9ecd70feea4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 14 Aug 2018 17:24:08 +0200
Subject: [PATCH 848/916] Document that wxTreeCtrl::DeleteChildren() does send
 events

Contrary to what the documentation stated previously, this function does
generate the wxEVT_TREE_DELETE_ITEM events for all the items being
deleted, in both MSW and generic implementations.

Update the documentation and add a new unit test checking that the
behaviour really conforms to it.
---
 interface/wx/treectrl.h         |  6 ++++--
 tests/controls/treectrltest.cpp | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h
index 246165055d..bf52ba9e78 100644
--- a/interface/wx/treectrl.h
+++ b/interface/wx/treectrl.h
@@ -317,8 +317,10 @@ public:
     virtual void DeleteAllItems();
 
     /**
-        Deletes all children of the given item (but not the item itself). Note
-        that this will @b not generate any events unlike Delete() method.
+        Deletes all children of the given item (but not the item itself).
+
+        A @c wxEVT_TREE_DELETE_ITEM event will be generated for every item
+        being deleted.
 
         If you have called SetItemHasChildren(), you may need to call it again
         since DeleteChildren() does not automatically clear the setting.
diff --git a/tests/controls/treectrltest.cpp b/tests/controls/treectrltest.cpp
index 6f8e8ff514..1bf179deae 100644
--- a/tests/controls/treectrltest.cpp
+++ b/tests/controls/treectrltest.cpp
@@ -45,6 +45,7 @@ private:
     CPPUNIT_TEST_SUITE( TreeCtrlTestCase );
         WXUISIM_TEST( ItemClick );
         CPPUNIT_TEST( DeleteItem );
+        CPPUNIT_TEST( DeleteChildren );
         WXUISIM_TEST( LabelEdit );
         WXUISIM_TEST( KeyDown );
 #ifndef __WXGTK__
@@ -72,6 +73,7 @@ private:
 
     void ItemClick();
     void DeleteItem();
+    void DeleteChildren();
     void LabelEdit();
     void KeyDown();
 #ifndef __WXGTK__
@@ -275,6 +277,16 @@ void TreeCtrlTestCase::DeleteItem()
     CPPUNIT_ASSERT_EQUAL(1, deleteitem.GetCount());
 }
 
+void TreeCtrlTestCase::DeleteChildren()
+{
+    EventCounter deletechildren(m_tree, wxEVT_TREE_DELETE_ITEM);
+
+    m_tree->AppendItem(m_child1, "another grandchild");
+    m_tree->DeleteChildren(m_child1);
+
+    CHECK( deletechildren.GetCount() == 2 );
+}
+
 #if wxUSE_UIACTIONSIMULATOR
 
 void TreeCtrlTestCase::LabelEdit()

From 3c8b9589d8f1c56646d01bf26669fcdfe243ea9f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 14 Aug 2018 17:50:28 +0200
Subject: [PATCH 849/916] Test that wxTreeCtrl::DeleteAllItems() does send
 events

This seems to be the case under all still supported MSW versions, so
remove the note saying that the events might not be sent from the
documentation and add a unit test verifying that they are indeed sent.
---
 interface/wx/treectrl.h         |  8 +++++---
 tests/controls/treectrltest.cpp | 13 +++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h
index bf52ba9e78..f737d20d3c 100644
--- a/interface/wx/treectrl.h
+++ b/interface/wx/treectrl.h
@@ -310,9 +310,11 @@ public:
     virtual void Delete(const wxTreeItemId& item);
 
     /**
-        Deletes all items in the control. Note that this may not generate
-        @c EVT_TREE_DELETE_ITEM events under some Windows versions although
-        normally such event is generated for each removed item.
+        Deletes all items in the control.
+
+        This function generates @c wxEVT_TREE_DELETE_ITEM events for each item
+        being deleted, including the root one if it is shown, i.e. unless
+        wxTR_HIDE_ROOT style is used.
     */
     virtual void DeleteAllItems();
 
diff --git a/tests/controls/treectrltest.cpp b/tests/controls/treectrltest.cpp
index 1bf179deae..433c32ce61 100644
--- a/tests/controls/treectrltest.cpp
+++ b/tests/controls/treectrltest.cpp
@@ -46,6 +46,7 @@ private:
         WXUISIM_TEST( ItemClick );
         CPPUNIT_TEST( DeleteItem );
         CPPUNIT_TEST( DeleteChildren );
+        CPPUNIT_TEST( DeleteAllItems );
         WXUISIM_TEST( LabelEdit );
         WXUISIM_TEST( KeyDown );
 #ifndef __WXGTK__
@@ -74,6 +75,7 @@ private:
     void ItemClick();
     void DeleteItem();
     void DeleteChildren();
+    void DeleteAllItems();
     void LabelEdit();
     void KeyDown();
 #ifndef __WXGTK__
@@ -271,8 +273,6 @@ void TreeCtrlTestCase::DeleteItem()
 
     wxTreeItemId todelete = m_tree->AppendItem(m_root, "deleteme");
     m_tree->Delete(todelete);
-    // We do not test DeleteAllItems() as under some versions of Windows events
-    // are not generated.
 
     CPPUNIT_ASSERT_EQUAL(1, deleteitem.GetCount());
 }
@@ -287,6 +287,15 @@ void TreeCtrlTestCase::DeleteChildren()
     CHECK( deletechildren.GetCount() == 2 );
 }
 
+void TreeCtrlTestCase::DeleteAllItems()
+{
+    EventCounter deleteall(m_tree, wxEVT_TREE_DELETE_ITEM);
+
+    m_tree->DeleteAllItems();
+
+    CHECK( deleteall.GetCount() == 4 );
+}
+
 #if wxUSE_UIACTIONSIMULATOR
 
 void TreeCtrlTestCase::LabelEdit()

From 09124932eb7b1f6379b68ab193fc1ed8fedf01a0 Mon Sep 17 00:00:00 2001
From: approach <approach@trac.wxwidgets.org>
Date: Tue, 14 Aug 2018 18:01:50 +0200
Subject: [PATCH 850/916] Add strike-through support to wxDataViewItem
 attributes

Implement support for this attribute only in the generic version so far,
it will hopefully be implemented for the natives ones in the future.

Also add a new toggle column to the dataview sample to check how it
works: checking the items in this column enables using this attribute
for some other ones.

Closes #18180.
---
 docs/changes.txt              |  1 +
 include/wx/dataview.h         |  6 ++++-
 interface/wx/dataview.h       | 11 ++++++++
 samples/dataview/dataview.cpp |  5 ++++
 samples/dataview/mymodels.cpp | 51 +++++++++++++++++++++++++++++++++++
 samples/dataview/mymodels.h   |  6 +++++
 src/common/datavcmn.cpp       |  2 ++
 7 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 684d8617a9..d48e03e78f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -108,6 +108,7 @@ All (GUI):
 - Fix possible infinite loop in wxHtmlWindow layout (trivia21).
 - Add "hint" property support to XRC for wxComboBox and wxSearchCtrl.
 - Add support for style="page-break-inside:avoid" to <div> in wxHTML.
+- Add strike-through support to wxDataViewItem attributes (approach).
 
 wxGTK:
 
diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 573caf5227..c41ac8298c 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -144,21 +144,24 @@ public:
     {
         m_bold = false;
         m_italic = false;
+        m_strikethrough = false;
     }
 
     // setters
     void SetColour(const wxColour& colour) { m_colour = colour; }
     void SetBold( bool set ) { m_bold = set; }
     void SetItalic( bool set ) { m_italic = set; }
+    void SetStrikethrough( bool set ) { m_strikethrough = set; }
     void SetBackgroundColour(const wxColour& colour)  { m_bgColour = colour; }
 
     // accessors
     bool HasColour() const { return m_colour.IsOk(); }
     const wxColour& GetColour() const { return m_colour; }
 
-    bool HasFont() const { return m_bold || m_italic; }
+    bool HasFont() const { return m_bold || m_italic || m_strikethrough; }
     bool GetBold() const { return m_bold; }
     bool GetItalic() const { return m_italic; }
+    bool GetStrikethrough() const { return m_strikethrough; }
 
     bool HasBackgroundColour() const { return m_bgColour.IsOk(); }
     const wxColour& GetBackgroundColour() const { return m_bgColour; }
@@ -172,6 +175,7 @@ private:
     wxColour m_colour;
     bool     m_bold;
     bool     m_italic;
+    bool     m_strikethrough;
     wxColour m_bgColour;
 };
 
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index c673939758..6958ee7386 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -703,6 +703,17 @@ public:
     */
     void SetItalic(bool set);
 
+    /**
+        Call this to indicate that the item shall be displayed in strikethrough
+        text.
+
+        Currently this attribute is only supported in the generic version of
+        wxDataViewCtrl and ignored by the native GTK+ and OS X implementations.
+
+        @since 3.1.2
+    */
+    void SetStrikethrough( bool set );
+
 
     /**
        Returns true if the colour property has been set.
diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 9615cc2c88..8f20dee696 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -725,6 +725,11 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
             m_list_model = new MyListModel;
             m_ctrl[1]->AssociateModel( m_list_model.get() );
 
+            m_ctrl[1]->AppendToggleColumn(L"\u2714",
+                                          MyListModel::Col_Toggle,
+                                          wxDATAVIEW_CELL_ACTIVATABLE,
+                                          wxCOL_WIDTH_AUTOSIZE);
+
             // the various columns
             m_ctrl[1]->AppendTextColumn("editable string",
                                         MyListModel::Col_EditableText,
diff --git a/samples/dataview/mymodels.cpp b/samples/dataview/mymodels.cpp
index c7953bfcdc..ae40acb021 100644
--- a/samples/dataview/mymodels.cpp
+++ b/samples/dataview/mymodels.cpp
@@ -336,10 +336,13 @@ MyListModel::MyListModel() :
     // all the others are synthesized on request
     static const unsigned NUMBER_REAL_ITEMS = 100;
 
+    m_toggleColValues.reserve(NUMBER_REAL_ITEMS);
     m_textColValues.reserve(NUMBER_REAL_ITEMS);
+    m_toggleColValues.push_back(false);
     m_textColValues.push_back("first row with long label to test ellipsization");
     for (unsigned int i = 1; i < NUMBER_REAL_ITEMS; i++)
     {
+        m_toggleColValues.push_back(false);
         m_textColValues.push_back(wxString::Format("real row %d", i));
     }
 
@@ -351,6 +354,7 @@ MyListModel::MyListModel() :
 
 void MyListModel::Prepend( const wxString &text )
 {
+    m_toggleColValues.insert( m_toggleColValues.begin(), 0 );
     m_textColValues.Insert( text, 0 );
     RowPrepended();
 }
@@ -359,6 +363,11 @@ void MyListModel::DeleteItem( const wxDataViewItem &item )
 {
     unsigned int row = GetRow( item );
 
+    if (row >= m_toggleColValues.size())
+        return;
+
+    m_toggleColValues.erase( m_toggleColValues.begin()+row );
+
     if (row >= m_textColValues.GetCount())
         return;
 
@@ -374,7 +383,10 @@ void MyListModel::DeleteItems( const wxDataViewItemArray &items )
     {
         unsigned int row = GetRow( items[i] );
         if (row < m_textColValues.GetCount())
+        {
+            wxASSERT(row < m_toggleColValues.size());
             rows.Add( row );
+        }
     }
 
     if (rows.GetCount() == 0)
@@ -390,7 +402,10 @@ void MyListModel::DeleteItems( const wxDataViewItemArray &items )
     // remaining indeces would all be wrong.
     rows.Sort( my_sort_reverse );
     for (i = 0; i < rows.GetCount(); i++)
+    {
+        m_toggleColValues.erase( m_toggleColValues.begin()+rows[i] );
         m_textColValues.RemoveAt( rows[i] );
+    }
 
     // This is just to test if wxDataViewCtrl can
     // cope with removing rows not sorted in
@@ -409,6 +424,13 @@ void MyListModel::GetValueByRow( wxVariant &variant,
 {
     switch ( col )
     {
+        case Col_Toggle:
+            if (row >= m_toggleColValues.size())
+                variant = false;
+            else
+                variant = m_toggleColValues[row];
+            break;
+
         case Col_EditableText:
             if (row >= m_textColValues.GetCount())
                 variant = wxString::Format( "virtual row %d", row );
@@ -470,8 +492,20 @@ bool MyListModel::GetAttrByRow( unsigned int row, unsigned int col,
 {
     switch ( col )
     {
+        case Col_Toggle:
+            return false;
+
         case Col_EditableText:
         case Col_Date:
+            if (row < m_toggleColValues.size())
+            {
+                if (m_toggleColValues[row])
+                {
+                    attr.SetColour( wxColour( *wxLIGHT_GREY ) );
+                    attr.SetStrikethrough( true );
+                    return true;
+                }
+            }
             return false;
 
         case Col_IconText:
@@ -482,6 +516,16 @@ bool MyListModel::GetAttrByRow( unsigned int row, unsigned int col,
             break;
 
         case Col_TextWithAttr:
+            if (row < m_toggleColValues.size())
+            {
+                if (m_toggleColValues[row])
+                {
+                    attr.SetColour( wxColour( *wxLIGHT_GREY ) );
+                    attr.SetStrikethrough( true );
+                    return true;
+                }
+            }
+
         case Col_Custom:
             // do what the labels defined in GetValueByRow() hint at
             switch ( row % 5 )
@@ -520,6 +564,13 @@ bool MyListModel::SetValueByRow( const wxVariant &variant,
 {
     switch ( col )
     {
+        case Col_Toggle:
+            if (row >= m_toggleColValues.size())
+                return false;
+
+            m_toggleColValues[row] = variant.GetBool();
+            return true;
+
         case Col_EditableText:
         case Col_IconText:
             if (row >= m_textColValues.GetCount())
diff --git a/samples/dataview/mymodels.h b/samples/dataview/mymodels.h
index 4c7d1a3a10..d812a31c8c 100644
--- a/samples/dataview/mymodels.h
+++ b/samples/dataview/mymodels.h
@@ -9,6 +9,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/hashmap.h"
+#include <wx/vector.h>
 
 WX_DECLARE_HASH_MAP(unsigned, wxString, wxIntegerHash, wxIntegerEqual,
                     IntToStringMap);
@@ -196,6 +197,7 @@ class MyListModel: public wxDataViewVirtualListModel
 public:
     enum
     {
+        Col_Toggle,
         Col_EditableText,
         Col_IconText,
         Col_Date,
@@ -223,6 +225,9 @@ public:
 
     virtual wxString GetColumnType( unsigned int col ) const wxOVERRIDE
     {
+        if (col == Col_Toggle)
+            return wxT( "bool" );
+
         if (col == Col_IconText)
             return wxT("wxDataViewIconText");
 
@@ -237,6 +242,7 @@ public:
                                 unsigned int row, unsigned int col ) wxOVERRIDE;
 
 private:
+    wxVector<bool>   m_toggleColValues;
     wxArrayString    m_textColValues;
     wxArrayString    m_iconColValues;
     IntToStringMap   m_customColValues;
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index fd68880243..05a1021742 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -87,6 +87,8 @@ wxFont wxDataViewItemAttr::GetEffectiveFont(const wxFont& font) const
         f.MakeBold();
     if ( GetItalic() )
         f.MakeItalic();
+    if ( GetStrikethrough() )
+        f.MakeStrikethrough();
     return f;
 }
 

From 606dc18e5fda93a8ffb741d96e8e84b0856608fc Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Wed, 15 Aug 2018 21:51:33 +0200
Subject: [PATCH 851/916] Don't switch NSCell to single-line mode (wxOSX)

NSCell of a single-line wxTextCtrl cannot be just switched
to the single-line mode because apart from restricting layout to a single
line this also effectively blocks processing of the Return key.

To restrict the contents of the cell to a single line we need to replace
in wxTextEntryFormatter every new line character with space (this simulates
what is done when NSCell works in native single-line mode).

Closes #18183.
Closes #18179.
Closes #18101.
See #12693.
---
 src/osx/cocoa/textctrl.mm | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 18aa408e72..dfab030e94 100644
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -148,7 +148,7 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
     forceUpper = true;
 }
 
-- (NSString *)stringForObjectValue:(id)anObject 
+- (NSString *)stringForObjectValue:(id)anObject
 {
     if(![anObject isKindOfClass:[NSString class]])
         return nil;
@@ -173,14 +173,16 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
         }
     }
 
-    if ( forceUpper )
+    // wxTextEntryFormatter is always associated with single-line text entry (through wxNSTextFieldControl)
+    // so all new line characters should be replaced with spaces (like it is done in single-line NSCell).
+    NSString* lineStr = [*partialStringPtr stringByReplacingOccurrencesOfString: @"\n" withString: @" "];
+
+    NSString* newStr = forceUpper ? [lineStr uppercaseString] : lineStr;
+
+    if ( ![*partialStringPtr isEqual:newStr] )
     {
-        NSString* upper = [*partialStringPtr uppercaseString];
-        if ( ![*partialStringPtr isEqual:upper] )
-        {
-            *partialStringPtr = upper;
-            return NO;
-        }
+        *partialStringPtr = newStr;
+        return NO;
     }
 
     return YES;
@@ -1190,6 +1192,8 @@ void wxNSTextFieldControl::Init(WXWidget w)
     [m_textField setDelegate: tf];
     m_selStart = m_selEnd = 0;
     m_hasEditor = [w isKindOfClass:[NSTextField class]];
+
+    GetFormatter(); // we always need to at least replace new line characters with spaces
 }
 
 wxNSTextFieldControl::~wxNSTextFieldControl()
@@ -1470,7 +1474,6 @@ void wxNSTextFieldControl::SetJustification()
 //
 //
 //
-
 wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
                                     wxWindowMac* WXUNUSED(parent),
                                     wxWindowID WXUNUSED(id),
@@ -1508,10 +1511,11 @@ wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer,
         }
                 
         NSTextFieldCell* cell = [v cell];
-        [cell setUsesSingleLineMode:YES];
+        [cell setWraps:NO];
+        [cell setScrollable:YES];
 
         c = new wxNSTextFieldControl( wxpeer, wxpeer, v );
-        
+
         if ( (style & wxNO_BORDER) || (style & wxSIMPLE_BORDER) )
         {
             // under 10.7 the textcontrol can draw its own focus

From 29c218f1b44b3ff589df5f433deba89f0c943a0d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Aug 2018 12:46:09 +0200
Subject: [PATCH 852/916] Slightly de-uglify Unix version of
 wxThreadInternal::Create()

Just use wxUnusedVar() instead of defining and using the ugly
WXUNUSED_STACKSIZE() macro.

Also change an out of date comment as the thread priority is not the
only attribute being changed here.

No real changes.
---
 src/unix/threadpsx.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index aac8d1d795..68614fc78a 100644
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -987,14 +987,7 @@ wxThreadInternal::~wxThreadInternal()
 {
 }
 
-#ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE
-    #define WXUNUSED_STACKSIZE(identifier)  identifier
-#else
-    #define WXUNUSED_STACKSIZE(identifier)  WXUNUSED(identifier)
-#endif
-
-wxThreadError wxThreadInternal::Create(wxThread *thread,
-                                       unsigned int WXUNUSED_STACKSIZE(stackSize))
+wxThreadError wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 {
     if ( GetState() != STATE_NEW )
     {
@@ -1002,13 +995,15 @@ wxThreadError wxThreadInternal::Create(wxThread *thread,
         return wxTHREAD_RUNNING;
     }
 
-    // set up the thread attribute: right now, we only set thread priority
+    // set up the thread attribute: such as priority and stack size
     pthread_attr_t attr;
     pthread_attr_init(&attr);
 
 #ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE
     if (stackSize)
       pthread_attr_setstacksize(&attr, stackSize);
+#else
+    wxUnusedVar(stackSize);
 #endif
 
 #ifdef HAVE_THREAD_PRIORITY_FUNCTIONS

From 51c8496087f390c20544140014daa2d80063d3d0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Aug 2018 12:58:10 +0200
Subject: [PATCH 853/916] Don't change thread priority if it is default under
 Unix

Skip all the code dealing with the priority/scheduling parameters if the
priority is just wxPRIORITY_DEFAULT anyhow, as it's unnecessary to do
anything in this case and it can result in spurious errors.

Also extract this code into a separate SetThreadPriority() function to
make wxThreadInternal::Create() itself shorter and more clear.

Closes #18195.
---
 docs/changes.txt       |   1 +
 src/unix/threadpsx.cpp | 124 ++++++++++++++++++++++++-----------------
 2 files changed, 74 insertions(+), 51 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index d48e03e78f..2cd559dd2f 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -96,6 +96,7 @@ All:
 - Make wxList and wxVector iterators conform to input iterator requirements.
 - Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
 - Fix build issues under HaikuOS (mill-j).
+- Avoid spurious errors on thread creation under NetBSD.
 
 All (GUI):
 
diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 68614fc78a..6611e5ece4 100644
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -987,6 +987,74 @@ wxThreadInternal::~wxThreadInternal()
 {
 }
 
+static bool SetThreadPriority(pthread_attr_t& attr, int prio)
+{
+    if ( prio == wxPRIORITY_DEFAULT )
+    {
+        // Don't even try to do anything, there is no need for it and it could
+        // result in failures if we don't handle setting the priority correctly
+        // under the current platform, see e.g. #18195.
+        return true;
+    }
+
+#ifdef HAVE_THREAD_PRIORITY_FUNCTIONS
+    int policy;
+    if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
+    {
+        wxLogError(_("Cannot retrieve thread scheduling policy."));
+        return false;
+    }
+
+#ifdef __VMS__
+   /* the pthread.h contains too many spaces. This is a work-around */
+# undef sched_get_priority_max
+#undef sched_get_priority_min
+#define sched_get_priority_max(_pol_) \
+     (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX)
+#define sched_get_priority_min(_pol_) \
+     (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN)
+#endif
+
+    int max_prio = sched_get_priority_max(policy),
+        min_prio = sched_get_priority_min(policy);
+
+    if ( min_prio == -1 || max_prio == -1 )
+    {
+        wxLogError(_("Cannot get priority range for scheduling policy %d."),
+                   policy);
+        return false;
+    }
+
+    if ( max_prio == min_prio )
+    {
+        // notify the programmer that this doesn't work here
+        wxLogWarning(_("Thread priority setting is ignored."));
+        return false;
+    }
+
+    struct sched_param sp;
+    if ( pthread_attr_getschedparam(&attr, &sp) != 0 )
+    {
+        wxFAIL_MSG(wxT("pthread_attr_getschedparam() failed"));
+        return false;
+    }
+
+    sp.sched_priority = min_prio + (prio*(max_prio - min_prio))/100;
+
+    if ( pthread_attr_setschedparam(&attr, &sp) != 0 )
+    {
+        wxFAIL_MSG(wxT("pthread_attr_setschedparam(priority) failed"));
+        return false;
+    }
+
+    return true;
+#else // !HAVE_THREAD_PRIORITY_FUNCTIONS
+    wxUnusedVar(attr);
+
+    return false;
+#endif // HAVE_THREAD_PRIORITY_FUNCTIONS
+}
+
 wxThreadError wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 {
     if ( GetState() != STATE_NEW )
@@ -1006,60 +1074,14 @@ wxThreadError wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
     wxUnusedVar(stackSize);
 #endif
 
-#ifdef HAVE_THREAD_PRIORITY_FUNCTIONS
-    int policy;
-    if ( pthread_attr_getschedpolicy(&attr, &policy) != 0 )
+    if ( !SetThreadPriority(attr, GetPriority()) )
     {
-        wxLogError(_("Cannot retrieve thread scheduling policy."));
+        // We currently ignore the failure to set the thread priority as it
+        // seems better to create a thread with default priority than to
+        // not create one at all.
+        wxLogDebug("Failed to set thread priority to %d", GetPriority());
     }
 
-#ifdef __VMS__
-   /* the pthread.h contains too many spaces. This is a work-around */
-# undef sched_get_priority_max
-#undef sched_get_priority_min
-#define sched_get_priority_max(_pol_) \
-     (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX)
-#define sched_get_priority_min(_pol_) \
-     (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN)
-#endif
-
-    int max_prio = sched_get_priority_max(policy),
-        min_prio = sched_get_priority_min(policy),
-        prio = GetPriority();
-
-    if ( min_prio == -1 || max_prio == -1 )
-    {
-        wxLogError(_("Cannot get priority range for scheduling policy %d."),
-                   policy);
-    }
-    else if ( max_prio == min_prio )
-    {
-        if ( prio != wxPRIORITY_DEFAULT )
-        {
-            // notify the programmer that this doesn't work here
-            wxLogWarning(_("Thread priority setting is ignored."));
-        }
-        //else: we have default priority, so don't complain
-
-        // anyhow, don't do anything because priority is just ignored
-    }
-    else
-    {
-        struct sched_param sp;
-        if ( pthread_attr_getschedparam(&attr, &sp) != 0 )
-        {
-            wxFAIL_MSG(wxT("pthread_attr_getschedparam() failed"));
-        }
-
-        sp.sched_priority = min_prio + (prio*(max_prio - min_prio))/100;
-
-        if ( pthread_attr_setschedparam(&attr, &sp) != 0 )
-        {
-            wxFAIL_MSG(wxT("pthread_attr_setschedparam(priority) failed"));
-        }
-    }
-#endif // HAVE_THREAD_PRIORITY_FUNCTIONS
-
 #ifdef HAVE_PTHREAD_ATTR_SETSCOPE
     // this will make the threads created by this process really concurrent
     if ( pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) != 0 )

From cec14a334c28150c2237314534eb29b0d2853afb Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Aug 2018 13:14:19 +0200
Subject: [PATCH 854/916] Document that wxThread::SetPriority() is broken under
 Unix

The code setting thread priority doesn't work without changing the
scheduling policy as thread priorities are simply ignored when using the
default SCHED_OTHER (at least under Linux and NetBSD, but probably other
systems too).

See #18195.
---
 interface/wx/thread.h  | 3 +++
 src/unix/threadpsx.cpp | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/interface/wx/thread.h b/interface/wx/thread.h
index e99caa1605..f308327a29 100644
--- a/interface/wx/thread.h
+++ b/interface/wx/thread.h
@@ -1248,6 +1248,9 @@ public:
         be only set after creating the thread with CreateThread(). But under
         all platforms this method can be called either before launching the
         thread using Run() or after doing it.
+
+        Please note that currently this function is not implemented when using
+        the default (@c SCHED_OTHER) scheduling policy under POSIX systems.
     */
     void SetPriority(unsigned int priority);
 
diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index 6611e5ece4..db797e696f 100644
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -1005,6 +1005,12 @@ static bool SetThreadPriority(pthread_attr_t& attr, int prio)
         return false;
     }
 
+    // TODO: on most (all?) systems, thread priorities can't be used with
+    //       SCHED_OTHER policy, so we need to check if this is the current
+    //       policy and change it to something else (SCHED_FIFO or SCHED_RR?)
+    //       in order to be able to actually change the priority as without
+    //       doing it the code below just not going to work.
+
 #ifdef __VMS__
    /* the pthread.h contains too many spaces. This is a work-around */
 # undef sched_get_priority_max

From 99cb097f4d5bb017519f4e3cf233b5439e2526f9 Mon Sep 17 00:00:00 2001
From: wiz <wiz@trac.wxwidgets.org>
Date: Thu, 16 Aug 2018 13:40:28 +0200
Subject: [PATCH 855/916] Install wx-config as a script, not as a binary
 program

Installing it using INSTALL_PROGRAM results in problems under NetBSD
where INSTALL_PROGRAM tries to strip it. Use INSTALL_SCRIPT instead.

Closes #18197.
---
 Makefile.in      | 3 ++-
 docs/changes.txt | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index f0363aebb4..31ac00fed4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,6 +24,7 @@ PIC_FLAG = @PIC_FLAG@
 SONAME_FLAG = @SONAME_FLAG@
 STRIP = @STRIP@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
 ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
@@ -15191,7 +15192,7 @@ samples:
 install-wxconfig: 
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
-	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
 	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
 
 locale_install: 
diff --git a/docs/changes.txt b/docs/changes.txt
index d48e03e78f..2efcdb59bf 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -96,6 +96,7 @@ All:
 - Make wxList and wxVector iterators conform to input iterator requirements.
 - Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
 - Fix build issues under HaikuOS (mill-j).
+- Fix problem with wx-config installation under NetBSD (wiz).
 
 All (GUI):
 

From 48fc60609d82ee8422f87cdf4f2442817b9de272 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Aug 2018 13:45:53 +0200
Subject: [PATCH 856/916] Use more compatible "=" in test(1) instead of "=="

The latter is not supported in all shells and results in problems under
NetBSD for example.

Closes #18198.
---
 build/aclocal/bakefile.m4 | 2 +-
 configure                 | 4 ++--
 configure.in              | 2 +-
 docs/changes.txt          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index 438c071bf6..e9163e5a14 100644
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -323,7 +323,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
         fi
 
-        if test "x$GCC" == "xyes"; then
+        if test "x$GCC" = "xyes"; then
             PIC_FLAG="-dynamic -fPIC"
         fi
         if test "x$XLCC" = "xyes"; then
diff --git a/configure b/configure
index 283e60c3a5..1a88b20e34 100755
--- a/configure
+++ b/configure
@@ -20187,7 +20187,7 @@ $as_echo_n "checking SDK deployment version... " >&6; }
         MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
 
         # If that failed, try again with the new key
-        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
+        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
 
             MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
 
@@ -40129,7 +40129,7 @@ $as_echo "$bakefile_cv_gcc31" >&6; }
             SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
         fi
 
-        if test "x$GCC" == "xyes"; then
+        if test "x$GCC" = "xyes"; then
             PIC_FLAG="-dynamic -fPIC"
         fi
         if test "x$XLCC" = "xyes"; then
diff --git a/configure.in b/configure.in
index 08a9f46b1a..8a642c4c6b 100644
--- a/configure.in
+++ b/configure.in
@@ -1258,7 +1258,7 @@ dnl We need to quote the next line where we don't need macros and do need [] in
         MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
 ]
         # If that failed, try again with the new key
-        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
+        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
 [
             MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
 ]
diff --git a/docs/changes.txt b/docs/changes.txt
index 2efcdb59bf..4ac5348811 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -96,7 +96,7 @@ All:
 - Make wxList and wxVector iterators conform to input iterator requirements.
 - Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
 - Fix build issues under HaikuOS (mill-j).
-- Fix problem with wx-config installation under NetBSD (wiz).
+- Fix problem with wx-config installation and use under NetBSD (wiz).
 
 All (GUI):
 

From c6af757edb1521206ed3ffbd54efa7347e8f57d9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Aug 2018 13:30:07 +0200
Subject: [PATCH 857/916] Don't use WXDLLIMPEXP_FWD_BASE in typedef to fix
 clang build

clang doesn't seem to like __declspec in typedefs, so declare the class
first using the macro expanding into __declspec and don't use it in the
typedef later.

Closes #18196.
---
 include/wx/hash.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/wx/hash.h b/include/wx/hash.h
index ea4e3021b2..ae552cd84e 100644
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -40,10 +40,13 @@ union wxHashKeyValue
 // enough, so provide a real forward declaration
 class WXDLLIMPEXP_FWD_BASE wxHashTableBase;
 
+// and clang doesn't like using WXDLLIMPEXP_FWD_BASE inside a typedef.
+class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node;
+
 class WXDLLIMPEXP_BASE wxHashTableBase_Node
 {
-    friend class WXDLLIMPEXP_FWD_BASE wxHashTableBase;
-    typedef class WXDLLIMPEXP_FWD_BASE wxHashTableBase_Node _Node;
+    friend class wxHashTableBase;
+    typedef class wxHashTableBase_Node _Node;
 public:
     wxHashTableBase_Node( long key, void* value,
                           wxHashTableBase* table );

From 6d870fe011d7c8bb59baa3964b736eff50ff4eea Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Aug 2018 19:48:41 +0200
Subject: [PATCH 858/916] Improve wxPD_APP_MODAL description in the
 documentation

Explain the "application modality" concept.
---
 interface/wx/progdlg.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/interface/wx/progdlg.h b/interface/wx/progdlg.h
index 589976076d..d78b49a6fa 100644
--- a/interface/wx/progdlg.h
+++ b/interface/wx/progdlg.h
@@ -55,8 +55,9 @@
 
     @beginStyleTable
     @style{wxPD_APP_MODAL}
-           Make the progress dialog modal. If this flag is not given, it is
-           only "locally" modal - that is the input to the parent window is
+           Make the progress dialog application-modal, i.e. disable all
+           application windows while it is shown. If this flag is not given, it
+           is only "locally" modal -- that is the input to the parent window is
            disabled, but not to the other ones.
     @style{wxPD_AUTO_HIDE}
            Causes the progress dialog to disappear from screen as soon as the

From 25678f60953ad5998f3650a277d0bf628034e084 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Aug 2018 19:57:18 +0200
Subject: [PATCH 859/916] Don't disable main application window in
 wxProgressDialog

Since 58f90d36a01090bb0cd66ec59a96f73ae13d10a6, the main application
window was disabled even if no parent was specified when creating
wxProgressDialog, which was a change in behaviour compared to 3.1.0 and
earlier versions.

Revert this change and don't disable any windows if neither parent nor
wxPD_APP_MODAL is given.

Closes #18189.
---
 interface/wx/progdlg.h   | 6 +++++-
 src/generic/progdlgg.cpp | 9 ++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/interface/wx/progdlg.h b/interface/wx/progdlg.h
index d78b49a6fa..28ce778ed6 100644
--- a/interface/wx/progdlg.h
+++ b/interface/wx/progdlg.h
@@ -105,7 +105,11 @@ public:
             In the generic implementation the progress bar is constructed
             only if this value is greater than zero.
         @param parent
-            Parent window.
+            Parent window. It will be disabled while this dialog is shown if
+            non-null (whether @c wxPD_APP_MODAL is specified or not). Note that
+            if you specify null parent and don't use @c wxPD_APP_MODAL, you
+            need to take care to avoid reentrancies, i.e. avoiding showing the
+            progress dialog again while this one is shown.
         @param style
             The dialog style. See wxProgressDialog.
     */
diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 03e1e7f933..4c7b1d0ef4 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -134,7 +134,14 @@ wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title,
 void wxGenericProgressDialog::SetTopParent(wxWindow* parent)
 {
     m_parent = parent;
-    m_parentTop = GetParentForModalDialog(parent, GetWindowStyle());
+
+    // Notice that we intentionally do not use GetParentForModalDialog() here
+    // as we don't want to disable the main application window if null parent
+    // was given (and GetParentForModalDialog() would fall back to it in this
+    // case). This allows creating modeless progress dialog, which can be
+    // useful even though it is also dangerous because it can easily result in
+    // unwanted reentrancies.
+    m_parentTop = parent;
 }
 
 bool wxGenericProgressDialog::Create( const wxString& title,

From fd81223a2f878757158b5266c362da71d43abee5 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 16 Aug 2018 20:08:56 +0200
Subject: [PATCH 860/916] Fix c++11-narrowing error when using clang on Windows

Case value 0xfffffd9f results in the following error:
error: case value evaluates to 4294966687, which cannot be narrowed to type
'DISPID' (aka 'long') [-Wc++11-narrowing]
---
 src/msw/mediactrl_am.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index 1b8c9e6bd7..5379eda8af 100644
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -1530,7 +1530,9 @@ void wxAMMediaBackend::Move(int WXUNUSED(x), int WXUNUSED(y),
 //---------------------------------------------------------------------------
 void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event)
 {
-    switch(event.GetDispatchId())
+    // cast to unsigned long to fix narrowing error with case 0xfffffd9f
+    // when using clang
+    switch (static_cast<unsigned long>(event.GetDispatchId()))
     {
     case 0x00000001: // statechange in IActiveMovie
     case 0x00000bc4: // playstatechange in IMediaPlayer

From 8d72f3c5f493ddbda71a0066398644c876e09727 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 16 Aug 2018 20:11:12 +0200
Subject: [PATCH 861/916] Fix multiple definition error when using clang on
 Windows

---
 src/msw/dirdlg.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 84557d7c95..b0b9ed84d9 100644
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -73,12 +73,15 @@ struct IShellItem : public IUnknown
 
 #endif // #ifndef __IShellItem_INTERFACE_DEFINED__
 
+#if defined(__VISUALC__) || !defined(__IShellItem_INTERFACE_DEFINED__)
 // Define this GUID in any case, even when __IShellItem_INTERFACE_DEFINED__ is
 // defined in the headers we might still not have it in the actual uuid.lib,
-// this happens with at least VC7 used with its original (i.e. not updated) SDK
-// and there is no harm in defining the GUID unconditionally.
+// this happens with at least VC7 used with its original (i.e. not updated) SDK.
+// clang complains about multiple definitions, so only define it unconditionally
+// when using a Visual C compiler.
 DEFINE_GUID(IID_IShellItem,
     0x43826D1E, 0xE718, 0x42EE, 0xBC, 0x55, 0xA1, 0xE2, 0x61, 0xC3, 0x7B, 0xFE);
+#endif
 
 struct IShellItemFilter;
 struct IFileDialogEvents;

From ceda6f6815dbb9910b52fe783db687567a5cad5a Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 16 Aug 2018 20:12:44 +0200
Subject: [PATCH 862/916] Support clang compiler on Windows when using CMake

---
 build/cmake/init.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index fac86758b6..06cd01906b 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -51,10 +51,12 @@ set(wxARCH_SUFFIX)
 
 # TODO: include compiler version in wxCOMPILER_PREFIX ?
 if(WIN32)
-    if(MSVC)
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
         set(wxCOMPILER_PREFIX "vc")
-    elseif(CMAKE_COMPILER_IS_GNUCXX)
+    elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
         set(wxCOMPILER_PREFIX "gcc")
+    elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+        set(wxCOMPILER_PREFIX "clang")
     else()
         message(FATAL_ERROR "Unknown WIN32 compiler type")
     endif()

From a8448b084ca6cc3566ae7434e65a3d1bf81afe9b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 17 Aug 2018 00:26:42 +0200
Subject: [PATCH 863/916] Remove duplicate wxGrid::m_winCapture initialization

No real changes, just remove one of 2 duplicate assignments.
---
 src/generic/grid.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 5a8831f792..f5bd9466a5 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2418,7 +2418,6 @@ void wxGrid::Init()
     m_selection = NULL;
     m_defaultCellAttr = NULL;
     m_typeRegistry = NULL;
-    m_winCapture = NULL;
 
     m_rowLabelWidth  = WXGRID_DEFAULT_ROW_LABEL_WIDTH;
     m_colLabelHeight = WXGRID_DEFAULT_COL_LABEL_HEIGHT;

From 41d6bc579a1ef1004469a0f9abc18c258121bb7d Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 16 Aug 2018 20:21:52 +0200
Subject: [PATCH 864/916] Enable precompiled headers for samples

---
 build/cmake/functions.cmake | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 84fe6e3f7d..748871d32f 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -338,6 +338,18 @@ macro(wx_test_enable_precomp target_name)
     endif()
 endmacro()
 
+# Enable precompiled headers for samples
+macro(wx_sample_enable_precomp target_name)
+    if(wxBUILD_PRECOMP)
+        target_compile_definitions(${target_name} PRIVATE WX_PRECOMP)
+        set_target_properties(${target_name} PROPERTIES
+            COTIRE_CXX_PREFIX_HEADER_INIT "${wxSOURCE_DIR}/include/wx/wxprec.h")
+        wx_target_enable_precomp(${target_name})
+    elseif(MSVC)
+        target_compile_definitions(${target_name} PRIVATE NOPCH)
+    endif()
+endmacro()
+
 # Enable precompiled headers for wx libraries
 macro(wx_finalize_lib target_name)
     set(wxLIB_TARGETS ${wxLIB_TARGETS} PARENT_SCOPE)
@@ -629,8 +641,6 @@ function(wx_add_sample name)
     if(SAMPLE_DEFINITIONS)
         target_compile_definitions(${target_name} PRIVATE ${SAMPLE_DEFINITIONS})
     endif()
-    # Disable precompile headers for samples
-    target_compile_definitions(${target_name} PRIVATE NOPCH)
     if(SAMPLE_DATA)
         # TODO: handle data files differently for OS X bundles
         # Copy data files to output directory
@@ -667,6 +677,7 @@ function(wx_add_sample name)
         wx_string_append(folder "/${SAMPLE_FOLDER}")
     endif()
     wx_set_common_target_properties(${target_name})
+    wx_sample_enable_precomp(${target_name})
     set_target_properties(${target_name} PROPERTIES
         FOLDER ${folder}
         )

From 61500907ee815944f029dd86639b3aa08c11dff7 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 17 Aug 2018 19:49:38 +0200
Subject: [PATCH 865/916] CMake: Improve precompiled headers for wxscintilla

The auto-generated header causes undefined members and identifiers in the
standard c++ headers when using clang on macOS or Windows.
Do not disable precompiled headers entirely but use the main Scintilla
header as prefix header so there is at least a small speedup.
---
 build/cmake/functions.cmake        | 30 ++++++++++--------------------
 build/cmake/lib/stc/CMakeLists.txt | 12 +++++++++++-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 748871d32f..31812bd59d 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -314,25 +314,21 @@ macro(wx_add_library name)
     endif()
 endmacro()
 
-# Enable cotire for target if precompiled headers are enabled
+# Enable cotire for target, use optional second argument for prec. header
 macro(wx_target_enable_precomp target_name)
-    if(wxBUILD_PRECOMP)
-        if(APPLE AND ${target_name} STREQUAL "wxscintilla")
-            # TODO: workaround/fix cotire issue with wxscintilla when using Xcode
-        else()
-            set_target_properties(${target_name} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-            cotire(${target_name})
-        endif()
+    target_compile_definitions(${target_name} PRIVATE WX_PRECOMP)
+    if(NOT ${ARGV1} STREQUAL "")
+        set_target_properties(${target_name} PROPERTIES
+            COTIRE_CXX_PREFIX_HEADER_INIT ${ARGV1})
     endif()
+    set_target_properties(${target_name} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
+    cotire(${target_name})
 endmacro()
 
 # Enable precompiled headers for tests
 macro(wx_test_enable_precomp target_name)
     if(wxBUILD_PRECOMP)
-        target_compile_definitions(${target_name} PRIVATE WX_PRECOMP)
-        set_target_properties(${target_name} PROPERTIES
-            COTIRE_CXX_PREFIX_HEADER_INIT "${wxSOURCE_DIR}/tests/testprec.h")
-        wx_target_enable_precomp(${target_name})
+        wx_target_enable_precomp(${target_name} "${wxSOURCE_DIR}/tests/testprec.h")
     elseif(MSVC)
         target_compile_definitions(${target_name} PRIVATE NOPCH)
     endif()
@@ -341,10 +337,7 @@ endmacro()
 # Enable precompiled headers for samples
 macro(wx_sample_enable_precomp target_name)
     if(wxBUILD_PRECOMP)
-        target_compile_definitions(${target_name} PRIVATE WX_PRECOMP)
-        set_target_properties(${target_name} PROPERTIES
-            COTIRE_CXX_PREFIX_HEADER_INIT "${wxSOURCE_DIR}/include/wx/wxprec.h")
-        wx_target_enable_precomp(${target_name})
+        wx_target_enable_precomp(${target_name} "${wxSOURCE_DIR}/include/wx/wxprec.h")
     elseif(MSVC)
         target_compile_definitions(${target_name} PRIVATE NOPCH)
     endif()
@@ -355,10 +348,7 @@ macro(wx_finalize_lib target_name)
     set(wxLIB_TARGETS ${wxLIB_TARGETS} PARENT_SCOPE)
     if(wxBUILD_PRECOMP)
         if(TARGET ${target_name})
-            target_compile_definitions(${target_name} PRIVATE WX_PRECOMP)
-            set_target_properties(${target_name} PROPERTIES
-                COTIRE_CXX_PREFIX_HEADER_INIT "${wxSOURCE_DIR}/include/wx/wxprec.h")
-            wx_target_enable_precomp(${target_name})
+        wx_target_enable_precomp(${target_name} "${wxSOURCE_DIR}/include/wx/wxprec.h")
         endif()
     elseif(MSVC)
         wx_lib_compile_definitions(${target_name} PRIVATE NOPCH)
diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt
index 55e3eafdf6..27af21bb79 100644
--- a/build/cmake/lib/stc/CMakeLists.txt
+++ b/build/cmake/lib/stc/CMakeLists.txt
@@ -164,7 +164,17 @@ target_compile_definitions(wxscintilla PUBLIC
     NO_CXX11_REGEX
     __WX__
 )
-wx_target_enable_precomp(wxscintilla)
+
+if(wxBUILD_PRECOMP)
+    # The auto-generated header causes undefined members and identifiers in the
+    # standard c++ headers when using clang on macOS or Windows.
+    # Do not disable precompiled headers entirely but use the main Scintilla
+    # header as prefix header so there is at least a small speedup.
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND (APPLE OR WIN32))
+        set(wxSCINTILLA_PREC_HEADER "${wxSOURCE_DIR}/src/stc/scintilla/include/Scintilla.h")
+    endif()
+    wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER})
+endif()
 
 wx_add_library(stc ${STC_FILES})
 wx_lib_include_directories(stc PRIVATE

From 0bf459de92c6a3cb6f3302bff4f9360210c8b552 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 17 Aug 2018 19:15:08 +0200
Subject: [PATCH 866/916] Fix typos and whitespace in CMake files.

---
 build/cmake/README.md              | 10 +++++-----
 build/cmake/functions.cmake        |  4 ++--
 build/cmake/init.cmake             |  2 +-
 build/cmake/options.cmake          |  1 -
 build/cmake/samples/CMakeLists.txt |  4 ++--
 build/cmake/setup.cmake            |  2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build/cmake/README.md b/build/cmake/README.md
index 708b78a434..82e13a28c6 100644
--- a/build/cmake/README.md
+++ b/build/cmake/README.md
@@ -28,9 +28,9 @@ Files
     * Every function should contain a short description of it's parameters as
       a comment before the function/macro
 * install.cmake
-    * Handles defintions for the `install` and `uninstall` target
+    * Handles definitions for the `install` and `uninstall` target
 * init.cmake
-    * Intializes various variables used during the build process and for
+    * Initializes various variables used during the build process and for
       generation of setup.h and configuration files
 * main.cmake
     * Includes all other cmake files
@@ -60,7 +60,7 @@ _.cmake_ files.
     * Defines build targets for demos via `wx_add_demo()`
 * lib
     * Defines build targets for all libraries and bundle third party libraries
-    * Each library is contained in a seperate directory and uses
+    * Each library is contained in a separate directory and uses
       `wx_add_library()` to define the library target
     * Bundled third party library without upstream CMake support are defined in
       a _.cmake_ file using `wx_add_builtin_library()` to define static library
@@ -70,8 +70,8 @@ _.cmake_ files.
     * Includes the [cotire module][4] used to for precompiled header generation
 * samples
     * Defines build targets for all samples via `wx_add_sample()`
-    * Defintions for trivial samples are included in _CMakeLists.txt_ more
-      complex samples might have a seperate .cmake file
+    * Definitions for trivial samples are included in _CMakeLists.txt_ more
+      complex samples might have a separate .cmake file
 * tests
     * Defines build targets for all tests
 * utils
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 31812bd59d..8d4dc94511 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -8,7 +8,7 @@
 #############################################################################
 
 include(CMakeDependentOption)
-include(CMakeParseArguments)           # For compatiblity with CMake < 3.4
+include(CMakeParseArguments)           # For compatibility with CMake < 3.4
 include(ExternalProject)
 if(CMAKE_GENERATOR STREQUAL "Xcode")
     # wxWidgets does not use the unity features of cotire so we can
@@ -546,7 +546,7 @@ endfunction()
 # IMPORTANT does not require wxBUILD_SAMPLES=ALL
 # RES followed by WIN32 .rc files
 #
-# Additinally the following variables may be set before calling wx_add_sample:
+# Additionally the following variables may be set before calling wx_add_sample:
 # wxSAMPLE_SUBDIR subdirectory in the samples/ folder to use as base
 # wxSAMPLE_FOLDER IDE sub folder to be used for the samples
 function(wx_add_sample name)
diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 06cd01906b..4c93866c8f 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -76,7 +76,7 @@ if(MSVC OR MINGW)
     endif()
 
     if(MSVC)
-        # Include generator expression to supress default Debug/Release pair
+        # Include generator expression to suppress default Debug/Release pair
         set(wxPLATFORM_LIB_DIR "$<1:/>${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}")
     else()
         set(wxPLATFORM_LIB_DIR "/${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}_${lib_suffix}")
diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake
index 4a3d18a533..48b2ddf70a 100644
--- a/build/cmake/options.cmake
+++ b/build/cmake/options.cmake
@@ -403,7 +403,6 @@ if(WIN32)
         set(wxUSE_WINRT_DEFAULT OFF)
     endif()
     wx_option(wxUSE_WINRT "enable WinRT support" ${wxUSE_WINRT_DEFAULT})
-    
 endif()
 
 # this one is not really MSW-specific but it exists mainly to be turned off
diff --git a/build/cmake/samples/CMakeLists.txt b/build/cmake/samples/CMakeLists.txt
index b59b698f63..27822b3b5f 100644
--- a/build/cmake/samples/CMakeLists.txt
+++ b/build/cmake/samples/CMakeLists.txt
@@ -199,7 +199,7 @@ wx_list_add_prefix(WIDGETS_RC_FILES icons/
     slider.xpm spinbtn.xpm statbmp.xpm statbox.xpm
     stattext.xpm text.xpm timepick.xpm toggle.xpm
     )
-wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC} 
+wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC}
     DATA ${WIDGETS_RC_FILES} textctrl.cpp
     LIBRARIES adv
     )
@@ -258,7 +258,7 @@ if(WIN32)
     if(MSVC)
         wx_add_sample(flash)
     endif()
-    #TODO: renable when sample is fixed
+    #TODO: reenable when sample is fixed
     #wx_add_sample(mfc mfctest.cpp mfctest.h resource.h stdafx.h RES mfctest.rc)
     wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc)
     wx_add_sample(oleauto DEPENDS wxUSE_OLE)
diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake
index 700d41e0f5..46092b0797 100644
--- a/build/cmake/setup.cmake
+++ b/build/cmake/setup.cmake
@@ -310,7 +310,7 @@ if(NOT WIN32)
             statfs(\"/\", &fs);"
             HAVE_STATFS_DECL)
     else()
-        # TODO: implment statvfs checks
+        # TODO: implement statvfs checks
         if(HAVE_STATVFS)
             set(WX_STATFS_T statvfs_t)
         endif()

From ef7d203bf44303b16051ff8f1e3e9bce46803049 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Fri, 17 Aug 2018 19:54:52 +0200
Subject: [PATCH 867/916] Fix building taskbarbutton sample with precompiled
 headers

---
 samples/taskbarbutton/taskbarbutton.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/taskbarbutton/taskbarbutton.cpp b/samples/taskbarbutton/taskbarbutton.cpp
index 16241b5a93..f386832cf9 100644
--- a/samples/taskbarbutton/taskbarbutton.cpp
+++ b/samples/taskbarbutton/taskbarbutton.cpp
@@ -15,10 +15,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/progdlg.h"
-    #include "wx/stdpaths.h"
     #include "wx/wx.h"
 #endif
 
+#include "wx/stdpaths.h"
 #include "wx/taskbarbutton.h"
 
 enum

From ad224330c08b528bb246e170b3c602c86837aece Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 18 Aug 2018 11:08:14 +0200
Subject: [PATCH 868/916] Improve wxID_AUTO_{LOWEST,HIGHEST} description

Explain that the values of these constants are not 0 and 1, as could be
misconstrued by just looking at the enum declaration.
---
 interface/wx/defs.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index 7d4a954270..3bf4f67723 100644
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -564,13 +564,19 @@ enum wxStandardID
 {
     /**
        This id delimits the lower bound of the range used by automatically-generated ids
-       (i.e. those used when wxID_ANY is specified during construction).
+       (i.e.\ those used when wxID_ANY is specified during construction).
+
+       It is defined as a relatively large negative number and its exact value
+       is platform-dependent.
      */
     wxID_AUTO_LOWEST,
 
     /**
        This id delimits the upper bound of the range used by automatically-generated ids
-       (i.e. those used when wxID_ANY is specified during construction).
+       (i.e.\ those used when wxID_ANY is specified during construction).
+
+       It is defined as a relatively small negative number and its exact value
+       is platform-dependent.
      */
     wxID_AUTO_HIGHEST,
 

From 44efb4e3a40f319ff09c8d4b795130c97cc997dc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 18 Aug 2018 11:10:45 +0200
Subject: [PATCH 869/916] Fix badly formatted Doxygen references in
 wxStandardID

@ref label argument must be on the same line.
---
 interface/wx/defs.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index 3bf4f67723..eb9c7035b9 100644
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -557,8 +557,9 @@ enum wxBackgroundStyle
 
     Notice that some, but @em not all, of these IDs are also stock IDs, i.e.
     you can use them for the button or menu items without specifying the label
-    which will be provided by the underlying platform itself. See @ref page_stockitems "the
-    list of stock items" for the subset of standard IDs which are stock IDs as well.
+    which will be provided by the underlying platform itself. See
+    @ref page_stockitems "the list of stock items" for the subset of standard
+    IDs which are stock IDs as well.
 */
 enum wxStandardID
 {

From 53972b17ee702f8dbd0c2fee998bdecbb4f0bdd3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 17 Aug 2018 00:28:21 +0200
Subject: [PATCH 870/916] Add helper wxGrid::DoAfterDraggingEnd() function

No real changes, just refactor the code to extract the part of
CancelMouseCapture() which can be useful not only when the mouse capture
is lost unexpectedly, but also when we release it of our own volition,
into a separate function.
---
 include/wx/generic/grid.h |  4 ++++
 src/generic/grid.cpp      | 17 +++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index c1adbb0b24..b01c6b4e54 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -2218,6 +2218,10 @@ private:
     // SetColPos() and ResetColPos())
     void RefreshAfterColPosChange();
 
+    // reset the variables used during dragging operations after it ended
+    // because we lost mouse capture
+    void DoAfterDraggingEnd();
+
 
     // return the position (not index) of the column at the given logical pixel
     // position
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index f5bd9466a5..c3ab7f0594 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3846,18 +3846,23 @@ void wxGrid::CancelMouseCapture()
     // cancel operation currently in progress, whatever it is
     if ( m_winCapture )
     {
-        m_isDragging = false;
-        m_startDragPos = wxDefaultPosition;
-
-        m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
-        m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
-        m_winCapture = NULL;
+        DoAfterDraggingEnd();
 
         // remove traces of whatever we drew on screen
         Refresh();
     }
 }
 
+void wxGrid::DoAfterDraggingEnd()
+{
+    m_isDragging = false;
+    m_startDragPos = wxDefaultPosition;
+
+    m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
+    m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
+    m_winCapture = NULL;
+}
+
 void wxGrid::ChangeCursorMode(CursorMode mode,
                               wxWindow *win,
                               bool captureMouse)

From bb00501e77f52acc93eeee39a9c3ce3ae35e9fd4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 17 Aug 2018 00:57:04 +0200
Subject: [PATCH 871/916] Fix mouse event handling while dragging in wxGrid

Ignore all the mouse events other than "left up" while dragging to avoid
releasing the mouse and ending the dragging operation too soon.

This required non-trivial refactoring of the code which hopefully should
also make it slightly more clear by centralizing high level logic in
ProcessGridCellMouseEvent() itself and calling various helper functions
from it instead of spreading this logic over the entire call tree.

The code still remains pretty confusing and rewriting it to use
wxMouseEventsManager (which would need to be generalized first to become
a template class using arbitrary item type instead of just "int", as
now) would undoubtedly do it a lot of good.

Closes #18186.
---
 include/wx/generic/grid.h |  16 +++--
 src/generic/grid.cpp      | 133 ++++++++++++++++++++------------------
 2 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index b01c6b4e54..a06c654855 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -2218,10 +2218,14 @@ private:
     // SetColPos() and ResetColPos())
     void RefreshAfterColPosChange();
 
-    // reset the variables used during dragging operations after it ended
-    // because we lost mouse capture
+    // reset the variables used during dragging operations after it ended,
+    // either because we called EndDraggingIfNecessary() ourselves or because
+    // we lost mouse capture
     void DoAfterDraggingEnd();
 
+    // release the mouse capture if it's currently captured
+    void EndDraggingIfNecessary();
+
 
     // return the position (not index) of the column at the given logical pixel
     // position
@@ -2242,8 +2246,12 @@ private:
     // process row/column resizing drag event
     void DoGridLineDrag(wxMouseEvent& event, const wxGridOperations& oper);
 
-    // process mouse drag event in the grid window
-    void DoGridDragEvent(wxMouseEvent& event, const wxGridCellCoords& coords);
+    // process mouse drag event in the grid window, return false if starting
+    // dragging was vetoed by the user-defined wxEVT_GRID_CELL_BEGIN_DRAG
+    // handler
+    bool DoGridDragEvent(wxMouseEvent& event,
+                         const wxGridCellCoords& coords,
+                         bool isFirstDrag);
 
     // process different clicks on grid cells
     void DoGridCellLeftDown(wxMouseEvent& event,
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index c3ab7f0594..2f01b2f667 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3863,6 +3863,16 @@ void wxGrid::DoAfterDraggingEnd()
     m_winCapture = NULL;
 }
 
+void wxGrid::EndDraggingIfNecessary()
+{
+    if ( m_winCapture )
+    {
+        m_winCapture->ReleaseMouse();
+
+        DoAfterDraggingEnd();
+    }
+}
+
 void wxGrid::ChangeCursorMode(CursorMode mode,
                               wxWindow *win,
                               bool captureMouse)
@@ -3897,11 +3907,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
         win = m_gridWin;
     }
 
-    if ( m_winCapture )
-    {
-        m_winCapture->ReleaseMouse();
-        m_winCapture = NULL;
-    }
+    EndDraggingIfNecessary();
 
     m_cursorMode = mode;
 
@@ -4019,34 +4025,14 @@ void wxGrid::DoGridLineDrag(wxMouseEvent& event, const wxGridOperations& oper)
     oper.DrawParallelLineInRect(dc, rectWin, m_dragLastPos);
 }
 
-void wxGrid::DoGridDragEvent(wxMouseEvent& event, const wxGridCellCoords& coords)
+bool wxGrid::DoGridDragEvent(wxMouseEvent& event,
+                             const wxGridCellCoords& coords,
+                             bool isFirstDrag)
 {
-    if ( !m_isDragging )
-    {
-        // Don't start doing anything until the mouse has been dragged far
-        // enough
-        const wxPoint& pt = event.GetPosition();
-        if ( m_startDragPos == wxDefaultPosition )
-        {
-            m_startDragPos = pt;
-            return;
-        }
-
-        if ( abs(m_startDragPos.x - pt.x) <= DRAG_SENSITIVITY &&
-                abs(m_startDragPos.y - pt.y) <= DRAG_SENSITIVITY )
-            return;
-    }
-
-    const bool isFirstDrag = !m_isDragging;
-    m_isDragging = true;
-
     switch ( m_cursorMode )
     {
         case WXGRID_CURSOR_SELECT_CELL:
-            // no further handling if handled by user
-            if ( DoGridCellDrag(event, coords, isFirstDrag) == false )
-                return;
-            break;
+            return DoGridCellDrag(event, coords, isFirstDrag);
 
         case WXGRID_CURSOR_RESIZE_ROW:
             DoGridLineDrag(event, wxGridRowOperations());
@@ -4060,13 +4046,7 @@ void wxGrid::DoGridDragEvent(wxMouseEvent& event, const wxGridCellCoords& coords
             event.Skip();
     }
 
-    if ( isFirstDrag )
-    {
-        wxASSERT_MSG( !m_winCapture, "shouldn't capture the mouse twice" );
-
-        m_winCapture = m_gridWin;
-        m_winCapture->CaptureMouse();
-    }
+    return true;
 }
 
 void
@@ -4160,12 +4140,6 @@ wxGrid::DoGridCellLeftUp(wxMouseEvent& event, const wxGridCellCoords& coords)
 {
     if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
     {
-        if (m_winCapture)
-        {
-            m_winCapture->ReleaseMouse();
-            m_winCapture = NULL;
-        }
-
         if ( coords == m_currentCellCoords && m_waitForSlowClick && CanEnableCellControl() )
         {
             ClearSelection();
@@ -4266,14 +4240,6 @@ wxGrid::DoGridMouseMoveEvent(wxMouseEvent& WXUNUSED(event),
 
 void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event)
 {
-    if ( event.Entering() || event.Leaving() )
-    {
-        // we don't care about these events but we must not reset m_isDragging
-        // if they happen so return before anything else is done
-        event.Skip();
-        return;
-    }
-
     const wxPoint pos = CalcUnscrolledPosition(event.GetPosition());
 
     // coordinates of the cell under mouse
@@ -4287,17 +4253,64 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event)
         coords.SetCol(coords.GetCol() + cell_cols);
     }
 
-    if ( event.Dragging() )
+    // Releasing the left mouse button must be processed in any case, so deal
+    // with it first.
+    if ( event.LeftUp() )
     {
-        if ( event.LeftIsDown() )
-            DoGridDragEvent(event, coords);
-        else
-            event.Skip();
+        // Note that we must call this one first, before resetting the
+        // drag-related data, as it relies on m_cursorMode being still set and
+        // EndDraggingIfNecessary() resets it.
+        DoGridCellLeftUp(event, coords);
+
+        EndDraggingIfNecessary();
         return;
     }
 
-    m_isDragging = false;
-    m_startDragPos = wxDefaultPosition;
+    const bool isDraggingWithLeft = event.Dragging() && event.LeftIsDown();
+
+    // While dragging the mouse, only releasing the left mouse button, which
+    // cancels the drag operation, is processed (above) and any other events
+    // are just ignored while it's in progress.
+    if ( m_isDragging )
+    {
+        if ( isDraggingWithLeft )
+            DoGridDragEvent(event, coords, false /* not first drag */);
+        return;
+    }
+
+    // Now check if we're starting a drag operation (if it had been already
+    // started, m_isDragging would be true above).
+    if ( isDraggingWithLeft )
+    {
+        // To avoid accidental drags, don't start doing anything until the
+        // mouse has been dragged far enough.
+        const wxPoint& pt = event.GetPosition();
+        if ( m_startDragPos == wxDefaultPosition )
+        {
+            m_startDragPos = pt;
+            return;
+        }
+
+        if ( abs(m_startDragPos.x - pt.x) <= DRAG_SENSITIVITY &&
+                abs(m_startDragPos.y - pt.y) <= DRAG_SENSITIVITY )
+            return;
+
+        if ( DoGridDragEvent(event, coords, true /* first drag */) )
+        {
+            wxASSERT_MSG( !m_winCapture, "shouldn't capture the mouse twice" );
+
+            m_winCapture = m_gridWin;
+            m_winCapture->CaptureMouse();
+
+            m_isDragging = true;
+        }
+
+        return;
+    }
+
+    // If we're not dragging, cancel any dragging operation which could have
+    // been in progress.
+    EndDraggingIfNecessary();
 
     // deal with various button presses
     if ( event.IsButton() )
@@ -4315,12 +4328,6 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event)
             else if ( event.RightDClick() )
                 SendEvent(wxEVT_GRID_CELL_RIGHT_DCLICK, coords, event);
         }
-
-        // this one should be called even if we're not over any cell
-        if ( event.LeftUp() )
-        {
-            DoGridCellLeftUp(event, coords);
-        }
     }
     else if ( event.Moving() )
     {

From 8dc302451474e0dcfbe1d2bdaddeed215cf8d115 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 18 Aug 2018 11:12:45 +0200
Subject: [PATCH 872/916] Add wxID_{LOWEST,HIGHEST} descriptions to the
 documentation

Make it more clear what do these ones actually stand for.
---
 interface/wx/defs.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index eb9c7035b9..68727fd827 100644
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -597,6 +597,11 @@ enum wxStandardID
     */
     wxID_ANY = -1,
 
+    /**
+        Start of the range reserved for wxWidgets-defined IDs.
+
+        Don't define custom IDs in the range from wxID_LOWEST to wxID_HIGHEST.
+     */
     wxID_LOWEST = 4999,
 
     wxID_OPEN,
@@ -744,6 +749,15 @@ enum wxStandardID
     /** IDs used by generic file ctrl (4 consecutive starting from this value) */
     wxID_FILECTRL = 5950,
 
+    /**
+        End of the range reserved for wxWidgets-defined IDs.
+
+        Don't define custom IDs in the range from wxID_LOWEST to wxID_HIGHEST.
+
+        When using an enum to define a number of custom IDs, assigning the
+        value of @c wxID_HIGHEST+1 to the first element ensures that none of
+        the enum elements will conflict with any standard IDs.
+     */
     wxID_HIGHEST = 5999
 };
 

From bdbd316ef1592cb91693941da42dc29c0c0aee3e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 18 Aug 2018 11:25:37 +0200
Subject: [PATCH 873/916] Improve ID documentation and add more links to it

Better describe various kinds of IDs and advise not to use hard-coded
values of them.
---
 docs/doxygen/overviews/windowids.h | 36 ++++++++++++++++++++++--------
 interface/wx/menu.h                |  2 ++
 interface/wx/window.h              |  1 +
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/docs/doxygen/overviews/windowids.h b/docs/doxygen/overviews/windowids.h
index a4a612cf7a..ad8bce1720 100644
--- a/docs/doxygen/overviews/windowids.h
+++ b/docs/doxygen/overviews/windowids.h
@@ -11,18 +11,36 @@
 
 @tableofcontents
 
-Various controls and other parts of wxWidgets need an ID.  Sometimes the ID may
-be directly provided by the user or have a predefined value, such as
-@c wxID_OPEN. Often, however, the value of the ID is unimportant and in this
-case it is enough to use @c wxID_ANY as the ID of an object which tells
-wxWidgets to assign an ID automatically. All such automatically-assigned IDs
-are negative, so the IDs predefined in the user code should always be positive
-to avoid clashes with them.
+When creating a new wxWindow-derived class or adding a menu item, its ID must
+be specified. An ID is just a unique (at least locally, i.e. inside the same
+top level window) integer allowing to find the window or menu item later and to
+distinguish between events from different objects.
+
+If applicable, stock IDs such as ::wxID_EXIT (for menu item) or ::wxID_OK (for
+a button) should be used, see @ref page_stockitems for the full list of such
+IDs.
+
+If the value of an ID is not important, ::wxID_ANY should be used, telling
+wxWidgets to allocate a unique ID automatically. All such
+automatically-assigned IDs are negative and so won't conflict with any
+user-defined IDs as long as they are positive.
 
 If you do care about the ID value but don't want to specify it as a literal in
 your code, you can use wxWindow::NewControlId() to create an ID that had never
-been returned by this function before and, being also negative, never conflicts
-with any IDs explicitly defined in the program if the advice above is followed.
+been returned by this function before. Such IDs are also negative.
+
+Finally, you can just define your own IDs. Typically this is done by using a
+C++ enum to automatically ensure their uniqueness. If you do this, please note
+that your custom IDs must be positive to avoid clashes with the automatically
+assigned IDs discussed above and should @e not have values 0 or 1, that can
+result in surprising behaviour under some platforms. Finally, you also need to
+avoid defining IDs in the range from ::wxID_LOWEST to ::wxID_HIGHEST which is
+reserved for wxWidgets-defined IDs, see ::wxStandardID for more details.
+
+To avoid all these restrictions, it is best to avoid using hard-coded IDs at
+all, they are not needed when using wxEvtHandler::Bind() for event handling
+(unlike with the previously used event tables).
+
 
 @see wxIdManager, wxWindow::NewControlId(), wxWindow::UnreserveControlId()
 
diff --git a/interface/wx/menu.h b/interface/wx/menu.h
index 3157e3a75b..8ec724f785 100644
--- a/interface/wx/menu.h
+++ b/interface/wx/menu.h
@@ -546,6 +546,8 @@ public:
 
         @param id
             The menu command identifier.
+            See @ref overview_windowids for more information about IDs (same
+            considerations apply to both window and menu item IDs).
         @param item
             The string to appear on the menu item.
             See wxMenuItem::SetItemLabel() for more details.
diff --git a/interface/wx/window.h b/interface/wx/window.h
index 9d47f7246c..ddada55631 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -358,6 +358,7 @@ public:
             Pointer to a parent window.
         @param id
             Window identifier. If wxID_ANY, will automatically create an identifier.
+            See @ref overview_windowids for more information about IDs.
         @param pos
             Window position. wxDefaultPosition indicates that wxWidgets
             should generate a default position for the window.

From 6132ce85a8673abd967e616b98e1a63c5f41bbad Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 18 Aug 2018 15:01:41 +0200
Subject: [PATCH 874/916] Do use compiler TLS support under NetBSD

It didn't work when support for using compiler-provided TLS was added in
7beff712f02f83f6c2327da735f9aa504b919e00 back in 2009 but is reported to
work since 2011, so it should be safe to use unconditionally now.

Closes #18200.
---
 configure    | 10 ----------
 configure.in |  9 ---------
 2 files changed, 19 deletions(-)

diff --git a/configure b/configure
index 1a88b20e34..6cc2bf1e77 100755
--- a/configure
+++ b/configure
@@ -33023,16 +33023,6 @@ $as_echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
         fi
       fi
 
-      if test "$wxUSE_COMPILER_TLS" = "auto"; then
-          if test "$USE_NETBSD" = 1; then
-              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&5
-$as_echo "$as_me: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&2;}
-              wxUSE_COMPILER_TLS=no
-          else
-              wxUSE_COMPILER_TLS=yes
-          fi
-      fi
-
       if test "$wxUSE_COMPILER_TLS" = "yes"; then
                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread keyword" >&5
 $as_echo_n "checking for __thread keyword... " >&6; }
diff --git a/configure.in b/configure.in
index 8a642c4c6b..709954370f 100644
--- a/configure.in
+++ b/configure.in
@@ -4930,15 +4930,6 @@ if test "$TOOLKIT" != "MSW"; then
         fi
       fi
 
-      if test "$wxUSE_COMPILER_TLS" = "auto"; then
-          if test "$USE_NETBSD" = 1; then
-              AC_MSG_WARN([Disabling TLS under NetBSD, please contact wx-dev if it works now])
-              wxUSE_COMPILER_TLS=no
-          else
-              wxUSE_COMPILER_TLS=yes
-          fi
-      fi
-
       if test "$wxUSE_COMPILER_TLS" = "yes"; then
           dnl test for compiler thread-specific variables support
           AC_CACHE_CHECK([for __thread keyword],

From 5442edbbe90a27b4e08032423082e6ab2297eddd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Aug 2018 19:34:41 +0200
Subject: [PATCH 875/916] Fix wrong udata type in wxFileSystemWatcher code
 under NetBSD

NetBSD kqueue struct uses "intptr_t" as type of the user data pointer
and not "void*" as all the other platforms using kqueue, so account for
it in this code.

Closes https://github.com/wxWidgets/wxWidgets/pull/885

Closes #18199.
---
 src/unix/fswatcher_kqueue.cpp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/unix/fswatcher_kqueue.cpp b/src/unix/fswatcher_kqueue.cpp
index 0fd8023474..e0118956ca 100644
--- a/src/unix/fswatcher_kqueue.cpp
+++ b/src/unix/fswatcher_kqueue.cpp
@@ -29,6 +29,21 @@
 
 #include "wx/private/fswatcher.h"
 
+namespace
+{
+
+// NetBSD is different as it uses intptr_t as type of kevent struct udata field
+// for some reason, instead of "void*" as all the other platforms using kqueue.
+#ifdef __NetBSD__
+    inline intptr_t ToUdata(void* d) { return reinterpret_cast<intptr_t>(d); }
+    inline void* FromUdata(intptr_t d) { return reinterpret_cast<void*>(d); }
+#else
+    inline void* ToUdata(void* d) { return d; }
+    inline void* FromUdata(void* d) { return d; }
+#endif
+
+} // anonymous namespace
+
 // ============================================================================
 // wxFSWSourceHandler helper class
 // ============================================================================
@@ -126,7 +141,7 @@ public:
         int action = EV_ADD | EV_ENABLE | EV_CLEAR | EV_ERROR;
         int flags = Watcher2NativeFlags(watch->GetFlags());
         EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action,
-                flags, 0, watch.get() );
+                flags, 0, ToUdata(watch.get()) );
 
         // TODO more error conditions according to man
         // TODO best deal with the error here
@@ -277,14 +292,16 @@ protected:
 
     void ProcessNativeEvent(const struct kevent& e)
     {
-        wxASSERT_MSG(e.udata, "Null user data associated with kevent!");
+        void* const udata = FromUdata(e.udata);
+
+        wxASSERT_MSG(udata, "Null user data associated with kevent!");
 
         wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%llu, filter=%d, flags=%u, "
                    "fflags=%u, data=%lld, user_data=%lp",
-                   e.ident, e.filter, e.flags, e.fflags, e.data, e.udata);
+                   e.ident, e.filter, e.flags, e.fflags, e.data, udata);
 
         // for ease of use
-        wxFSWatchEntryKq& w = *(static_cast<wxFSWatchEntry*>(e.udata));
+        wxFSWatchEntryKq& w = *(static_cast<wxFSWatchEntry*>(udata));
         int nflags = e.fflags;
 
         // clear ignored flags

From 151309b2e45b91ec0d9a89867a0fb4996fc42d3a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 18 Aug 2018 15:28:16 +0200
Subject: [PATCH 876/916] Improve wxDataViewModel::HasDefaultCompare()
 documentation

Document that returning true from it means that Compare() can (and will)
be called with -1 as the column index when the default sort order is
being used.

Closes #18190.
---
 interface/wx/dataview.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 6958ee7386..61aad27b36 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -153,7 +153,10 @@ public:
         @param item2
             Second item to compare.
         @param column
-            The column holding the items to be compared.
+            The column holding the items to be compared. If the model class
+            overrides HasDefaultCompare() to return @true, this parameter will
+            be @c (unsigned)-1 when sorting items if no column is selected for
+            sorting them.
         @param ascending
             Indicates whether the sort is being performed in ascending or
             descending order.
@@ -273,7 +276,14 @@ public:
 
         If any other order (e.g. by index or order of appearance) is required,
         then this should be used.
+
+        Note that if this method is overridden to return @true, the
+        implementation of Compare() should be ready to accept @c (unsigned)-1
+        as the value for the column index parameter.
+
         See wxDataViewIndexListModel for a model which makes use of this.
+
+        @see Compare()
     */
     virtual bool HasDefaultCompare() const;
 

From 617a15d418260832adfa10c08d9e0d55fcb37252 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 18 Aug 2018 15:44:43 +0200
Subject: [PATCH 877/916] Improve wxNotebook themed background drawing

Use GetThemeBackgroundContentRect() to properly draw the themed notebook
background in all configurations.

Closes #18156.
---
 docs/changes.txt          |  1 +
 include/wx/msw/notebook.h | 12 +++++++++++-
 src/msw/notebook.cpp      | 24 +++++++++++++++++-------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index be4c96f4bf..225685dbc2 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -130,6 +130,7 @@ wxMSW:
 - Support MSVC auto-linking when using monolithic build too (PB).
 - Implement wxFontDialog::SetTitle() (Vitaly Stakhovsky).
 - Fix build in ANSI (non-Unicode) mode.
+- Improve wxNotebook themed background drawing (Arrigo Marchiori).
 
 wxOSX:
 
diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 8920b936bd..316f1d0338 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -170,10 +170,17 @@ protected:
   void AdjustPageSize(wxNotebookPage *page);
 
 #if wxUSE_UXTHEME
+  virtual void MSWAdjustBrushOrg(int *xOrg, int* yOrg) const wxOVERRIDE
+  {
+      *xOrg -= m_bgBrushAdj.x;
+      *yOrg -= m_bgBrushAdj.y;
+  }
+
   // return the themed brush for painting our children
   virtual WXHBRUSH MSWGetCustomBgBrush() wxOVERRIDE { return m_hbrBackground; }
 
-  // gets the bitmap of notebook background and returns a brush from it
+  // gets the bitmap of notebook background and returns a brush from it and
+  // sets m_bgBrushAdj
   WXHBRUSH QueryBgBitmap();
 
   // creates the brush to be used for drawing the tab control background
@@ -190,6 +197,9 @@ protected:
 #if wxUSE_UXTHEME
   // background brush used to paint the tab control
   WXHBRUSH m_hbrBackground;
+
+  // offset for MSWAdjustBrushOrg()
+  wxPoint m_bgBrushAdj;
 #endif // wxUSE_UXTHEME
 
 
diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 21d3f7ab69..7f0565225b 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -1095,30 +1095,40 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 
 WXHBRUSH wxNotebook::QueryBgBitmap()
 {
-    wxRect r = GetPageSize();
-    if ( r.IsEmpty() )
+    RECT rc;
+    ::GetClientRect(GetHwnd(), &rc);
+    if ( ::IsRectEmpty(&rc) )
         return 0;
 
     wxUxThemeHandle theme(this, L"TAB");
     if ( !theme )
         return 0;
 
-    RECT rc;
-    wxCopyRectToRECT(r, rc);
-
     WindowHDC hDC(GetHwnd());
+
+    RECT rcBg;
+    ::GetThemeBackgroundContentRect(theme,
+                                    (HDC) hDC,
+                                    9, /* TABP_PANE */
+                                    0,
+                                    &rc,
+                                    &rcBg);
+
+    m_bgBrushAdj = wxPoint(rcBg.left, rcBg.top);
+    ::OffsetRect(&rcBg, -rcBg.left, -rcBg.top);
+
     ::GetThemeBackgroundExtent
                             (
                                 theme,
                                 (HDC) hDC,
                                 9 /* TABP_PANE */,
                                 0,
-                                &rc,
+                                &rcBg,
                                 &rc
                             );
 
     MemoryHDC hDCMem(hDC);
-    CompatibleBitmap hBmp(hDC, rc.right, rc.bottom);
+    CompatibleBitmap hBmp(hDC, rcBg.right, rcBg.bottom);
 
     {
         SelectInHDC selectBmp(hDCMem, hBmp);

From 36d21ce6c8bad682c6258e643c0cf4bc9b5e2d33 Mon Sep 17 00:00:00 2001
From: Igor Korot <ikorot01@gmail.com>
Date: Sun, 19 Aug 2018 12:04:04 +0200
Subject: [PATCH 878/916] Implement strike-through support for wxDataViewCtrl
 in wxGTK too

Previously it was supported in the generic version only, see #18180 and
the changes of 09124932eb7b1f6379b68ab193fc1ed8fedf01a0

Closes https://github.com/wxWidgets/wxWidgets/pull/892
---
 docs/changes.txt        |  2 +-
 interface/wx/dataview.h |  2 +-
 src/gtk/dataview.cpp    | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 225685dbc2..aca1333053 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -110,7 +110,7 @@ All (GUI):
 - Fix possible infinite loop in wxHtmlWindow layout (trivia21).
 - Add "hint" property support to XRC for wxComboBox and wxSearchCtrl.
 - Add support for style="page-break-inside:avoid" to <div> in wxHTML.
-- Add strike-through support to wxDataViewItem attributes (approach).
+- Support strike-through in wxDataViewItem attributes (approach, Igor Korot).
 
 wxGTK:
 
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 61aad27b36..161ff7372c 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -718,7 +718,7 @@ public:
         text.
 
         Currently this attribute is only supported in the generic version of
-        wxDataViewCtrl and ignored by the native GTK+ and OS X implementations.
+        wxDataViewCtrl and GTK and ignored by the native OS X implementations.
 
         @since 3.1.2
     */
diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index c7bd5f16c8..71bc42f004 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -2275,6 +2275,23 @@ void GtkApplyAttr(GtkCellRendererText *renderer, const wxDataViewItemAttr& attr)
         g_value_unset( &gvalue );
     }
 
+    if (attr.GetStrikethrough())
+    {
+        GValue gvalue = G_VALUE_INIT;
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, TRUE );
+        g_object_set_property( G_OBJECT(renderer), "strikethrough", &gvalue );
+        g_value_unset( &gvalue );
+    }
+    else
+    {
+        GValue gvalue = G_VALUE_INIT;
+        g_value_init( &gvalue, G_TYPE_BOOLEAN );
+        g_value_set_boolean( &gvalue, FALSE );
+        g_object_set_property( G_OBJECT(renderer), "strikethrough-set", &gvalue );
+        g_value_unset( &gvalue );
+    }
+
     if (attr.HasBackgroundColour())
     {
         GValue gvalue = G_VALUE_INIT;

From 91aa6ba36e64ed11021f4bdc13c7210f96c1d6e1 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 19 Aug 2018 18:02:06 +0200
Subject: [PATCH 879/916] OSX using ref data for colour and NSColor native
 support (#878)

* First attempt using ref data for colour and spliting implementation for CGColorRef and NSColor

* correcting SDK dependency

* Implementing feedback suggestions
---
 include/wx/colour.h          |   2 +-
 include/wx/osx/core/colour.h |  76 ++++++----
 src/osx/cocoa/colour.mm      | 164 ++++++++++++++-------
 src/osx/core/colour.cpp      | 275 ++++++++++++++++++++++++-----------
 4 files changed, 349 insertions(+), 168 deletions(-)

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 9caceccaef..aa50b349ec 100644
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -65,7 +65,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE)
     not need the wxGDIObject machinery to handle colors, please add it to the
     list of ports which do not need it.
  */
-#if defined( __WXMAC__ ) || defined( __WXMSW__ ) || defined( __WXQT__ )
+#if defined( __WXMSW__ ) || defined( __WXQT__ )
 #define wxCOLOUR_IS_GDIOBJECT 0
 #else
 #define wxCOLOUR_IS_GDIOBJECT 1
diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index ff41bcb5dd..b862332173 100644
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -29,60 +29,76 @@ public:
     // default copy ctor and dtor are ok
 
     // accessors
-    virtual bool IsOk() const { return m_cgColour != NULL; }
+    virtual ChannelType Red() const wxOVERRIDE;
+    virtual ChannelType Green() const wxOVERRIDE;
+    virtual ChannelType Blue() const wxOVERRIDE;
+    virtual ChannelType Alpha() const wxOVERRIDE;
 
-    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Red() const { return m_red; }
-    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Green() const { return m_green; }
-    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Blue() const { return m_blue; }
-    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Alpha() const { return m_alpha; }
+    wxColour& operator=(const wxColour& col);
 
     // comparison
     bool operator == (const wxColour& colour) const;
-
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
-    CGColorRef GetPixel() const { return m_cgColour; }
+    // CoreGraphics CGColor
+    // --------------------
 
-    CGColorRef GetCGColor() const { return m_cgColour; }
-    CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }
+    // This ctor does take ownership of the color.
+    wxColour( CGColorRef col );
+    
+    // don't take ownership of the returned value
+    CGColorRef GetCGColor() const;
+    
+    // do take ownership of the returned value
+    CGColorRef CreateCGColor() const { return wxCFRetain(GetCGColor()); }
 
 #if wxOSX_USE_COCOA_OR_CARBON
+    // Quickdraw RGBColor
+    // ------------------
+    wxColour(const RGBColor& col);
     void GetRGBColor( RGBColor *col ) const;
 #endif
 
-    // Mac-specific ctor and assignment operator from the native colour
-    // assumes ownership of CGColorRef
-    wxColour( CGColorRef col );
-#if wxOSX_USE_COCOA_OR_CARBON
-    wxColour(const RGBColor& col);
-    wxColour& operator=(const RGBColor& col);
-#endif
 #if wxOSX_USE_COCOA
+    // NSColor Cocoa
+    // -------------
+
     // This ctor does not take ownership of the color.
     explicit wxColour(WX_NSColor color);
     WX_NSColor OSXGetNSColor() const;
 #endif
-    wxColour& operator=(CGColorRef col);
-    wxColour& operator=(const wxColour& col);
-
+ 
 protected :
     virtual void
-    InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
-#if wxOSX_USE_COCOA_OR_CARBON
-    void InitRGBColor( const RGBColor& col );
-#endif
-    void InitCGColorRef( CGColorRef col );
+    InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) wxOVERRIDE;
+
+    virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
 
 private:
-    wxCFRef<CGColorRef>     m_cgColour;
-
-    ChannelType             m_red;
-    ChannelType             m_blue;
-    ChannelType             m_green;
-    ChannelType             m_alpha;
 
     wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
+class wxColourRefData : public wxGDIRefData
+{
+public:
+    wxColourRefData() {}
+    virtual ~wxColourRefData() {}
+    
+    virtual CGFloat Red() const = 0;
+    virtual CGFloat Green() const = 0;
+    virtual CGFloat Blue() const = 0;
+    virtual CGFloat Alpha() const = 0;
+    
+    virtual CGColorRef GetCGColor() const = 0;
+    
+    virtual wxColourRefData* Clone() const = 0;
+    
+#if wxOSX_USE_COCOA
+    virtual WX_NSColor GetNSColor() const;
+#endif
+};
+
 #endif
   // _WX_COLOUR_H_
diff --git a/src/osx/cocoa/colour.mm b/src/osx/cocoa/colour.mm
index e6a4d1750a..065c9547ae 100644
--- a/src/osx/cocoa/colour.mm
+++ b/src/osx/cocoa/colour.mm
@@ -13,78 +13,136 @@
 
 #include "wx/osx/private.h"
 
-// Helper function to avoid writing too many casts in wxColour ctor.
-static inline wxColour::ChannelType NSColorChannelToWX(CGFloat c)
+class wxNSColorRefData : public wxColourRefData
 {
-    return static_cast<wxColour::ChannelType>(c * 255 + 0.5);
+public:
+    wxNSColorRefData(WX_NSColor color);
+    
+    wxNSColorRefData(const wxNSColorRefData& other);
+
+    virtual ~wxNSColorRefData();
+    
+    virtual CGFloat Red() const wxOVERRIDE;
+    virtual CGFloat Green() const wxOVERRIDE;
+    virtual CGFloat Blue() const wxOVERRIDE;
+    virtual CGFloat Alpha() const wxOVERRIDE;
+    
+    CGColorRef GetCGColor() const wxOVERRIDE;
+    
+    virtual wxColourRefData* Clone() const wxOVERRIDE { return new wxNSColorRefData(*this); }
+    
+    virtual WX_NSColor GetNSColor() const wxOVERRIDE;
+private:
+    WX_NSColor m_nsColour;
+    
+    wxDECLARE_NO_ASSIGN_CLASS(wxNSColorRefData);
+};
+
+wxNSColorRefData::wxNSColorRefData(WX_NSColor color)
+{
+    m_nsColour = [color retain];
 }
 
-wxColour::wxColour(WX_NSColor col)
+wxNSColorRefData::wxNSColorRefData(const wxNSColorRefData& other)
+{
+    m_nsColour = [other.m_nsColour retain];
+}
+
+wxNSColorRefData::~wxNSColorRefData()
+{
+    [m_nsColour release];
+}
+
+WX_NSColor wxNSColorRefData::GetNSColor() const
+{
+    return m_nsColour;
+}
+
+CGFloat wxNSColorRefData::Red() const
+{
+    if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
+        return [colRGBA redComponent];
+    
+    return 0.0;
+}
+
+CGFloat wxNSColorRefData::Green() const
+{
+    if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
+        return [colRGBA greenComponent];
+    
+    return 0.0;
+}
+
+CGFloat wxNSColorRefData::Blue() const
+{
+    if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
+        return [colRGBA blueComponent];
+    
+    return 0.0;
+}
+
+CGFloat wxNSColorRefData::Alpha() const
+{
+    if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
+        return [colRGBA alphaComponent];
+    
+    return 0.0;
+}
+
+CGColorRef wxNSColorRefData::GetCGColor() const
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-    if ( wxPlatformInfo::Get().CheckOSVersion(10, 8) )
-    {
-        CGColorRef cgcolor = [col CGColor];
-        CFRetain(cgcolor);
-        InitCGColorRef(cgcolor);
-        return ;
-    }
+    if (wxPlatformInfo::Get().CheckOSVersion(10, 8))
+        return [m_nsColour CGColor];
 #endif
-        
-    // Simplest case is when we can directly get the RGBA components:
-    if ( NSColor* colRGBA = [col colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
-    {
-        InitRGBA
-        (
-             NSColorChannelToWX([colRGBA redComponent]),
-             NSColorChannelToWX([colRGBA greenComponent]),
-             NSColorChannelToWX([colRGBA blueComponent]),
-             NSColorChannelToWX([colRGBA alphaComponent])
-        );
-        return;
-    }
+    CGColorRef cgcolor = NULL;
 
+    // Simplest case is when we can directly get the RGBA components:
+    if (NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace])
+    {
+        CGFloat components[4];
+        [colRGBA getRed:&components[0] green:&components[1] blue:&components[2] alpha:&components[3]];
+
+        cgcolor = CGColorCreate(wxMacGetGenericRGBColorSpace(), components);
+    }
     // Some colours use patterns, we can handle them with the help of CGColorRef
-    if ( NSColor* colPat = [col colorUsingColorSpaceName:NSPatternColorSpace] )
+    else if (NSColor* colPat = [m_nsColour colorUsingColorSpaceName:NSPatternColorSpace])
     {
         NSImage* const nsimage = [colPat patternImage];
-        if ( nsimage )
+        if (nsimage)
         {
             NSSize size = [nsimage size];
             NSRect r = NSMakeRect(0, 0, size.width, size.height);
             CGImageRef cgimage = [nsimage CGImageForProposedRect:&r context:nil hints:nil];
-            if ( cgimage )
+            if (cgimage)
             {
                 // Callbacks for CGPatternCreate()
                 struct PatternCreateCallbacks
                 {
-                    static void Draw(void *info, CGContextRef ctx)
+                    static void Draw(void* info, CGContextRef ctx)
                     {
-                        CGImageRef image = (CGImageRef) info;
-                        CGContextDrawImage
-                        (
+                        CGImageRef image = (CGImageRef)info;
+                        CGContextDrawImage(
                             ctx,
                             CGRectMake(0, 0, CGImageGetWidth(image), CGImageGetHeight(image)),
-                            image
-                        );
+                            image);
                     }
 
-                    static void Release(void * WXUNUSED(info))
+                    static void Release(void* WXUNUSED(info))
                     {
                         // Do not release the image here, we don't own it as it
                         // comes from NSImage.
                     }
                 };
 
-                const CGPatternCallbacks callbacks =
-                {
+                const CGPatternCallbacks callbacks = {
                     /* version: */ 0,
                     &PatternCreateCallbacks::Draw,
                     &PatternCreateCallbacks::Release
                 };
 
-                CGPatternRef pattern = CGPatternCreate
-                                       (
+                CGPatternRef pattern = CGPatternCreate(
                                             cgimage,
                                             CGRectMake(0, 0, size.width, size.height),
                                             CGAffineTransformMake(1, 0, 0, 1, 0, 0),
@@ -96,24 +154,32 @@ wxColour::wxColour(WX_NSColor col)
                                        );
                 CGColorSpaceRef space = CGColorSpaceCreatePattern(NULL);
                 CGFloat components[1] = { 1.0 };
-                CGColorRef cgcolor = CGColorCreateWithPattern(space, pattern, components);
+                cgcolor = CGColorCreateWithPattern(space, pattern, components);
                 CGColorSpaceRelease(space);
                 CGPatternRelease(pattern);
-
-                InitCGColorRef(cgcolor);
-                return;
             }
         }
     }
 
-    // Don't assert here, this will more likely than not result in a crash as
-    // colours are often created in drawing code which will be called again
-    // when the assert dialog is shown, resulting in a recursive assertion
-    // failure and, hence, a crash.
-    NSLog(@"Failed to convert NSColor \"%@\" to wxColour.", col);
+    if (cgcolor == NULL)
+    {
+        // Don't assert here, this will more likely than not result in a crash as
+        // colours are often created in drawing code which will be called again
+        // when the assert dialog is shown, resulting in a recursive assertion
+        // failure and, hence, a crash.
+        NSLog(@"Failed to convert NSColor \"%@\" to CGColorRef.", m_nsColour);
+    }
+    return cgcolor;
 }
 
-WX_NSColor wxColour::OSXGetNSColor() const
+WX_NSColor wxColourRefData::GetNSColor() const
 {
-    return [NSColor colorWithCalibratedRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
+    return [NSColor colorWithCalibratedRed:Red() green:Green() blue:Blue() alpha:Alpha() ];
 }
+
+wxColour::wxColour(WX_NSColor col)
+{
+    m_refData = new wxNSColorRefData(col);
+}
+
+
diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index 05034106cb..39dac008b1 100644
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -18,122 +18,221 @@
 
 #include "wx/osx/private.h"
 
+CGColorSpaceRef wxMacGetGenericRGBColorSpace();
+
+class wxCGColorRefData : public wxColourRefData
+{
+public:
+    wxCGColorRefData(CGFloat r, CGFloat g, CGFloat b, CGFloat a = 1.0);
+
+    wxCGColorRefData(CGFloat components[4]);
+
+    wxCGColorRefData(CGColorRef);
+
+    wxCGColorRefData(const wxCGColorRefData& other);
+
+    virtual bool IsOk() const  wxOVERRIDE{ return m_cgColour != NULL; }
+
+    virtual CGFloat Red() const wxOVERRIDE { return m_red; }
+    virtual CGFloat Green() const wxOVERRIDE { return m_green; }
+    virtual CGFloat Blue() const wxOVERRIDE { return m_blue; }
+    virtual CGFloat Alpha() const wxOVERRIDE { return m_alpha; }
+
+    CGColorRef GetCGColor() const wxOVERRIDE { return m_cgColour; }
+
+    virtual wxColourRefData* Clone() const wxOVERRIDE { return new wxCGColorRefData(*this); }
+
+private:
+    void Init(CGFloat components[4]);
+
+    wxCFRef<CGColorRef> m_cgColour;
+
+    CGFloat m_red;
+    CGFloat m_blue;
+    CGFloat m_green;
+    CGFloat m_alpha;
+
+    wxDECLARE_NO_ASSIGN_CLASS(wxCGColorRefData);
+};
+
+wxCGColorRefData::wxCGColorRefData(CGFloat r, CGFloat g, CGFloat b, CGFloat a)
+{
+    CGFloat components[4];
+    components[0] = r;
+    components[1] = b;
+    components[2] = g;
+    components[3] = a;
+
+    Init(components);
+}
+
+wxCGColorRefData::wxCGColorRefData(CGFloat components[4])
+{
+    Init(components);
+}
+
+wxCGColorRefData::wxCGColorRefData(const wxCGColorRefData& other)
+{
+    m_red = other.m_red;
+    m_blue = other.m_blue;
+    m_green = other.m_green;
+    m_alpha = other.m_alpha;
+
+    m_cgColour = other.m_cgColour;
+}
+
+void wxCGColorRefData::Init(CGFloat components[4])
+{
+    m_red = components[0];
+    m_blue = components[1];
+    m_green = components[2];
+    m_alpha = components[3];
+
+    m_cgColour = CGColorCreate(wxMacGetGenericRGBColorSpace(), components);
+}
+
+wxCGColorRefData::wxCGColorRefData(CGColorRef col)
+{
+    wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
+    m_cgColour.reset(col);
+
+    wxCFRef<CGColorRef> rgbacol;
+    size_t noComp = CGColorGetNumberOfComponents(col);
+    const CGFloat* components = CGColorGetComponents(col);
+
+    // set default alpha
+    m_alpha = 1.0;
+    bool isRGB = true;
+
+    CGColorSpaceModel model = CGColorSpaceGetModel(CGColorGetColorSpace(col));
+    if (model == kCGColorSpaceModelMonochrome)
+    {
+        wxASSERT_MSG(1 <= noComp && noComp <= 2, "Monochrome Color unexpected components");
+        m_red = components[0];
+        m_green = components[0];
+        m_blue = components[0];
+        if (noComp > 1)
+            m_alpha = components[1];
+        isRGB = false;
+    }
+    else if (model != kCGColorSpaceModelRGB)
+    {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11
+        if (wxPlatformInfo::Get().CheckOSVersion(10, 11))
+        {
+            rgbacol = CGColorCreateCopyByMatchingToColorSpace(wxMacGetGenericRGBColorSpace(), kCGRenderingIntentDefault, col, NULL);
+            noComp = CGColorGetNumberOfComponents(rgbacol);
+            components = CGColorGetComponents(rgbacol);
+        }
+        else
+#endif
+        {
+            isRGB = false;
+        }
+    }
+
+    if (isRGB)
+    {
+        wxASSERT_MSG(3 <= noComp && noComp <= 4, "RGB Color unexpected components");
+        m_red = components[0];
+        m_green = components[1];
+        m_blue = components[2];
+
+        if (noComp == 4)
+            m_alpha = components[3];
+    }
+}
+
+#define M_COLDATA static_cast<wxColourRefData*>(m_refData)
+
 #if wxOSX_USE_COCOA_OR_CARBON
 wxColour::wxColour(const RGBColor& col)
 {
-    InitRGBColor(col);
+    CGFloat components[4] = { (CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
+        (CGFloat)(col.blue / 65535.0), (CGFloat)1.0 };
+    m_refData = new wxCGColorRefData(components);
 }
 #endif
 
 wxColour::wxColour(CGColorRef col)
 {
-    InitCGColorRef(col);
+    wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
+
+    m_refData = new wxCGColorRefData(col);
+}
+
+wxColour::ChannelType wxColour::Red() const
+{
+    return wxRound(M_COLDATA->Red() * 255.0);
+}
+
+wxColour::ChannelType wxColour::Green() const
+{
+    return wxRound(M_COLDATA->Red() * 255.0);
+}
+
+wxColour::ChannelType wxColour::Blue() const
+{
+    return wxRound(M_COLDATA->Red() * 255.0);
+}
+
+wxColour::ChannelType wxColour::Alpha() const
+{
+    return wxRound(M_COLDATA->Red() * 255.0);
 }
 
 #if wxOSX_USE_COCOA_OR_CARBON
-void wxColour::GetRGBColor( RGBColor *col ) const
+void wxColour::GetRGBColor(RGBColor* col) const
 {
-    col->red = (m_red << 8) + m_red;
-    col->blue = (m_blue << 8) + m_blue;
-    col->green = (m_green << 8) + m_green;
-}
-
-wxColour& wxColour::operator=(const RGBColor& col)
-{
-    InitRGBColor(col);
-    return *this;
+    col->red = M_COLDATA->Red() * 65535.0;
+    col->blue = M_COLDATA->Blue() * 65535.0;
+    col->green = M_COLDATA->Green() * 65535.0;
 }
 #endif
 
-wxColour& wxColour::operator=(CGColorRef col)
+CGColorRef wxColour::GetCGColor() const
 {
-    InitCGColorRef(col);
-    return *this;
+    return M_COLDATA->GetCGColor();
+}
+
+#if wxOSX_USE_COCOA
+WX_NSColor wxColour::OSXGetNSColor() const
+{
+    return M_COLDATA->GetNSColor();
+}
+#endif
+
+void wxColour::InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a)
+{
+    CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat)(g / 255.0), (CGFloat)(b / 255.0), (CGFloat)(a / 255.0) };
+    m_refData = new wxCGColorRefData(components);
 }
 
 wxColour& wxColour::operator=(const wxColour& col)
 {
-    m_red = col.m_red;
-    m_green = col.m_green;
-    m_blue = col.m_blue;
-    m_alpha = col.m_alpha;
-    m_cgColour = col.m_cgColour;
+    wxObject::operator=(col);
+
     return *this;
 }
 
-void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelType a)
+bool wxColour::operator==(const wxColour& other) const
 {
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_alpha = a ;
-    
-    CGColorRef col = 0 ;
-    CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ;
-    col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
-    
-    wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
-    m_cgColour.reset( col );
+    if (m_refData == other.m_refData)
+        return true;
+
+    if (!m_refData || !other.m_refData)
+        return false;
+
+    return CGColorEqualToColor(GetCGColor(), other.GetCGColor());
 }
 
-#if wxOSX_USE_COCOA_OR_CARBON
-void wxColour::InitRGBColor( const RGBColor& col )
+wxGDIRefData* wxColour::CreateGDIRefData() const
 {
-    m_red = col.red >> 8;
-    m_blue = col.blue >> 8;
-    m_green = col.green >> 8;
-    m_alpha = wxALPHA_OPAQUE;
-    CGColorRef cfcol;
-    CGFloat components[4] = { (CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),
-        (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ;
-    cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
-    
-    wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color");
-    m_cgColour.reset( cfcol );
-}
-#endif
-
-void wxColour::InitCGColorRef( CGColorRef col )
-{
-    wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color");
-    m_cgColour.reset( col );
-    size_t noComp = CGColorGetNumberOfComponents( col );
-
-    const CGFloat *components = NULL;
-    if ( noComp >= 1 && noComp <= 4 )
-    {
-        // TODO verify whether we really are on a RGB color space
-        m_alpha = wxALPHA_OPAQUE;
-        components = CGColorGetComponents( col );
-    }
-
-    if ( noComp < 1 || !components )
-    {
-        m_alpha = wxALPHA_OPAQUE;
-        m_red = m_green = m_blue = 0;
-        return;
-    }
-
-    if ( noComp >= 3 )
-    {
-        m_red = (int)(components[0]*255+0.5);
-        m_green = (int)(components[1]*255+0.5);
-        m_blue = (int)(components[2]*255+0.5);
-        if ( noComp == 4 )
-            m_alpha =  (int)(components[3]*255+0.5);
-    }
-    else
-    {
-        m_red = (int)(components[0]*255+0.5);
-        m_green = (int)(components[0]*255+0.5);
-        m_blue = (int)(components[0]*255+0.5);
-    }
+    // black
+    return new wxCGColorRefData(0.0, 0.0, 0.0);
 }
 
-bool wxColour::operator == (const wxColour& colour) const
+wxGDIRefData* wxColour::CloneGDIRefData(const wxGDIRefData* data) const
 {
-    return ( (IsOk() == colour.IsOk()) && (!IsOk() ||
-                                           CGColorEqualToColor( m_cgColour, colour.m_cgColour ) ) );
+    return static_cast<const wxColourRefData*>(data)->Clone();
 }
-
-

From b61123cd7d16b3dff80def30ac32cc5f7dbd883d Mon Sep 17 00:00:00 2001
From: Steven Lamerton <steve.lamerton@gmail.com>
Date: Sun, 19 Aug 2018 22:27:34 +0200
Subject: [PATCH 880/916] Allow distinguishing user- from script-opened
 wxWebView windows

Add wxWebViewEvent::GetNavigationAction() returning a value that can be
either wxWEBVIEW_NAV_ACTION_USER for the links opened by the user, or
wxWEBVIEW_NAV_ACTION_OTHER for the other ones (e.g. opened from
JavaScript code on the page).

Closes #15402.
---
 docs/changes.txt            |  1 +
 include/wx/webview.h        | 16 ++++++++++++++--
 interface/wx/webview.h      | 26 +++++++++++++++++++++++++-
 samples/webview/webview.cpp |  9 ++++++++-
 src/gtk/webview_webkit.cpp  | 25 ++++++++++++++++++++-----
 src/msw/webview_ie.cpp      |  9 ++++++++-
 src/osx/webview_webkit.mm   | 11 ++++++++---
 7 files changed, 84 insertions(+), 13 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index aca1333053..c785d23c77 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -111,6 +111,7 @@ All (GUI):
 - Add "hint" property support to XRC for wxComboBox and wxSearchCtrl.
 - Add support for style="page-break-inside:avoid" to <div> in wxHTML.
 - Support strike-through in wxDataViewItem attributes (approach, Igor Korot).
+- Allow distinguishing between user- and script-opened windows in wxWebView.
 
 wxGTK:
 
diff --git a/include/wx/webview.h b/include/wx/webview.h
index d83f9a84f1..28c3219359 100644
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -78,6 +78,13 @@ enum wxWebViewFindFlags
     wxWEBVIEW_FIND_DEFAULT =          0
 };
 
+enum wxWebViewNavigationActionFlags
+{
+    wxWEBVIEW_NAV_ACTION_NONE,
+    wxWEBVIEW_NAV_ACTION_USER,
+    wxWEBVIEW_NAV_ACTION_OTHER
+};
+
 //Base class for custom scheme handlers
 class WXDLLIMPEXP_WEBVIEW wxWebViewHandler
 {
@@ -243,18 +250,23 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewEvent : public wxNotifyEvent
 public:
     wxWebViewEvent() {}
     wxWebViewEvent(wxEventType type, int id, const wxString& url,
-                   const wxString& target)
-        : wxNotifyEvent(type, id), m_url(url), m_target(target)
+                   const wxString target,
+                   wxWebViewNavigationActionFlags flags = wxWEBVIEW_NAV_ACTION_NONE)
+        : wxNotifyEvent(type, id), m_url(url), m_target(target),
+          m_actionFlags(flags)
     {}
 
 
     const wxString& GetURL() const { return m_url; }
     const wxString& GetTarget() const { return m_target; }
 
+    wxWebViewNavigationActionFlags GetNavigationAction() const { return m_actionFlags; }
+
     virtual wxEvent* Clone() const wxOVERRIDE { return new wxWebViewEvent(*this); }
 private:
     wxString m_url;
     wxString m_target;
+    wxWebViewNavigationActionFlags m_actionFlags;
 
     wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebViewEvent);
 };
diff --git a/interface/wx/webview.h b/interface/wx/webview.h
index 148d427360..103661f0e9 100644
--- a/interface/wx/webview.h
+++ b/interface/wx/webview.h
@@ -92,6 +92,21 @@ enum wxWebViewFindFlags
     wxWEBVIEW_FIND_DEFAULT =          0
 };
 
+/**
+    Navigation action types.
+
+    @since 3.1.2
+*/
+enum wxWebViewNavigationActionFlags
+{
+    /** No navigation action */
+    wxWEBVIEW_NAV_ACTION_NONE,
+    /** The navigation was started by the user */
+    wxWEBVIEW_NAV_ACTION_USER,
+    /**The navigation was started but not by the user*/
+    wxWEBVIEW_NAV_ACTION_OTHER
+};
+
 
 /**
     @class wxWebViewHistoryItem
@@ -881,7 +896,8 @@ class wxWebViewEvent : public wxNotifyEvent
 public:
     wxWebViewEvent();
     wxWebViewEvent(wxEventType type, int id, const wxString href,
-                   const wxString target);
+                   const wxString target,
+                   wxWebViewNavigationActionFlags flags = wxWEBVIEW_NAV_ACTION_NONE);
 
     /**
         Get the name of the target frame which the url of this event
@@ -894,6 +910,14 @@ public:
         Get the URL being visited
     */
     const wxString& GetURL() const;
+
+    /**
+        Get the type of navigation action. Only valid for events of type
+        @c wxEVT_WEBVIEW_NEWWINDOW
+
+        @since 3.1.2
+    */
+    wxWebViewNavigationActionFlags GetNavigationAction() const;
 };
 
 
diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
index 1dd4b68487..93ccc8fac3 100644
--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@@ -828,7 +828,14 @@ void WebFrame::OnDocumentLoaded(wxWebViewEvent& evt)
   */
 void WebFrame::OnNewWindow(wxWebViewEvent& evt)
 {
-    wxLogMessage("%s", "New window; url='" + evt.GetURL() + "'");
+    wxString flag = " (other)";
+
+    if(evt.GetNavigationAction() == wxWEBVIEW_NAV_ACTION_USER)
+    {
+        flag = " (user)";
+    }
+
+    wxLogMessage("%s", "New window; url='" + evt.GetURL() + "'" + flag);
 
     //If we handle new window events then just load them in this window as we
     //are a single window browser
diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index ea0eb0d967..0a740099fc 100644
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -80,7 +80,7 @@ static gboolean
 wxgtk_webview_webkit_navigation(WebKitWebView *,
                                 WebKitWebFrame *frame,
                                 WebKitNetworkRequest *request,
-                                WebKitWebNavigationAction *,
+                                WebKitWebNavigationAction *action,
                                 WebKitWebPolicyDecision *policy_decision,
                                 wxWebViewWebKit *webKitCtrl)
 {
@@ -92,10 +92,18 @@ wxgtk_webview_webkit_navigation(WebKitWebView *,
     if(webKitCtrl->m_creating)
     {
         webKitCtrl->m_creating = false;
+
+        WebKitWebNavigationReason reason =
+                                  webkit_web_navigation_action_get_reason(action);
+        wxWebViewNavigationActionFlags flags = wxWEBVIEW_NAV_ACTION_USER;
+
+        if(reason == WEBKIT_WEB_NAVIGATION_REASON_OTHER)
+            flags = wxWEBVIEW_NAV_ACTION_OTHER;
+
         wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
                              webKitCtrl->GetId(),
                              wxString(uri, wxConvUTF8),
-                             target);
+                             target, flags);
 
         webKitCtrl->HandleWindowEvent(event);
 
@@ -302,17 +310,24 @@ static gboolean
 wxgtk_webview_webkit_new_window(WebKitWebView*,
                                 WebKitWebFrame *frame,
                                 WebKitNetworkRequest *request,
-                                WebKitWebNavigationAction*,
+                                WebKitWebNavigationAction* action,
                                 WebKitWebPolicyDecision *policy_decision,
                                 wxWebViewWebKit *webKitCtrl)
 {
     const gchar* uri = webkit_network_request_get_uri(request);
-
     wxString target = webkit_web_frame_get_name (frame);
+
+    WebKitWebNavigationReason reason = webkit_web_navigation_action_get_reason(action);
+
+    wxWebViewNavigationActionFlags flags = wxWEBVIEW_NAV_ACTION_USER;
+
+    if(reason == WEBKIT_WEB_NAVIGATION_REASON_OTHER)
+        flags = wxWEBVIEW_NAV_ACTION_OTHER;
+
     wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
                                        webKitCtrl->GetId(),
                                        wxString( uri, wxConvUTF8 ),
-                                       target);
+                                       target, flags);
 
     webKitCtrl->HandleWindowEvent(event);
 
diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 46c26c3d21..8df8c4b094 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -22,6 +22,7 @@
 #include <exdispid.h>
 #include <exdisp.h>
 #include <mshtml.h>
+#include <shobjidl.h>
 #include "wx/msw/registry.h"
 #include "wx/msw/missing.h"
 #include "wx/msw/ole/safearray.h"
@@ -1472,9 +1473,15 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
         case DISPID_NEWWINDOW3:
         {
             wxString url = evt[4].GetString();
+            long flags = evt[2].GetLong();
+
+            wxWebViewNavigationActionFlags navFlags = wxWEBVIEW_NAV_ACTION_OTHER;
+
+            if(flags & NWMF_USERINITED || flags & NWMF_USERREQUESTED)
+                navFlags = wxWEBVIEW_NAV_ACTION_USER;
 
             wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
-                                 GetId(), url, wxEmptyString);
+                                 GetId(), url, wxEmptyString, navFlags);
             event.SetEventObject(this);
             HandleWindowEvent(event);
 
diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 13b76e0626..be3f646872 100644
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -979,12 +979,17 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                         newFrameName:(NSString *)frameName
                     decisionListener:(id < WebPolicyDecisionListener >)listener
 {
-    wxUnusedVar(actionInformation);
-
     NSString *url = [[request URL] absoluteString];
+
+    wxWebViewNavigationActionFlags flags = wxWEBVIEW_NAV_ACTION_USER;
+
+    int action = [[actionInformation objectForKey:WebActionNavigationTypeKey] intValue];
+    if (action == WebNavigationTypeOther)
+        flags = wxWEBVIEW_NAV_ACTION_OTHER;
+
     wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
                          webKitWindow->GetId(),
-                         wxCFStringRef::AsString( url ), "");
+                         wxCFStringRef::AsString( url ), "", flags);
 
     if (webKitWindow && webKitWindow->GetEventHandler())
         webKitWindow->GetEventHandler()->ProcessEvent(event);

From 1f8481eabc22361464a9c5d9f75c0b9a9996e903 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 22 Aug 2018 00:00:43 -0700
Subject: [PATCH 881/916] Fix restoring locale in SetArguments()

The string returned by setlocale() can be overwritten by subsequent calls,
so make a copy of it. See #18203
---
 src/common/cmdline.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index 01bc3661bc..014a57ecbb 100644
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -429,9 +429,9 @@ void wxCmdLineParserData::SetArguments(int argc, char **argv)
     // temporarily change the locale here. The only drawback is that changing
     // the locale is thread-unsafe but precisely because we're called so early
     // it's hopefully safe to assume that no other threads had been created yet.
-    char * const locOld = SetAllLocaleFacets(NULL);
+    const wxCharBuffer locOld(SetAllLocaleFacets(NULL));
     SetAllLocaleFacets("");
-    wxON_BLOCK_EXIT1( SetAllLocaleFacets, locOld );
+    wxON_BLOCK_EXIT1( SetAllLocaleFacets, locOld.data() );
 
     for ( int n = 0; n < argc; n++ )
     {

From d200f19c02e8454bd764ab2c808af225edaa48ae Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 22 Aug 2018 08:12:11 -0700
Subject: [PATCH 882/916] Fix non-unicode build after 82881d6b03

wxChar overload of wxTmemcpy() is not defined. Just use memcpy() directly
as wxStrlcpy() does not use wxChar.
---
 include/wx/wxcrt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 1a3e5e0dbf..fc3bf0b681 100644
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -257,7 +257,7 @@ inline size_t wxStrlcpy(char *dest, const char *src, size_t n)
     {
         if ( n-- > len )
             n = len;
-        wxTmemcpy(dest, src, n);
+        memcpy(dest, src, n);
         dest[n] = '\0';
     }
 
@@ -270,7 +270,7 @@ inline size_t wxStrlcpy(wchar_t *dest, const wchar_t *src, size_t n)
     {
         if ( n-- > len )
             n = len;
-        wxTmemcpy(dest, src, n);
+        memcpy(dest, src, n * sizeof(wchar_t));
         dest[n] = L'\0';
     }
 

From 7c44f807ad902deffc66d1de1e0cc74aef0fa6bb Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 22 Aug 2018 08:29:35 -0700
Subject: [PATCH 883/916] Avoid GCC 8 warning "cast between incompatible
 function types" with -Wextra

---
 src/gtk/dataview.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 71bc42f004..97476600e1 100644
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -74,7 +74,8 @@ public:
     ~wxGtkTreePathList()
     {
         // Delete the list contents, wxGtkList will delete the list itself.
-        g_list_foreach(m_list, (GFunc)gtk_tree_path_free, NULL);
+        for (GList* p = m_list; p; p = p->next)
+            gtk_tree_path_free(static_cast<GtkTreePath*>(p->data));
     }
 };
 

From 41d534ac0d89c2a1081bb897b0bf6cf8ea38f925 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 22 Aug 2018 08:39:13 -0700
Subject: [PATCH 884/916] Use more accurate color conversion in DoGetPixel()

---
 src/gtk/dcclient.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 9e98f62b4d..52349d0e0a 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -487,7 +487,7 @@ bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     }
     if (image == NULL)
     {
-        *col = wxColour();
+        col->UnRef();
         return false;
     }
     GdkColormap* colormap = gdk_image_get_colormap(image);
@@ -498,7 +498,7 @@ bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     {
         GdkColor c;
         gdk_colormap_query_color(colormap, pixel, &c);
-        col->Set(c.red >> 8, c.green >> 8, c.blue >> 8);
+        *col = wxColour(c);
     }
     g_object_unref(image);
     return true;
@@ -2062,7 +2062,7 @@ void wxWindowDCImpl::ComputeScaleAndOrigin()
         // this is a bit artificial, but we need to force wxDC to think the pen
         // has changed
         wxPen pen = m_pen;
-        m_pen = wxNullPen;
+        m_pen.UnRef();
         SetPen( pen );
     }
 

From f4bcb12709a39c9f3aff52df23e422bd262a00f3 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 22 Aug 2018 09:19:15 -0700
Subject: [PATCH 885/916] Remove useless initializations

wxObject-derived types and wxString are null/empty by default.
---
 src/aui/framemanager.cpp     | 2 +-
 src/generic/prntdlgg.cpp     | 4 ----
 src/generic/treectlg.cpp     | 1 -
 src/html/chm.cpp             | 2 --
 src/html/helpdata.cpp        | 9 ++++-----
 src/html/htmlcell.cpp        | 1 -
 src/html/htmprint.cpp        | 1 -
 src/html/winpars.cpp         | 1 -
 src/ribbon/bar.cpp           | 4 ++--
 src/richtext/richtextxml.cpp | 2 --
 10 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index ab34ce3035..5853b975d0 100644
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -3998,7 +3998,7 @@ void wxAuiManager::OnSetCursor(wxSetCursorEvent& event)
 {
     // determine cursor
     wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY());
-    wxCursor cursor = wxNullCursor;
+    wxCursor cursor;
 
     if (part)
     {
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 5140283de9..b1c9d7eb77 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -86,7 +86,6 @@ wxIMPLEMENT_CLASS(wxPostScriptPrintNativeData, wxPrintNativeDataBase);
 
 wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
 {
-    m_previewCommand = wxEmptyString;
 #ifdef __VMS__
     m_printerCommand = wxT("print");
     m_printerOptions = wxT("/nonotify/queue=psqueue");
@@ -95,14 +94,11 @@ wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
 
 #ifdef __WXMSW__
     m_printerCommand = wxT("print");
-    m_printerOptions = wxEmptyString;
     m_afmPath = wxT("c:\\windows\\system\\");
 #endif
 
 #if !defined(__VMS__) && !defined(__WXMSW__)
     m_printerCommand = wxT("lpr");
-    m_printerOptions = wxEmptyString;
-    m_afmPath = wxEmptyString;
 #endif
 
     m_printerScaleX = 1.0;
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index ad360ca93d..de0fe661fc 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -3516,7 +3516,6 @@ void wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem *item)
 {
     // let owner know that the edit was cancelled
     wxTreeEvent le(wxEVT_TREE_END_LABEL_EDIT, this, item);
-    le.m_label = wxEmptyString;
     le.m_editCancelled = true;
 
     GetEventHandler()->ProcessEvent( le );
diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index 37012f4e23..bc07d7f20e 100644
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -782,8 +782,6 @@ private:
 wxChmFSHandler::wxChmFSHandler() : wxFileSystemHandler()
 {
     m_lasterror=0;
-    m_pattern=wxEmptyString;
-    m_found=wxEmptyString;
     m_chm=NULL;
 }
 
diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index e5312bbadd..a18147ef0e 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -151,7 +151,6 @@ class HP_TagHandler : public wxHtmlTagHandler
         {
             m_data = NULL;
             m_book = b;
-            m_name = m_page = wxEmptyString;
             m_level = 0;
             m_id = wxID_ANY;
             m_count = 0;
@@ -656,10 +655,10 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
 
     wxString title = _("noname"),
              safetitle,
-             start = wxEmptyString,
-             contents = wxEmptyString,
-             index = wxEmptyString,
-             charset = wxEmptyString;
+             start,
+             contents,
+             index,
+             charset;
 
     fi = fsys.OpenFile(book);
     if (fi == NULL)
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 176c5e79c4..e4392edc35 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -638,7 +638,6 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe
     m_AlignVer = wxHTML_ALIGN_BOTTOM;
     m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;
     m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT;
-    m_BkColour = wxNullColour;
     m_Border = 0;
     m_MinHeight = 0;
     m_MinHeightAlign = wxHTML_ALIGN_TOP;
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index ba1f31b016..a3acb7d007 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -612,7 +612,6 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWin
     m_Name = name;
     m_PrintData = NULL;
     m_PageSetupData = new wxPageSetupDialogData;
-    m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString;
 
     m_PageSetupData->EnableMargins(true);
     m_PageSetupData->SetMarginTopLeft(wxPoint(25, 25));
diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 4187a54dfe..0ac09fb108 100644
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -65,7 +65,6 @@ wxHtmlWinParser::wxHtmlWinParser(wxHtmlWindowInterface *wndIface)
                         for (m = 0; m < 7; m++)
                         {
                             m_FontsTable[i][j][k][l][m] = NULL;
-                            m_FontsFacesTable[i][j][k][l][m] = wxEmptyString;
 #if !wxUSE_UNICODE
                             m_FontsEncTable[i][j][k][l][m] = wxFONTENCODING_DEFAULT;
 #endif
diff --git a/src/ribbon/bar.cpp b/src/ribbon/bar.cpp
index e1a3878ece..271aa8c46b 100644
--- a/src/ribbon/bar.cpp
+++ b/src/ribbon/bar.cpp
@@ -77,7 +77,7 @@ void wxRibbonBar::AddPage(wxRibbonPage *page)
     wxString label;
     if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
         label = page->GetLabel();
-    wxBitmap icon = wxNullBitmap;
+    wxBitmap icon;
     if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
         icon = page->GetIcon();
     m_art->GetBarTabWidth(dcTemp, this, label, icon,
@@ -177,7 +177,7 @@ bool wxRibbonBar::Realize()
         wxString label;
         if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
             label = info.page->GetLabel();
-        wxBitmap icon = wxNullBitmap;
+        wxBitmap icon;
         if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
             icon = info.page->GetIcon();
         m_art->GetBarTabWidth(dcTemp, this, label, icon,
diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 1e49dfa71a..c05e13790c 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -839,8 +839,6 @@ bool wxRichTextImage::ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler
                 strData = wxString((const char*) data, wxConvUTF8, size);
                 delete[] data;
             }
-            else
-                strData = wxEmptyString;
         }
 
     }

From 86ab6de0c1ff78c769129816c4974638ebf6cb43 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Wed, 22 Aug 2018 09:45:20 -0700
Subject: [PATCH 886/916] Use clear() instead of assignment to wxEmptyString

---
 samples/opengl/penguin/dxfrenderer.cpp |  4 ++--
 samples/typetest/typetest.cpp          |  8 ++++----
 src/generic/prntdlgg.cpp               |  2 +-
 src/html/helpctrl.cpp                  |  2 +-
 src/html/helpdata.cpp                  |  5 +++--
 src/html/helpwnd.cpp                   |  5 +++--
 src/html/htmlwin.cpp                   | 10 +++++++---
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/samples/opengl/penguin/dxfrenderer.cpp b/samples/opengl/penguin/dxfrenderer.cpp
index 464ccc65fd..dbe6e2447a 100644
--- a/samples/opengl/penguin/dxfrenderer.cpp
+++ b/samples/opengl/penguin/dxfrenderer.cpp
@@ -480,7 +480,7 @@ bool DXFRenderer::ParseEntities(wxInputStream& stream)
                 else
                     p->colour = GetLayerColour(layer);
                 m_entities.Append(p);
-                colour = -1; layer = wxEmptyString;
+                colour = -1; layer.clear();
                 v[0] = v[1] = v[2] = v[3] = DXFVector();
                 state = 0;
             }
@@ -494,7 +494,7 @@ bool DXFRenderer::ParseEntities(wxInputStream& stream)
                 else
                     p->colour = GetLayerColour(layer);
                 m_entities.Append(p);
-                colour = -1; layer = wxEmptyString;
+                colour = -1; layer.clear();
                 v[0] = v[1] = v[2] = v[3] = DXFVector();
                 state = 0;
             }
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 8e4bf29b04..b4d511fd94 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -987,19 +987,19 @@ void MyApp::DoByteOrderDemo(wxCommandEvent& WXUNUSED(event))
     wxString text;
 
     wxInt32 var = 0xF1F2F3F4;
-    text = wxEmptyString;
+    text.clear();
     text.Printf( wxT("Value of wxInt32 is now: %#x.\n\n"), var );
     textCtrl.WriteText( text );
 
-    text = wxEmptyString;
+    text.clear();
     text.Printf( wxT("Value of swapped wxInt32 is: %#x.\n\n"), wxINT32_SWAP_ALWAYS( var ) );
     textCtrl.WriteText( text );
 
-    text = wxEmptyString;
+    text.clear();
     text.Printf( wxT("Value of wxInt32 swapped on little endian is: %#x.\n\n"), wxINT32_SWAP_ON_LE( var ) );
     textCtrl.WriteText( text );
 
-    text = wxEmptyString;
+    text.clear();
     text.Printf( wxT("Value of wxInt32 swapped on big endian is: %#x.\n\n"), wxINT32_SWAP_ON_BE( var ) );
     textCtrl.WriteText( text );
 }
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index b1c9d7eb77..6afa9eb544 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -569,7 +569,7 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
                 wxStringTokenizer tok2( tmp, wxT(" ") );
                 tmp = tok2.GetNextToken();  // "printer"
                 tmp = tok2.GetNextToken();  // "hp_deskjet930c"
-                tmp = wxEmptyString;
+                tmp.clear();
                 while (tok2.HasMoreTokens())
                 {
                     tmp += tok2.GetNextToken();
diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 1d19b0dd4a..88e14624d8 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -58,7 +58,7 @@ void wxHtmlHelpController::Init(int style)
     m_helpDialog = NULL;
 #if wxUSE_CONFIG
     m_Config = NULL;
-    m_ConfigRoot = wxEmptyString;
+    m_ConfigRoot.clear();
 #endif // wxUSE_CONFIG
     m_titleFormat = _("Help: %s");
     m_FrameStyle = style;
diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index a18147ef0e..763516e1e5 100644
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -185,7 +185,8 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
     }
     else if (tag.GetName() == wxT("OBJECT"))
     {
-        m_name = m_page = wxEmptyString;
+        m_name.clear();
+        m_page.clear();
         ParseInner(tag);
 
 #if 0
@@ -845,7 +846,7 @@ bool wxHtmlSearchStatus::Search()
         return false;
     }
 
-    m_Name = wxEmptyString;
+    m_Name.clear();
     m_CurItem = NULL;
     thepage = m_Data->m_contents[i].page;
 
diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index f68b485cea..88dca44361 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -268,7 +268,7 @@ void wxHtmlHelpWindow::Init(wxHtmlHelpData* data)
 
 #if wxUSE_CONFIG
     m_Config = NULL;
-    m_ConfigRoot = wxEmptyString;
+    m_ConfigRoot.clear();
 #endif // wxUSE_CONFIG
 
     m_Cfg.x = m_Cfg.y = wxDefaultCoord;
@@ -278,7 +278,8 @@ void wxHtmlHelpWindow::Init(wxHtmlHelpData* data)
     m_Cfg.navig_on = true;
 
     m_NormalFonts = m_FixedFonts = NULL;
-    m_NormalFace = m_FixedFace = wxEmptyString;
+    m_NormalFace.clear();
+    m_FixedFace.clear();
 #ifdef __WXMSW__
     m_FontSize = 10;
 #else
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index d3f06a38a8..eca5d83869 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -310,7 +310,9 @@ void wxHtmlWindow::Init()
 #endif // wxUSE_STATUSBAR
     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");
-    m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
+    m_OpenedPage.clear();
+    m_OpenedAnchor.clear();
+    m_OpenedPageTitle.clear();
     m_Cell = NULL;
     m_Parser = new wxHtmlWinParser(this);
     m_Parser->SetFS(m_FS);
@@ -433,7 +435,9 @@ void wxHtmlWindow::SetStandardFonts(int size,
 
 bool wxHtmlWindow::SetPage(const wxString& source)
 {
-    m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
+    m_OpenedPage.clear();
+    m_OpenedAnchor.clear();
+    m_OpenedPageTitle.clear();
     return DoSetPage(source);
 }
 
@@ -853,7 +857,7 @@ bool wxHtmlWindow::HistoryForward()
     if (m_HistoryPos == -1) return false;
     if (m_HistoryPos >= (int)m_History->GetCount() - 1)return false;
 
-    m_OpenedPage = wxEmptyString; // this will disable adding new entry into history in LoadPage()
+    m_OpenedPage.clear(); // this will disable adding new entry into history in LoadPage()
 
     m_HistoryPos++;
     l = (*m_History)[m_HistoryPos].GetPage();

From bfafb747619a6c232cd228542f4066c057665c78 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 22 Aug 2018 19:55:55 +0200
Subject: [PATCH 887/916] Fix missing enum in MinGW

---
 include/wx/msw/webview_missing.h | 21 +++++++++++++++++++++
 src/msw/webview_ie.cpp           |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/include/wx/msw/webview_missing.h b/include/wx/msw/webview_missing.h
index 514ae1e56c..f0e4ec6b9a 100644
--- a/include/wx/msw/webview_missing.h
+++ b/include/wx/msw/webview_missing.h
@@ -945,3 +945,24 @@ public:
 
 /* end of WinInet.h */
 
+/* ShObjldl_core.h */
+
+typedef enum _wxNWMF
+{
+    wxNWMF_UNLOADING = 0x1,
+    wxNWMF_USERINITED = 0x2,
+    wxNWMF_FIRST = 0x4,
+    wxNWMF_OVERRIDEKEY = 0x8,
+    wxNWMF_SHOWHELP = 0x10,
+    wxNWMF_HTMLDIALOG = 0x20,
+    wxNWMF_FROMDIALOGCHILD = 0x40,
+    wxNWMF_USERREQUESTED = 0x80,
+    wxNWMF_USERALLOWED = 0x100,
+    wxNWMF_FORCEWINDOW = 0x10000,
+    wxNWMF_FORCETAB = 0x20000,
+    wxNWMF_SUGGESTWINDOW = 0x40000,
+    wxNWMF_SUGGESTTAB = 0x80000,
+    wxNWMF_INACTIVETAB = 0x100000
+} _wxNWMF;
+
+/* end of ShObjldl_core.h */
diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 8df8c4b094..4dffa9605e 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -1477,7 +1477,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
             wxWebViewNavigationActionFlags navFlags = wxWEBVIEW_NAV_ACTION_OTHER;
 
-            if(flags & NWMF_USERINITED || flags & NWMF_USERREQUESTED)
+            if(flags & wxNWMF_USERINITED || flags & wxNWMF_USERREQUESTED)
                 navFlags = wxWEBVIEW_NAV_ACTION_USER;
 
             wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,

From 190cb0e025c89428d6a28320c9234d7ab5222910 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Wed, 22 Aug 2018 20:02:42 +0200
Subject: [PATCH 888/916] Remove trailing spaces in webview code

---
 include/wx/msw/webview_ie.h          |  2 +-
 include/wx/msw/webview_missing.h     |  4 ++--
 include/wx/webview.h                 |  2 +-
 src/common/webview.cpp               | 12 ++++++------
 src/common/webviewarchivehandler.cpp |  6 +++---
 src/msw/webview_ie.cpp               | 18 +++++++++---------
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 1c9d154bae..f1e7773f89 100644
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -259,7 +259,7 @@ public:
 class ClassFactory : public IClassFactory
 {
 public:
-    ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_handler(handler) 
+    ClassFactory(wxSharedPtr<wxWebViewHandler> handler) : m_handler(handler)
         { AddRef(); }
     virtual ~ClassFactory() {}
 
diff --git a/include/wx/msw/webview_missing.h b/include/wx/msw/webview_missing.h
index f0e4ec6b9a..61a54a4e20 100644
--- a/include/wx/msw/webview_missing.h
+++ b/include/wx/msw/webview_missing.h
@@ -297,8 +297,8 @@ typedef enum _tagwxELEMENT_TAG_ID
 {
     wxTAGID_NULL = 0, wxTAGID_UNKNOWN = 1, wxTAGID_A = 2, wxTAGID_ACRONYM = 3,
     wxTAGID_ADDRESS = 4, wxTAGID_APPLET = 5, wxTAGID_AREA = 6, wxTAGID_B = 7,
-    wxTAGID_BASE = 8, wxTAGID_BASEFONT = 9, wxTAGID_BDO = 10, 
-    wxTAGID_BGSOUND = 11, wxTAGID_BIG = 12, wxTAGID_BLINK = 13, 
+    wxTAGID_BASE = 8, wxTAGID_BASEFONT = 9, wxTAGID_BDO = 10,
+    wxTAGID_BGSOUND = 11, wxTAGID_BIG = 12, wxTAGID_BLINK = 13,
     wxTAGID_BLOCKQUOTE = 14, wxTAGID_BODY = 15, wxTAGID_BR = 16,
     wxTAGID_BUTTON = 17, wxTAGID_CAPTION = 18, wxTAGID_CENTER = 19,
     wxTAGID_CITE = 20, wxTAGID_CODE = 21, wxTAGID_COL = 22,
diff --git a/include/wx/webview.h b/include/wx/webview.h
index 28c3219359..9975325392 100644
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -149,7 +149,7 @@ public:
                           long style = 0,
                           const wxString& name = wxWebViewNameStr);
 
-    static void RegisterFactory(const wxString& backend, 
+    static void RegisterFactory(const wxString& backend,
                                 wxSharedPtr<wxWebViewFactory> factory);
 
     // General methods
diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 965576ae65..5121e385eb 100644
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -17,7 +17,7 @@
 
 #include "wx/webview.h"
 
-#if defined(__WXOSX__) 
+#if defined(__WXOSX__)
 #include "wx/osx/webview_webkit.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/webview_webkit.h"
@@ -65,8 +65,8 @@ wxWebView* wxWebView::New(const wxString& backend)
 
 // static
 wxWebView* wxWebView::New(wxWindow* parent, wxWindowID id, const wxString& url,
-                          const wxPoint& pos, const wxSize& size, 
-                          const wxString& backend, long style, 
+                          const wxPoint& pos, const wxSize& size,
+                          const wxString& backend, long style,
                           const wxString& name)
 {
     wxStringWebViewFactoryMap::iterator iter = FindFactory(backend);
@@ -79,13 +79,13 @@ wxWebView* wxWebView::New(wxWindow* parent, wxWindowID id, const wxString& url,
 }
 
 // static
-void wxWebView::RegisterFactory(const wxString& backend, 
+void wxWebView::RegisterFactory(const wxString& backend,
                                 wxSharedPtr<wxWebViewFactory> factory)
 {
     m_factoryMap[backend] = factory;
 }
 
-// static 
+// static
 wxStringWebViewFactoryMap::iterator wxWebView::FindFactory(const wxString &backend)
 {
     // Initialise the map, it checks internally for existing factories
@@ -93,7 +93,7 @@ wxStringWebViewFactoryMap::iterator wxWebView::FindFactory(const wxString &backe
 
     return m_factoryMap.find(backend);
 }
- 
+
 // static
 void wxWebView::InitFactoryMap()
 {
diff --git a/src/common/webviewarchivehandler.cpp b/src/common/webviewarchivehandler.cpp
index cb8f608a29..963c7fd210 100644
--- a/src/common/webviewarchivehandler.cpp
+++ b/src/common/webviewarchivehandler.cpp
@@ -76,7 +76,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
         }
     }
 
-    //We do not have a protocol string so we just pass the path withouth the 
+    //We do not have a protocol string so we just pass the path withouth the
     if(start == wxString::npos)
     {
         size_t doubleslash = path.find("//");
@@ -84,7 +84,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
         if(doubleslash == wxString::npos)
             return NULL;
 
-        wxString fspath = "file:" + 
+        wxString fspath = "file:" +
                           EscapeFileNameCharsInURL(path.substr(doubleslash + 2).c_str());
         return m_fileSystem->OpenFile(fspath);
     }
@@ -107,7 +107,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
         if(doubleslash == wxString::npos)
             return NULL;
 
-        wxString fspath = "file:" + 
+        wxString fspath = "file:" +
                           EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2).c_str())
                           + "#" + protocol +":" + archivepath;
         return m_fileSystem->OpenFile(fspath);
diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 4dffa9605e..73541f49f4 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -134,7 +134,7 @@ wxWebViewIE::~wxWebViewIE()
 
         for(unsigned int i = 0; i < m_factories.size(); i++)
         {
-            session->UnregisterNameSpace(m_factories[i], 
+            session->UnregisterNameSpace(m_factories[i],
                                         (m_factories[i]->GetName()).wc_str());
             m_factories[i]->Release();
         }
@@ -1030,7 +1030,7 @@ wxCOMPtr<IHTMLDocument2> wxWebViewIE::GetDocument() const
 
 bool wxWebViewIE::IsElementVisible(wxCOMPtr<IHTMLElement> elm)
 {
-    wxCOMPtr<IHTMLElement> elm1 = elm;   
+    wxCOMPtr<IHTMLElement> elm1 = elm;
     bool is_visible = true;
     //This method is not perfect but it does discover most of the hidden elements.
     //so if a better solution is found, then please do improve.
@@ -1046,7 +1046,7 @@ bool wxWebViewIE::IsElementVisible(wxCOMPtr<IHTMLElement> elm)
                 wxBasicString visibility_bstr;
 
                 //Check if the object has the style display:none.
-                if((style->get_display(display_bstr.ByRef()) != S_OK) || 
+                if((style->get_display(display_bstr.ByRef()) != S_OK) ||
                     wxString(display_bstr).IsSameAs(wxS("none"), false))
                 {
                     is_visible = false;
@@ -1092,7 +1092,7 @@ void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_fla
             wxCOMPtr<wxIMarkupPointer> ptrBegin, ptrEnd;
             wxBasicString attr_bstr(wxS("style=\"background-color:#ffff00\""));
             wxBasicString text_bstr(text);
-            
+
             pIMS->CreateMarkupPointer(&ptrBegin);
             pIMS->CreateMarkupPointer(&ptrEnd);
 
@@ -1633,10 +1633,10 @@ HRESULT wxSTDCALL DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
     wxUnusedVar(ppt);
     wxUnusedVar(pcmdtReserved);
     wxUnusedVar(pdispReserved);
-    if(m_browser->IsContextMenuEnabled()) 
-        return E_NOTIMPL; 
-    else 
-        return S_OK; 
+    if(m_browser->IsContextMenuEnabled())
+        return E_NOTIMPL;
+    else
+        return S_OK;
 }
 
 HRESULT wxSTDCALL DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
@@ -1706,7 +1706,7 @@ HRESULT wxSTDCALL DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
     {
         // check control is down but that it isn't right-alt which is mapped to
         // alt + ctrl
-        if(GetKeyState(VK_CONTROL) & 0x8000 && 
+        if(GetKeyState(VK_CONTROL) & 0x8000 &&
          !(GetKeyState(VK_MENU) & 0x8000))
         {
             //skip the accelerators used by the control

From ad4296fef47abe360faac60e9f52bb104e74a3c9 Mon Sep 17 00:00:00 2001
From: Anil <anilkumar8753@gmail.com>
Date: Thu, 23 Aug 2018 10:24:57 +0530
Subject: [PATCH 889/916] Fix handling mouse events on scrolled wxHeaderCtrl

Fix confusion with the coordinates kind in FindColumnAtPoint(): it was
sometimes passed physical mouse coordinates and sometimes logical ones.
Make it clear now that it expects physical coordinates and adjust its
code accordingly.

Also remove a redundant call to FindColumnAtPoint().

Closes https://github.com/wxWidgets/wxWidgets/pull/889
---
 src/generic/headerctrlg.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/generic/headerctrlg.cpp b/src/generic/headerctrlg.cpp
index 7382fb47ad..0254cfa8d6 100644
--- a/src/generic/headerctrlg.cpp
+++ b/src/generic/headerctrlg.cpp
@@ -169,9 +169,10 @@ int wxHeaderCtrl::GetColEnd(unsigned int idx) const
     return x + GetColumn(idx).GetWidth();
 }
 
-unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const
+unsigned int wxHeaderCtrl::FindColumnAtPoint(int xPhysical, bool *onSeparator) const
 {
     int pos = 0;
+    int xLogical = xPhysical - m_scrollOffset;
     const unsigned count = GetColumnCount();
     for ( unsigned n = 0; n < count; n++ )
     {
@@ -186,7 +187,7 @@ unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const
         // line separating it from the next column
         //
         // TODO: don't hardcode sensitivity
-        if ( col.IsResizeable() && abs(x - pos) < 8 )
+        if ( col.IsResizeable() && abs(xLogical - pos) < 8 )
         {
             if ( onSeparator )
                 *onSeparator = true;
@@ -194,7 +195,7 @@ unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const
         }
 
         // inside this column?
-        if ( x < pos )
+        if ( xLogical < pos )
         {
             if ( onSeparator )
                 *onSeparator = false;
@@ -427,7 +428,7 @@ bool wxHeaderCtrl::EndReordering(int xPhysical)
         event.SetEventObject(this);
         event.SetColumn(colOld);
 
-        const unsigned pos = GetColumnPos(FindColumnAtPoint(xPhysical));
+        const unsigned pos = GetColumnPos(colNew);
         event.SetNewOrder(pos);
 
         if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
@@ -595,7 +596,6 @@ void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
 
     // account for the control displacement
     const int xPhysical = mevent.GetX();
-    const int xLogical = xPhysical - m_scrollOffset;
 
     // first deal with the [continuation of any] dragging operations in
     // progress
@@ -630,7 +630,7 @@ void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
     bool onSeparator;
     const unsigned col = mevent.Leaving()
                             ? (onSeparator = false, COL_NONE)
-                            : FindColumnAtPoint(xLogical, &onSeparator);
+                            : FindColumnAtPoint(xPhysical, &onSeparator);
 
 
     // update the highlighted column if it changed

From 418cf57a96c2363f37bdfa04af69b8fdd9e7c00d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 14 Aug 2018 15:50:40 +0200
Subject: [PATCH 890/916] Fix drawing of static box with empty label under MSW

The top part of the box border was not drawn after the changes of
900c6d5d75ae980c3ebf03c70bebcc319a44bfe2 which decreased the top border
size too much in the case of empty label.

Fix this and also try to improve the code a little bit by introducing
another symbolic constant in MSW code and not using the constant from
the base class code, as like this we can at least keep all the related
constants together -- even if they're still as magic as ever.

Closes #18191.
---
 src/msw/statbox.cpp | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 7fb1ad9b1e..c1d82350a3 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -60,6 +60,10 @@ const int LABEL_HORZ_OFFSET = 9;
 const int LABEL_HORZ_BORDER = 2;
 const int LABEL_VERT_BORDER = 2;
 
+// Offset of the box contents from left/right/bottom edge (top one is
+// different, see GetBordersForSizer()). This one is completely arbitrary.
+const int CHILDREN_OFFSET = 5;
+
 } // anonymous namespace
 
 // ----------------------------------------------------------------------------
@@ -192,10 +196,29 @@ wxSize wxStaticBox::DoGetBestSize() const
 
 void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
 {
-    wxStaticBoxBase::GetBordersForSizer(borderTop, borderOther);
+    // Base class version doesn't leave enough space at the top when the label
+    // is empty, so we can't use it here, even though the code is pretty
+    // similar.
+    if ( m_labelWin )
+    {
+        *borderTop = m_labelWin->GetSize().y;
+    }
+    else if ( !GetLabel().empty() )
+    {
+        *borderTop = GetCharHeight();
+    }
+    else // No label window nor text.
+    {
+        // This is completely arbitrary, but using the full char height in
+        // this case too seems bad as it leaves too much space at the top
+        // (although it does have the advantage of aligning the controls
+        // inside static boxes with and without labels vertically).
+        *borderTop = 2*FromDIP(CHILDREN_OFFSET);
+    }
 
-    // need extra space, don't know how much but this seems to be enough
     *borderTop += FromDIP(LABEL_VERT_BORDER);
+
+    *borderOther = FromDIP(CHILDREN_OFFSET);
 }
 
 bool wxStaticBox::SetBackgroundColour(const wxColour& colour)

From 4915f3b5a65df4607b1623dd95812a093fe44be3 Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Fri, 24 Aug 2018 19:35:47 +0200
Subject: [PATCH 891/916] Correct list formatting in "Bitmaps and Icons"
 overview

Remove whitespace preceding @li tags which prevented doxygen from
formatting the text as a list. Add a period after the last item in the
lists where it was missing.

Closes https://github.com/wxWidgets/wxWidgets/pull/897
---
 docs/doxygen/overviews/bitmap.h | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/doxygen/overviews/bitmap.h b/docs/doxygen/overviews/bitmap.h
index 46c0ab0b3e..e046c27cfd 100644
--- a/docs/doxygen/overviews/bitmap.h
+++ b/docs/doxygen/overviews/bitmap.h
@@ -106,58 +106,58 @@ platform.
 
 Under Windows, wxBitmap may load the following formats:
 
-    @li Windows bitmap resource (wxBITMAP_TYPE_BMP_RESOURCE)
-    @li Windows bitmap file (wxBITMAP_TYPE_BMP)
-    @li XPM data and file (wxBITMAP_TYPE_XPM)
-    @li All formats that are supported by the wxImage class.
+@li Windows bitmap resource (wxBITMAP_TYPE_BMP_RESOURCE)
+@li Windows bitmap file (wxBITMAP_TYPE_BMP)
+@li XPM data and file (wxBITMAP_TYPE_XPM)
+@li All formats that are supported by the wxImage class.
 
 Under wxGTK, wxBitmap may load the following formats:
 
-    @li XPM data and file (wxBITMAP_TYPE_XPM)
-    @li All formats that are supported by the wxImage class.
+@li XPM data and file (wxBITMAP_TYPE_XPM)
+@li All formats that are supported by the wxImage class.
 
 Under wxMotif and wxX11, wxBitmap may load the following formats:
 
-    @li XBM data and file (wxBITMAP_TYPE_XBM)
-    @li XPM data and file (wxBITMAP_TYPE_XPM)
-    @li All formats that are supported by the wxImage class.
+@li XBM data and file (wxBITMAP_TYPE_XBM)
+@li XPM data and file (wxBITMAP_TYPE_XPM)
+@li All formats that are supported by the wxImage class.
 
 @subsection overview_bitmap_supportedformats_icon wxIcon
 
 Under Windows, wxIcon may load the following formats:
 
-    @li Windows icon resource (wxBITMAP_TYPE_ICO_RESOURCE)
-    @li Windows icon file (wxBITMAP_TYPE_ICO)
-    @li XPM data and file (wxBITMAP_TYPE_XPM)
+@li Windows icon resource (wxBITMAP_TYPE_ICO_RESOURCE)
+@li Windows icon file (wxBITMAP_TYPE_ICO)
+@li XPM data and file (wxBITMAP_TYPE_XPM).
 
 Under wxGTK, wxIcon may load the following formats:
 
-    @li XPM data and file (wxBITMAP_TYPE_XPM)
-    @li All formats that are supported by the wxImage class.
+@li XPM data and file (wxBITMAP_TYPE_XPM)
+@li All formats that are supported by the wxImage class.
 
 Under wxMotif and wxX11, wxIcon may load the following formats:
 
-    @li XBM data and file (wxBITMAP_TYPE_XBM)
-    @li XPM data and file (wxBITMAP_TYPE_XPM)
-    @li All formats that are supported by the wxImage class.
+@li XBM data and file (wxBITMAP_TYPE_XBM)
+@li XPM data and file (wxBITMAP_TYPE_XPM)
+@li All formats that are supported by the wxImage class.
 
 @subsection overview_bitmap_supportedformats_cursor wxCursor
 
 Under Windows, wxCursor may load the following formats:
 
-    @li Windows cursor resource (wxBITMAP_TYPE_CUR_RESOURCE)
-    @li Windows cursor file (wxBITMAP_TYPE_CUR)
-    @li Windows icon file (wxBITMAP_TYPE_ICO)
-    @li Windows bitmap file (wxBITMAP_TYPE_BMP)
+@li Windows cursor resource (wxBITMAP_TYPE_CUR_RESOURCE)
+@li Windows cursor file (wxBITMAP_TYPE_CUR)
+@li Windows icon file (wxBITMAP_TYPE_ICO)
+@li Windows bitmap file (wxBITMAP_TYPE_BMP).
 
 Under wxGTK, wxCursor may load the following formats (in addition to stock
 cursors):
 
-    @li None (stock cursors only).
+@li None (stock cursors only).
 
 Under wxMotif and wxX11, wxCursor may load the following formats:
 
-    @li XBM data and file (wxBITMAP_TYPE_XBM)
+@li XBM data and file (wxBITMAP_TYPE_XBM).
 
 
 @section overview_bitmap_handlers Bitmap Format Handlers

From b01f4ef8e70b3731a6d5a243854084e9cbc60a54 Mon Sep 17 00:00:00 2001
From: PB <pbfordev@gmail.com>
Date: Fri, 24 Aug 2018 20:00:16 +0200
Subject: [PATCH 892/916] Add more references to wxIconBundle to documentation

Add wxIconBundle to the list in the Overview of Available Classes /
Image and bitmap classes as well as to the documentation page for
wxIcon.

Closes https://github.com/wxWidgets/wxWidgets/pull/898
---
 docs/doxygen/mainpages/cat_classes.h | 1 +
 interface/wx/icon.h                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/doxygen/mainpages/cat_classes.h b/docs/doxygen/mainpages/cat_classes.h
index ed38b1bc3e..e9bb6e458f 100644
--- a/docs/doxygen/mainpages/cat_classes.h
+++ b/docs/doxygen/mainpages/cat_classes.h
@@ -354,6 +354,7 @@ Related Overviews: @ref overview_bitmap
 @li wxCursor: A small, transparent bitmap representing the cursor
 @li wxIcon: A small, transparent bitmap for assigning to frames and drawing on
     device contexts
+@li wxIconBundle: Contains multiple copies of an icon in different sizes
 @li wxImage: A platform-independent image class
 @li wxImageHandler: Class for loading a saving a wxImage in a specific format
 @li wxImageList: A list of images, used with some controls
diff --git a/interface/wx/icon.h b/interface/wx/icon.h
index eff8124923..8f1986c46c 100644
--- a/interface/wx/icon.h
+++ b/interface/wx/icon.h
@@ -47,7 +47,7 @@
     ::wxNullIcon
 
     @see @ref overview_bitmap, @ref overview_bitmap_supportedformats,
-         wxDC::DrawIcon, wxCursor
+         wxIconBundle, wxDC::DrawIcon, wxCursor
 */
 class wxIcon : public wxGDIObject
 {

From 5b2c905fb91e1605b16fe5b3186e910255c8556c Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 23 Aug 2018 21:12:39 +0200
Subject: [PATCH 893/916] Log MSBuild AppVeyor messages

Provide better integration for the AppVeyor CI builds.

Closes https://github.com/wxWidgets/wxWidgets/pull/895
---
 build/tools/appveyor.bat | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat
index 468fb0f953..c2bc21f345 100644
--- a/build/tools/appveyor.bat
+++ b/build/tools/appveyor.bat
@@ -1,11 +1,12 @@
+set MSBUILD_LOGGER=/logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 goto %TOOLSET%
 
 :msbuild
 cd build\msw
-msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wx_vc12.sln
+msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wx_vc12.sln %MSBUILD_LOGGER%
 cd ..\..\tests
-msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_vc12.sln
-msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_gui_vc12.sln
+msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_vc12.sln %MSBUILD_LOGGER%
+msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_gui_vc12.sln %MSBUILD_LOGGER%
 goto :eof
 
 :nmake
@@ -57,7 +58,7 @@ path C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%path%
 set GENERATOR=MSYS Makefiles
 set SKIPTESTS=1
 set SKIPINSTALL=1
-set CMAKE_BUILD_FLAGS=-- -j3
+set CMAKE_NATIVE_FLAGS=-j3
 goto cmake
 
 :cmake_cygwin
@@ -66,7 +67,7 @@ path c:\cygwin\bin;%path%
 set GENERATOR=Unix Makefiles
 set SKIPTESTS=1
 set SKIPINSTALL=1
-set CMAKE_BUILD_FLAGS=-- -j3
+set CMAKE_NATIVE_FLAGS=-j3
 goto cmake
 
 :cmake_mingw
@@ -74,7 +75,7 @@ goto cmake
 path C:\Program Files (x86)\CMake\bin;C:\MinGW\bin
 set GENERATOR=MinGW Makefiles
 set SKIPTESTS=1
-set CMAKE_BUILD_FLAGS=-- -j3
+set CMAKE_NATIVE_FLAGS=-j3
 goto cmake
 
 :cmake
@@ -83,6 +84,9 @@ cmake --version
 
 if "%SHARED%"=="" set SHARED=ON
 if "%CONFIGURATION%"=="" set CONFIGURATION=Release
+echo.%GENERATOR% | findstr /C:"Visual Studio">nul && (
+    set CMAKE_LOGGER=%MSBUILD_LOGGER%
+)
 
 if "%SKIPTESTS%"=="1" (
     set BUILD_TESTS=OFF
@@ -101,7 +105,7 @@ if ERRORLEVEL 1 goto error
 echo.
 echo --- Starting the build
 echo.
-cmake --build . --config %CONFIGURATION% %CMAKE_BUILD_FLAGS%
+cmake --build . --config %CONFIGURATION% -- %CMAKE_NATIVE_FLAGS% %CMAKE_LOGGER%
 if ERRORLEVEL 1 goto error
 
 :: Package binaries as artifact
@@ -115,7 +119,7 @@ if NOT "%SKIPINSTALL%"=="1" (
     echo.
     echo --- Installing
     echo.
-    cmake --build . --config %CONFIGURATION% --target install
+    cmake --build . --config %CONFIGURATION% --target install -- %CMAKE_LOGGER%
     if ERRORLEVEL 1 goto error
     popd
 
@@ -129,7 +133,7 @@ if NOT "%SKIPINSTALL%"=="1" (
     cmake -G "%GENERATOR%" ..\samples\minimal
     if ERRORLEVEL 1 goto error
     echo --- Building minimal sample with installed library
-    cmake --build . --config %CONFIGURATION%
+    cmake --build . --config %CONFIGURATION% -- %CMAKE_LOGGER%
     if ERRORLEVEL 1 goto error
     popd
 )

From de5ba70203f18fde148c71495ab5ee5aab7540a3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 24 Aug 2018 19:03:15 +0200
Subject: [PATCH 894/916] Fix handling events from their items in submenu
 itself

This previously worked in wxGTK, but not in wxMSW and even under wxGTK
it could be surprising that the submenu got the event, but its parent
menu did not.

Make things consistent between the platforms and send the event to the
menu directly containing it first, but then also to its parent menu(s).

Document the new behaviour and verify that it works as intended with a
new unit test.

Closes #18202.
---
 docs/changes.txt             |  1 +
 interface/wx/menu.h          | 22 ++++++++++++----------
 src/common/menucmn.cpp       | 31 ++++++++++++++++---------------
 src/msw/menu.cpp             |  2 +-
 tests/events/propagation.cpp | 20 +++++++++++++++++---
 5 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index c785d23c77..d40be39dc9 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -112,6 +112,7 @@ All (GUI):
 - Add support for style="page-break-inside:avoid" to <div> in wxHTML.
 - Support strike-through in wxDataViewItem attributes (approach, Igor Korot).
 - Allow distinguishing between user- and script-opened windows in wxWebView.
+- Allow binding to events generated by their items in submenus too.
 
 wxGTK:
 
diff --git a/interface/wx/menu.h b/interface/wx/menu.h
index 3157e3a75b..ace479f0dc 100644
--- a/interface/wx/menu.h
+++ b/interface/wx/menu.h
@@ -482,18 +482,20 @@ public:
 
     @section menu_eventhandling Event handling
 
-    If the menu is part of a menubar, then wxMenuBar event processing is used.
+    Event handlers for the commands generated by the menu items can be
+    connected directly to the menu object itself using wxEvtHandler::Bind(). If
+    this menu is a submenu of another one, the events from its items can also
+    be processed in the parent menu and so on, recursively.
 
-    With a popup menu (see wxWindow::PopupMenu), there is a variety of ways to
-    handle a menu selection event (@c wxEVT_MENU):
-    - Provide @c EVT_MENU handlers in the window which pops up the menu, or in an
-      ancestor of that window (the simplest method);
-    - Derive a new class from wxMenu and define event table entries using the @c EVT_MENU macro;
-    - Set a new event handler for wxMenu, through wxEvtHandler::SetNextHandler,
-      specifying an object whose class has @c EVT_MENU entries;
+    If the menu is part of a menu bar, then events can also be handled in
+    wxMenuBar object.
 
-    Note that instead of static @c EVT_MENU macros you can also use dynamic
-    connection; see @ref overview_events_bind.
+    Finally, menu events can also be handled in the associated window, which is
+    either the wxFrame associated with the menu bar this menu belongs to or the
+    window for which wxWindow::PopupMenu() was called for the popup menus.
+
+    See @ref overview_events_bind for how to bind event handlers to the various
+    objects.
 
     @library{wxcore}
     @category{menus}
diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 7c12f30765..1c6fd085df 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -648,11 +648,12 @@ bool wxMenuBase::DoProcessEvent(wxMenuBase* menu, wxEvent& event, wxWindow* win)
 {
     event.SetEventObject(menu);
 
-    if ( menu )
-    {
-        wxMenuBar* const mb = menu->GetMenuBar();
+    wxMenuBar* const mb = menu ? menu->GetMenuBar() : NULL;
 
-        // Try the menu's event handler first
+    // Process event in the menu itself and all its parent menus, if it's a
+    // submenu, first.
+    for ( ; menu; menu = menu->GetParent() )
+    {
         wxEvtHandler *handler = menu->GetEventHandler();
         if ( handler )
         {
@@ -666,19 +667,19 @@ bool wxMenuBase::DoProcessEvent(wxMenuBase* menu, wxEvent& event, wxWindow* win)
             if ( handler->SafelyProcessEvent(event) )
                 return true;
         }
+    }
 
-        // If this menu is part of the menu bar, try the event there. this
-        if ( mb )
-        {
-            if ( mb->HandleWindowEvent(event) )
-                return true;
+    // If this menu is part of the menu bar, try the event there.
+    if ( mb )
+    {
+        if ( mb->HandleWindowEvent(event) )
+            return true;
 
-            // If this already propagated it upwards to the window containing
-            // the menu bar, we don't have to handle it in this window again
-            // below.
-            if ( event.ShouldPropagate() )
-                return false;
-        }
+        // If this already propagated it upwards to the window containing
+        // the menu bar, we don't have to handle it in this window again
+        // below.
+        if ( event.ShouldPropagate() )
+            return false;
     }
 
     // Try the window the menu was popped up from.
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 4ebd6a5d2d..4705b802c9 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -795,7 +795,7 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)
             }
         }
 
-        SendEvent(id, checked);
+        item->GetMenu()->SendEvent(id, checked);
     }
 
     return true;
diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp
index 8c58d662fd..c0d302b7ee 100644
--- a/tests/events/propagation.cpp
+++ b/tests/events/propagation.cpp
@@ -445,11 +445,14 @@ wxMenu* CreateTestMenu(wxFrame* frame)
 // reliable than using wxUIActionSimulator and currently works in all ports as
 // they all call wxMenuBase::SendEvent() from their respective menu event
 // handlers.
-#define ASSERT_MENU_EVENT_RESULT(menu, result) \
-    g_str.clear();                             \
-    menu->SendEvent(wxID_APPLY);               \
+#define ASSERT_MENU_EVENT_RESULT_FOR(cmd, menu, result) \
+    g_str.clear();                                      \
+    menu->SendEvent(cmd);                               \
     CHECK( g_str == result )
 
+#define ASSERT_MENU_EVENT_RESULT(menu, result) \
+    ASSERT_MENU_EVENT_RESULT_FOR(wxID_APPLY, menu, result)
+
 void EventPropagationTestCase::MenuEvent()
 {
     wxFrame* const frame = static_cast<wxFrame*>(wxTheApp->GetTopWindow());
@@ -472,6 +475,17 @@ void EventPropagationTestCase::MenuEvent()
     ASSERT_MENU_EVENT_RESULT( menu, "aomA" );
 
 
+    // Check that a handler can also be attached to a submenu.
+    wxMenu* const submenu = new wxMenu;
+    submenu->Append(wxID_ABOUT);
+    menu->Append(wxID_ANY, "Submenu", submenu);
+
+    TestMenuEvtHandler hs('s'); // 's' for "submenu"
+    submenu->SetNextHandler(&hs);
+    wxON_BLOCK_EXIT_OBJ1( *submenu,
+                          wxEvtHandler::SetNextHandler, (wxEvtHandler*)NULL );
+    ASSERT_MENU_EVENT_RESULT_FOR( wxID_ABOUT, submenu, "aosomA" );
+
     // Test that the event handler associated with the menu bar gets the event.
     TestMenuEvtHandler hb('b'); // 'b' for "menu Bar"
     mb->PushEventHandler(&hb);

From 9db0234abcfad88c95f1839a2eecffb4d9700f5b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 02:35:20 +0200
Subject: [PATCH 895/916] Allow passing already parsed HTML to wxHtmlDCRenderer

This is more efficient when the same HTML is reused multiple times, e.g.
for measuring it first and then rendering it.

The new function also makes it simpler to parse HTML and manipulate it
in some way before measuring and rendering it.
---
 include/wx/html/htmprint.h   |  8 ++++++++
 interface/wx/html/htmprint.h | 13 +++++++++++++
 src/html/htmprint.cpp        | 30 ++++++++++++++++++++++++++----
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 0c206ade6c..830a1d8362 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -54,6 +54,11 @@ public:
     // (see wxFileSystem for detailed explanation)
     void SetHtmlText(const wxString& html, const wxString& basepath = wxEmptyString, bool isdir = true);
 
+    // Sets the HTML cell that will be rendered: this is more efficient than
+    // using text as it allows to parse it only once. Note that the cell will
+    // be modified by this call.
+    void SetHtmlCell(wxHtmlContainerCell& cell);
+
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
     void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL);
 
@@ -79,11 +84,14 @@ public:
     int GetTotalHeight() const;
 
 private:
+    void DoSetHtmlCell(wxHtmlContainerCell* cell);
+
     wxDC *m_DC;
     wxHtmlWinParser *m_Parser;
     wxFileSystem *m_FS;
     wxHtmlContainerCell *m_Cells;
     int m_Width, m_Height;
+    bool m_ownsCells;
 
     wxDECLARE_NO_COPY_CLASS(wxHtmlDCRenderer);
 };
diff --git a/interface/wx/html/htmprint.h b/interface/wx/html/htmprint.h
index 8e2dfdc9db..1b4a4e861b 100644
--- a/interface/wx/html/htmprint.h
+++ b/interface/wx/html/htmprint.h
@@ -168,6 +168,19 @@ public:
                      const wxString& basepath = wxEmptyString,
                      bool isdir = true);
 
+    /**
+        Associate the given HTML contents to the renderer.
+
+        This is similar to SetHtmlText(), but is more efficient as the text can
+        be parsed only once, using wxHtmlParser::Parse(), and then passed to
+        wxHtmlDCRenderer multiple times or already reused for other purposes.
+
+        Note that @a cell will be modified (e.g. laid out) by this function.
+
+        @since 3.1.2
+     */
+    void SetHtmlCell(wxHtmlContainerCell& cell);
+
     /**
         Set size of output rectangle, in pixels. Note that you @b can't change
         width of the rectangle between calls to Render() !
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index a3acb7d007..86b0b7f51b 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -70,6 +70,7 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
     m_DC = NULL;
     m_Width = m_Height = 0;
     m_Cells = NULL;
+    m_ownsCells = false;
     m_Parser = new wxHtmlWinParser();
     m_FS = new wxFileSystem();
     m_Parser->SetFS(m_FS);
@@ -80,7 +81,9 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
 
 wxHtmlDCRenderer::~wxHtmlDCRenderer()
 {
-    if (m_Cells) delete m_Cells;
+    if ( m_ownsCells )
+        delete m_Cells;
+
     if (m_Parser) delete m_Parser;
     if (m_FS) delete m_FS;
 }
@@ -110,14 +113,33 @@ void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepat
     wxCHECK_RET( m_DC, "SetDC() must be called before SetHtmlText()" );
     wxCHECK_RET( m_Width, "SetSize() must be called before SetHtmlText()" );
 
-    wxDELETE(m_Cells);
-
     m_FS->ChangePathTo(basepath, isdir);
-    m_Cells = (wxHtmlContainerCell*) m_Parser->Parse(html);
+
+    wxHtmlContainerCell* const cell = (wxHtmlContainerCell*) m_Parser->Parse(html);
+    wxCHECK_RET( cell, "Failed to parse HTML" );
+
+    DoSetHtmlCell(cell);
+
+    m_ownsCells = true;
+}
+
+void wxHtmlDCRenderer::DoSetHtmlCell(wxHtmlContainerCell* cell)
+{
+    if ( m_ownsCells )
+        delete m_Cells;
+
+    m_Cells = cell;
     m_Cells->SetIndent(0, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
     m_Cells->Layout(m_Width);
 }
 
+void wxHtmlDCRenderer::SetHtmlCell(wxHtmlContainerCell& cell)
+{
+    DoSetHtmlCell(&cell);
+
+    m_ownsCells = false;
+}
+
 
 void wxHtmlDCRenderer::SetFonts(const wxString& normal_face, const wxString& fixed_face,
                                 const int *sizes)

From 012baf1ff26c08c69bc01fe4ce01df0a794b0b15 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 14:27:58 +0200
Subject: [PATCH 896/916] Remove unnecessary heap allocations in
 wxHtmlDCRenderer

Make m_Parser and m_FS simple objects instead of pointers as it's
completely unnecessary to allocate them on the heap here.

Note that both wxHtmlWinParser (by explicitly including its header) and
wxFileSystem (which is implicitly included via wx/html/htmlpars.h) are
fully declared in the header, so using pointers doesn't even help with
reducing compilation dependencies.

No real changes.
---
 include/wx/html/htmprint.h |  4 ++--
 src/html/htmprint.cpp      | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 830a1d8362..554413d44c 100644
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -87,8 +87,8 @@ private:
     void DoSetHtmlCell(wxHtmlContainerCell* cell);
 
     wxDC *m_DC;
-    wxHtmlWinParser *m_Parser;
-    wxFileSystem *m_FS;
+    wxFileSystem m_FS;
+    wxHtmlWinParser m_Parser;
     wxHtmlContainerCell *m_Cells;
     int m_Width, m_Height;
     bool m_ownsCells;
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 86b0b7f51b..2ed4e19256 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -71,9 +71,7 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
     m_Width = m_Height = 0;
     m_Cells = NULL;
     m_ownsCells = false;
-    m_Parser = new wxHtmlWinParser();
-    m_FS = new wxFileSystem();
-    m_Parser->SetFS(m_FS);
+    m_Parser.SetFS(&m_FS);
     SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);
 }
 
@@ -83,9 +81,6 @@ wxHtmlDCRenderer::~wxHtmlDCRenderer()
 {
     if ( m_ownsCells )
         delete m_Cells;
-
-    if (m_Parser) delete m_Parser;
-    if (m_FS) delete m_FS;
 }
 
 
@@ -93,7 +88,7 @@ wxHtmlDCRenderer::~wxHtmlDCRenderer()
 void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale, double font_scale)
 {
     m_DC = dc;
-    m_Parser->SetDC(m_DC, pixel_scale, font_scale);
+    m_Parser.SetDC(m_DC, pixel_scale, font_scale);
 }
 
 
@@ -113,9 +108,9 @@ void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepat
     wxCHECK_RET( m_DC, "SetDC() must be called before SetHtmlText()" );
     wxCHECK_RET( m_Width, "SetSize() must be called before SetHtmlText()" );
 
-    m_FS->ChangePathTo(basepath, isdir);
+    m_FS.ChangePathTo(basepath, isdir);
 
-    wxHtmlContainerCell* const cell = (wxHtmlContainerCell*) m_Parser->Parse(html);
+    wxHtmlContainerCell* const cell = (wxHtmlContainerCell*) m_Parser.Parse(html);
     wxCHECK_RET( cell, "Failed to parse HTML" );
 
     DoSetHtmlCell(cell);
@@ -144,7 +139,7 @@ void wxHtmlDCRenderer::SetHtmlCell(wxHtmlContainerCell& cell)
 void wxHtmlDCRenderer::SetFonts(const wxString& normal_face, const wxString& fixed_face,
                                 const int *sizes)
 {
-    m_Parser->SetFonts(normal_face, fixed_face, sizes);
+    m_Parser.SetFonts(normal_face, fixed_face, sizes);
 
     if ( m_Cells )
         m_Cells->Layout(m_Width);
@@ -155,7 +150,7 @@ void wxHtmlDCRenderer::SetStandardFonts(int size,
                                         const wxString& normal_face,
                                         const wxString& fixed_face)
 {
-    m_Parser->SetStandardFonts(size, normal_face, fixed_face);
+    m_Parser.SetStandardFonts(size, normal_face, fixed_face);
 
     if ( m_Cells )
         m_Cells->Layout(m_Width);

From 869fb4f2bc662e4340c4797cf44d37af424522e9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 21:00:11 +0200
Subject: [PATCH 897/916] Remove CppUnit compatibility macros from wxHtmlParser
 test

There was just a single test there, so remove all CppUnit boilerplate
which accounted for more than 50% of the file before adding more tests.
---
 tests/html/htmlparser.cpp | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/tests/html/htmlparser.cpp b/tests/html/htmlparser.cpp
index 29c3cb5c1f..4577b5baf0 100644
--- a/tests/html/htmlparser.cpp
+++ b/tests/html/htmlparser.cpp
@@ -24,37 +24,8 @@
 
 #include "wx/html/winpars.h"
 
-// ----------------------------------------------------------------------------
-// test class
-// ----------------------------------------------------------------------------
-
-class HtmlParserTestCase : public CppUnit::TestCase
-{
-public:
-    HtmlParserTestCase() { }
-
-private:
-    CPPUNIT_TEST_SUITE( HtmlParserTestCase );
-        CPPUNIT_TEST( Invalid );
-    CPPUNIT_TEST_SUITE_END();
-
-    void Invalid();
-
-    wxDECLARE_NO_COPY_CLASS(HtmlParserTestCase);
-};
-
-// register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( HtmlParserTestCase );
-
-// also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( HtmlParserTestCase, "HtmlParserTestCase" );
-
-// ----------------------------------------------------------------------------
-// tests themselves
-// ----------------------------------------------------------------------------
-
 // Test that parsing invalid HTML simply fails but doesn't crash for example.
-void HtmlParserTestCase::Invalid()
+TEST_CASE("wxHtmlParser::ParseInvalid", "[html][parser][error]")
 {
     class NullParser : public wxHtmlWinParser
     {

From 2895e5c4a10bbd968558f51ca54da54c8574a8e4 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 21:14:40 +0200
Subject: [PATCH 898/916] Document that wxHtmlContainerCell::InsertCell() takes
 ownership

This might have been already clear, but it doesn't hurt to specify it
explicitly.
---
 interface/wx/html/htmlcell.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/wx/html/htmlcell.h b/interface/wx/html/htmlcell.h
index 18b05a8a00..406a37b709 100644
--- a/interface/wx/html/htmlcell.h
+++ b/interface/wx/html/htmlcell.h
@@ -506,6 +506,9 @@ public:
 
     /**
         Inserts a new cell into the container.
+
+        Note that the container takes ownership of the cell and will delete it
+        when it itself is destroyed.
     */
     void InsertCell(wxHtmlCell* cell);
 

From a59f5932dff3ecf29d7f0f7807886c266bdebb14 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 21:16:55 +0200
Subject: [PATCH 899/916] Add wxHtmlContainerCell::Detach()

This allows manipulating the HTML DOM from the outside, e.g. to detach
a header element in order to be able to repeat it on all pages.
---
 include/wx/html/htmlcell.h   |  5 +++
 interface/wx/html/htmlcell.h | 14 +++++++++
 src/html/htmlcell.cpp        | 37 ++++++++++++++++++++++
 tests/html/htmlparser.cpp    | 60 ++++++++++++++++++++++++++++++++++++
 4 files changed, 116 insertions(+)

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 282b7cd964..2c99923b80 100644
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -459,6 +459,11 @@ public:
     // insert cell at the end of m_Cells list
     void InsertCell(wxHtmlCell *cell);
 
+    // Detach a child cell. After calling this method, it's the caller
+    // responsibility to destroy this cell (possibly by calling InsertCell()
+    // with it to attach it elsewhere).
+    void Detach(wxHtmlCell *cell);
+
     // sets horizontal/vertical alignment
     void SetAlignHor(int al) {m_AlignHor = al; m_LastLayout = -1;}
     int GetAlignHor() const {return m_AlignHor;}
diff --git a/interface/wx/html/htmlcell.h b/interface/wx/html/htmlcell.h
index 406a37b709..fe17b29ddd 100644
--- a/interface/wx/html/htmlcell.h
+++ b/interface/wx/html/htmlcell.h
@@ -473,6 +473,20 @@ public:
     */
     wxHtmlContainerCell(wxHtmlContainerCell* parent);
 
+    /**
+        Detach a child cell.
+
+        Detaching a cell removes it from this container and allows to reattach
+        it to another one by using InsertCell(). Alternatively, this method can
+        be used to selectively remove some elements of the HTML document tree
+        by deleting the cell after calling it.
+
+        @param cell Must be non-null and an immediate child of this cell.
+
+        @since 3.1.2
+     */
+    void Detach(wxHtmlCell* cell);
+
     /**
         Returns container's horizontal alignment.
     */
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index e4392edc35..1768178b65 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -1159,6 +1159,43 @@ void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
 
 
 
+void wxHtmlContainerCell::Detach(wxHtmlCell *cell)
+{
+    wxHtmlCell* const firstChild = GetFirstChild();
+    if ( cell == firstChild )
+    {
+        m_Cells = cell->GetNext();
+        if ( m_LastCell == cell )
+            m_LastCell = NULL;
+    }
+    else // Not the first child.
+    {
+        for ( wxHtmlCell* prev = firstChild;; )
+        {
+            wxHtmlCell* const next = prev->GetNext();
+
+            // We can't reach the end of the children list without finding this
+            // cell, normally.
+            wxCHECK_RET( next,  "Detaching cell which is not our child" );
+
+            if ( cell == next )
+            {
+                prev->SetNext(cell->GetNext());
+                if ( m_LastCell == cell )
+                    m_LastCell = prev;
+                break;
+            }
+
+            prev = next;
+        }
+    }
+
+    cell->SetParent(NULL);
+    cell->SetNext(NULL);
+}
+
+
+
 void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
 {
     wxString alg;
diff --git a/tests/html/htmlparser.cpp b/tests/html/htmlparser.cpp
index 4577b5baf0..61042a4616 100644
--- a/tests/html/htmlparser.cpp
+++ b/tests/html/htmlparser.cpp
@@ -46,4 +46,64 @@ TEST_CASE("wxHtmlParser::ParseInvalid", "[html][parser][error]")
     p.Parse("<!---");
 }
 
+TEST_CASE("wxHtmlCell::Detach", "[html][cell]")
+{
+    wxMemoryDC dc;
+
+    wxHtmlContainerCell* const top = new wxHtmlContainerCell(NULL);
+    wxHtmlContainerCell* const cont = new wxHtmlContainerCell(NULL);
+    wxHtmlCell* const cell1 = new wxHtmlWordCell("Hello", dc);
+    wxHtmlCell* const cell2 = new wxHtmlColourCell(*wxRED);
+    wxHtmlCell* const cell3 = new wxHtmlWordCell("world", dc);
+
+    cont->InsertCell(cell1);
+    cont->InsertCell(cell2);
+    cont->InsertCell(cell3);
+    top->InsertCell(cont);
+
+    SECTION("container")
+    {
+        top->Detach(cont);
+        CHECK( top->GetFirstChild() == NULL );
+
+        delete cont;
+    }
+
+    SECTION("first-child")
+    {
+        cont->Detach(cell1);
+        CHECK( cont->GetFirstChild() == cell2 );
+
+        delete cell1;
+    }
+
+    SECTION("middle-child")
+    {
+        cont->Detach(cell2);
+        CHECK( cont->GetFirstChild() == cell1 );
+        CHECK( cell1->GetNext() == cell3 );
+
+        delete cell2;
+    }
+
+    SECTION("last-child")
+    {
+        cont->Detach(cell3);
+        CHECK( cont->GetFirstChild() == cell1 );
+        CHECK( cell1->GetNext() == cell2 );
+        CHECK( cell2->GetNext() == NULL );
+
+        delete cell3;
+    }
+
+    SECTION("invalid")
+    {
+        WX_ASSERT_FAILS_WITH_ASSERT_MESSAGE
+        (
+            "Expected assertion for detaching non-child",
+            top->Detach(cell1);
+        );
+    }
+}
+
 #endif //wxUSE_HTML

From d09a7180e7b1d50b059e0506120085c4524d187c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 21:19:33 +0200
Subject: [PATCH 900/916] Make wxHtmlContainerCell ctor explicit

No real changes, just make it more difficult to misuse it accidentally.
---
 include/wx/html/htmlcell.h   | 2 +-
 interface/wx/html/htmlcell.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 2c99923b80..083ebd8e63 100644
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -445,7 +445,7 @@ protected:
 class WXDLLIMPEXP_HTML wxHtmlContainerCell : public wxHtmlCell
 {
 public:
-    wxHtmlContainerCell(wxHtmlContainerCell *parent);
+    explicit wxHtmlContainerCell(wxHtmlContainerCell *parent);
     virtual ~wxHtmlContainerCell();
 
     virtual void Layout(int w) wxOVERRIDE;
diff --git a/interface/wx/html/htmlcell.h b/interface/wx/html/htmlcell.h
index fe17b29ddd..2f64f36556 100644
--- a/interface/wx/html/htmlcell.h
+++ b/interface/wx/html/htmlcell.h
@@ -471,7 +471,7 @@ public:
     /**
         Constructor. @a parent is pointer to parent container or @NULL.
     */
-    wxHtmlContainerCell(wxHtmlContainerCell* parent);
+    explicit wxHtmlContainerCell(wxHtmlContainerCell* parent);
 
     /**
         Detach a child cell.

From de33f6715d89f13b66fb536ebfe01d8296e3e0fd Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 22:28:43 +0200
Subject: [PATCH 901/916] Fix behaviour of menu items for wxTR_NO_LINES in the
 sample

It was getting wrongly updated because the menu item corresponded to the
absence of the style rather than its presence.

Fix this by inverting the menu item meaning, even if it's not very
natural, it should be good enough for the sample and preferable to
complicating its code.
---
 samples/treectrl/treetest.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index b8256ef1e6..18a5c2797a 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -240,7 +240,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     style_menu->AppendCheckItem(TreeTest_TogTwist, wxT("Toggle &twister buttons"));
     style_menu->AppendCheckItem(TreeTest_ToggleButtons, wxT("Toggle image &buttons"));
     style_menu->AppendSeparator();
-    style_menu->AppendCheckItem(TreeTest_TogLines, wxT("Toggle &connecting lines"));
+    style_menu->AppendCheckItem(TreeTest_TogLines, wxT("Toggle &no lines"));
     style_menu->AppendCheckItem(TreeTest_TogRootLines, wxT("Toggle &lines at root"));
     style_menu->AppendCheckItem(TreeTest_TogHideRoot, wxT("Toggle &hidden root"));
     style_menu->AppendCheckItem(TreeTest_TogBorder, wxT("Toggle &item border"));
@@ -387,7 +387,7 @@ void MyFrame::CreateTreeWithDefStyle()
     wxMenuBar *mbar = GetMenuBar();
     mbar->Check(TreeTest_TogButtons, (style & wxTR_HAS_BUTTONS) != 0);
     mbar->Check(TreeTest_TogButtons, (style & wxTR_TWIST_BUTTONS) != 0);
-    mbar->Check(TreeTest_TogLines, (style & wxTR_NO_LINES) == 0);
+    mbar->Check(TreeTest_TogLines, (style & wxTR_NO_LINES) != 0);
     mbar->Check(TreeTest_TogRootLines, (style & wxTR_LINES_AT_ROOT) != 0);
     mbar->Check(TreeTest_TogHideRoot, (style & wxTR_HIDE_ROOT) != 0);
     mbar->Check(TreeTest_TogEdit, (style & wxTR_EDIT_LABELS) != 0);

From 3b75bce2453ab1d47979a0d038b5b861c6af95ad Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 22:30:46 +0200
Subject: [PATCH 902/916] Fix annoying assertion failure in the treectrl sample

Don't pass invalid item to wxTreeCtrl::SelectItem(), just don't select
anything if there is no current item.
---
 samples/treectrl/treetest.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 18a5c2797a..5ae5061252 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -594,7 +594,9 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSelect(wxCommandEvent& WXUNUSED(event))
 {
-    m_treeCtrl->SelectItem(m_treeCtrl->GetFocusedItem());
+    const wxTreeItemId focus = m_treeCtrl->GetFocusedItem();
+    if ( focus.IsOk() )
+        m_treeCtrl->SelectItem(focus);
 }
 
 void MyFrame::OnSelectRoot(wxCommandEvent& WXUNUSED(event))

From f9f82714db4cb3b40d89877862724836daa1a3fa Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Aug 2018 22:33:57 +0200
Subject: [PATCH 903/916] Document wxTR_LINES_AT_ROOT peculiar behaviour under
 MSW

Without this style, expander button is not shown for the tree item
neither by the native control, so recommend always using it.

Closes #18201.
---
 interface/wx/treectrl.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/interface/wx/treectrl.h b/interface/wx/treectrl.h
index f737d20d3c..329ad6fe7a 100644
--- a/interface/wx/treectrl.h
+++ b/interface/wx/treectrl.h
@@ -42,8 +42,11 @@
         flag is ignored under Windows unless you specify @c wxTR_NO_LINES as
         well.)
     @style{wxTR_LINES_AT_ROOT}
-        Use this style to show lines between root nodes. Only applicable if @c
-        wxTR_HIDE_ROOT is set and @c wxTR_NO_LINES is not set.
+        Use this style to show lines leading to the root nodes (unless no
+        @c wxTR_NO_LINES is also used, in which case no lines are shown). Note
+        that in the MSW version, if this style is omitted, not only the lines,
+        but also the button used for expanding the root item is not shown,
+        which can be unexpected, so it is recommended to always use it.
     @style{wxTR_HIDE_ROOT}
         Use this style to suppress the display of the root node, effectively
         causing the first-level nodes to appear as a series of root nodes.

From f6bec4f2ee88e54f1bf24950fde6dc0a53d640a8 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 26 Aug 2018 11:33:29 +0200
Subject: [PATCH 904/916] Using more precise ignore statements for Xcode

---
 .gitignore | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9486205356..a29d88961b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,8 +70,11 @@
 /build/msw/.vs/
 
 # /build/osx
-/build/osx/wxcocoa.xcodeproj/xcuserdata
-/build/osx/wxiphone.xcodeproj/xcuserdata
+**/*.xcodeproj/*
+!**/*.xcodeproj/project.pbxproj
+!**/*.xcodeproj/xcshareddata/
+!**/*.xcworkspace/contents.xcworkspacedata
+/build/osx/build
 /build/osx/setup/cocoa/include/wx/setup.h
 /build/osx/setup/iphone/include/wx/setup.h
 

From cfab2206da1885f1b6b364408c68076600951dfd Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 26 Aug 2018 16:52:40 +0200
Subject: [PATCH 905/916] Supporting deeper nesting levels of modal dialogs on
 macOS

In order to make sure a parent NSPanel cannot be activated, turn off its worksWhenModal flag while the child has its turn

see #18204
---
 src/osx/cocoa/evtloop.mm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm
index 976a973507..5c7b86c471 100644
--- a/src/osx/cocoa/evtloop.mm
+++ b/src/osx/cocoa/evtloop.mm
@@ -435,9 +435,26 @@ void wxModalEventLoop::OSXDoRun()
 #if OSX_USE_MODAL_SESSION
     if ( m_modalWindow )
     {
+        bool restoreWorksWhenModal = false;
+        wxDialog* const parentDialog = wxDynamicCast(wxGetTopLevelParent(m_modalWindow->GetParent()), wxDialog);
+        NSWindow* parentWindow = parentDialog && parentDialog->IsModal() ? parentDialog->GetWXWindow() : nil;
+        if ( parentWindow != nil )
+        {
+            if ( [parentWindow isKindOfClass:[NSPanel class]] &&  [(NSPanel*)parentWindow worksWhenModal] == YES )
+            {
+                [(NSPanel*)parentWindow setWorksWhenModal:NO];
+                restoreWorksWhenModal = true;
+            }
+        }
+ 
         BeginModalSession(m_modalWindow);
         wxCFEventLoop::OSXDoRun();
         EndModalSession();
+        
+        if ( restoreWorksWhenModal )
+        {
+            [(NSPanel*)parentWindow setWorksWhenModal:YES];
+        }
     }
     else
 #endif

From a8cc8f5ae835eeb63c88586e3b5965f4841b5ae6 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 26 Aug 2018 18:20:24 +0200
Subject: [PATCH 906/916] Adding missing header for non-precompiled headers

---
 src/osx/cocoa/evtloop.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm
index 5c7b86c471..558cbb2d4b 100644
--- a/src/osx/cocoa/evtloop.mm
+++ b/src/osx/cocoa/evtloop.mm
@@ -28,6 +28,7 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/nonownedwnd.h"
+    #include "wx/dialog.h"
 #endif // WX_PRECOMP
 
 #include "wx/log.h"

From f57285605151528afba4133e8aac3739d921bf59 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 27 Aug 2018 02:01:37 +0200
Subject: [PATCH 907/916] Fix ifacecheck utility build after array macro
 changes

Previously it was somehow possible to implicitly convert "false" to
wxMethodPtrArray (which is an array of wxMethod pointers), but this,
correctly, doesn't compile any more, so return an empty array instead.
---
 utils/ifacecheck/src/xmlparser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp
index 26b1493b05..c3db7c9411 100644
--- a/utils/ifacecheck/src/xmlparser.cpp
+++ b/utils/ifacecheck/src/xmlparser.cpp
@@ -613,7 +613,7 @@ wxMethodPtrArray wxClass::RecursiveUpwardFindMethodsNamed(const wxString& name,
             if (!parent) {
                 wxLogError("Could not find parent '%s' of class '%s'...",
                          m_parents[i], GetName());
-                return false;
+                return wxMethodPtrArray();
             }
 
             wxMethodPtrArray temp = parent->RecursiveUpwardFindMethodsNamed(name, allclasses);

From 6bd9bd18ec819119674b5b7968f97d2c8c5c5bba Mon Sep 17 00:00:00 2001
From: Blake-Eryx <Blake-Eryx@users.noreply.github.com>
Date: Mon, 27 Aug 2018 02:14:10 +0200
Subject: [PATCH 908/916] Remove wxT() and _() macros from dialogs sample

Make the code more readable by removing the unnecessary macros.

Closes https://github.com/wxWidgets/wxWidgets/pull/888
---
 samples/dialogs/dialogs.cpp | 512 ++++++++++++++++++------------------
 1 file changed, 255 insertions(+), 257 deletions(-)

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 73277ab1f3..d035991787 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -383,16 +383,16 @@ bool MyApp::OnInit()
 #endif
 
     // Create the main frame window
-    MyFrame *frame = new MyFrame(wxT("wxWidgets dialogs example"));
+    MyFrame *frame = new MyFrame("wxWidgets dialogs example");
 
     // Make a menubar
     wxMenu *menuDlg = new wxMenu;
 
-    menuDlg->Append(DIALOGS_MESSAGE_BOX, wxT("&Message box\tCtrl-M"));
-    menuDlg->Append(DIALOGS_MESSAGE_BOX_WINDOW_MODAL, wxT("Window-Modal Message box "));
-    menuDlg->Append(DIALOGS_MESSAGE_DIALOG, wxT("Message dialog\tShift-Ctrl-M"));
+    menuDlg->Append(DIALOGS_MESSAGE_BOX, "&Message box\tCtrl-M");
+    menuDlg->Append(DIALOGS_MESSAGE_BOX_WINDOW_MODAL, "Window-Modal Message box ");
+    menuDlg->Append(DIALOGS_MESSAGE_DIALOG, "Message dialog\tShift-Ctrl-M");
 #if wxUSE_RICHMSGDLG
-    menuDlg->Append(DIALOGS_RICH_MESSAGE_DIALOG, wxT("Rich message dialog"));
+    menuDlg->Append(DIALOGS_RICH_MESSAGE_DIALOG, "Rich message dialog");
 #endif // wxUSE_RICHMSGDLG
 
 
@@ -402,23 +402,23 @@ bool MyApp::OnInit()
 
     #if wxUSE_COLOURDLG
         wxMenu *choices_bg_colour = new wxMenu;
-        choices_bg_colour->Append(DIALOGS_CHOOSE_COLOUR, wxT("&No opacity"));
-        choices_bg_colour->Append(DIALOGS_CHOOSE_COLOUR_ALPHA, wxT("&With opacity"));
-        choices_menu->Append(wxID_ANY, wxT("&Choose bg colour"), choices_bg_colour);
-        choices_menu->Append(DIALOGS_GET_COLOUR, wxT("&Choose fg colour"));
+        choices_bg_colour->Append(DIALOGS_CHOOSE_COLOUR, "&No opacity");
+        choices_bg_colour->Append(DIALOGS_CHOOSE_COLOUR_ALPHA, "&With opacity");
+        choices_menu->Append(wxID_ANY, "&Choose bg colour", choices_bg_colour);
+        choices_menu->Append(DIALOGS_GET_COLOUR, "&Choose fg colour");
     #endif // wxUSE_COLOURDLG
 
     #if wxUSE_FONTDLG
-        choices_menu->Append(DIALOGS_CHOOSE_FONT, wxT("Choose &font"));
+        choices_menu->Append(DIALOGS_CHOOSE_FONT, "Choose &font");
     #endif // wxUSE_FONTDLG
 
     #if wxUSE_CHOICEDLG
-        choices_menu->Append(DIALOGS_SINGLE_CHOICE,  wxT("&Single choice\tCtrl-C"));
-        choices_menu->Append(DIALOGS_MULTI_CHOICE,  wxT("M&ultiple choice\tCtrl-U"));
+        choices_menu->Append(DIALOGS_SINGLE_CHOICE,  "&Single choice\tCtrl-C");
+        choices_menu->Append(DIALOGS_MULTI_CHOICE,  "M&ultiple choice\tCtrl-U");
     #endif // wxUSE_CHOICEDLG
 
     #if wxUSE_REARRANGECTRL
-        choices_menu->Append(DIALOGS_REARRANGE,  wxT("&Rearrange dialog\tCtrl-R"));
+        choices_menu->Append(DIALOGS_REARRANGE,  "&Rearrange dialog\tCtrl-R");
     #endif // wxUSE_REARRANGECTRL
 
     #if wxUSE_ADDREMOVECTRL
@@ -431,16 +431,16 @@ bool MyApp::OnInit()
 
     #if USE_COLOURDLG_GENERIC
         wxMenu *colourGeneric_menu = new wxMenu;
-        colourGeneric_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, wxT("&No opacity"));
-        colourGeneric_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC_ALPHA, wxT("&With opacity"));
-        choices_menu->Append(wxID_ANY, wxT("&Choose colour (generic)"), colourGeneric_menu);
+        colourGeneric_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, "&No opacity");
+        colourGeneric_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC_ALPHA, "&With opacity");
+        choices_menu->Append(wxID_ANY, "&Choose colour (generic)", colourGeneric_menu);
     #endif // USE_COLOURDLG_GENERIC
 
     #if USE_FONTDLG_GENERIC
-        choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, wxT("Choose &font (generic)"));
+        choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, "Choose &font (generic)");
     #endif // USE_FONTDLG_GENERIC
 
-    menuDlg->Append(wxID_ANY,wxT("&Choices and selectors"),choices_menu);
+    menuDlg->Append(wxID_ANY,"&Choices and selectors",choices_menu);
 #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG
 
 
@@ -449,16 +449,16 @@ bool MyApp::OnInit()
     wxMenu *entry_menu = new wxMenu;
 
     #if wxUSE_TEXTDLG
-        entry_menu->Append(DIALOGS_LINE_ENTRY,  wxT("Single line &entry\tCtrl-E"));
-        entry_menu->Append(DIALOGS_TEXT_ENTRY,  wxT("Multi line text &entry\tShift-Ctrl-E"));
-        entry_menu->Append(DIALOGS_PASSWORD_ENTRY,  wxT("&Password entry\tCtrl-P"));
+        entry_menu->Append(DIALOGS_LINE_ENTRY,  "Single line &entry\tCtrl-E");
+        entry_menu->Append(DIALOGS_TEXT_ENTRY,  "Multi line text &entry\tShift-Ctrl-E");
+        entry_menu->Append(DIALOGS_PASSWORD_ENTRY,  "&Password entry\tCtrl-P");
     #endif // wxUSE_TEXTDLG
 
     #if wxUSE_NUMBERDLG
-        entry_menu->Append(DIALOGS_NUM_ENTRY, wxT("&Numeric entry\tCtrl-N"));
+        entry_menu->Append(DIALOGS_NUM_ENTRY, "&Numeric entry\tCtrl-N");
     #endif // wxUSE_NUMBERDLG
 
-    menuDlg->Append(wxID_ANY,wxT("&Entry dialogs"),entry_menu);
+    menuDlg->Append(wxID_ANY,"&Entry dialogs",entry_menu);
 
 #endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG
 
@@ -466,32 +466,32 @@ bool MyApp::OnInit()
 #if wxUSE_FILEDLG
 
     wxMenu *filedlg_menu = new wxMenu;
-    filedlg_menu->Append(DIALOGS_FILE_OPEN,  wxT("&Open file\tCtrl-O"));
-    filedlg_menu->Append(DIALOGS_FILE_OPEN2,  wxT("&Second open file\tCtrl-2"));
-    filedlg_menu->Append(DIALOGS_FILES_OPEN,  wxT("Open &files\tShift-Ctrl-O"));
-    filedlg_menu->Append(DIALOGS_FILE_SAVE,  wxT("Sa&ve file\tCtrl-S"));
+    filedlg_menu->Append(DIALOGS_FILE_OPEN,  "&Open file\tCtrl-O");
+    filedlg_menu->Append(DIALOGS_FILE_OPEN2,  "&Second open file\tCtrl-2");
+    filedlg_menu->Append(DIALOGS_FILES_OPEN,  "Open &files\tShift-Ctrl-O");
+    filedlg_menu->Append(DIALOGS_FILE_SAVE,  "Sa&ve file\tCtrl-S");
 
 #if USE_FILEDLG_GENERIC
     filedlg_menu->AppendSeparator();
-    filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC, wxT("&Open file (generic)"));
-    filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, wxT("Open &files (generic)"));
-    filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, wxT("Sa&ve file (generic)"));
+    filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC, "&Open file (generic)");
+    filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, "Open &files (generic)");
+    filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, "Sa&ve file (generic)");
 #endif // USE_FILEDLG_GENERIC
 
-    menuDlg->Append(wxID_ANY,wxT("&File operations"),filedlg_menu);
+    menuDlg->Append(wxID_ANY,"&File operations",filedlg_menu);
 
 #endif // wxUSE_FILEDLG
 
 #if wxUSE_DIRDLG
     wxMenu *dir_menu = new wxMenu;
 
-    dir_menu->Append(DIALOGS_DIR_CHOOSE,  wxT("&Choose a directory\tCtrl-D"));
-    dir_menu->Append(DIALOGS_DIRNEW_CHOOSE,  wxT("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D"));
-    menuDlg->Append(wxID_ANY,wxT("&Directory operations"),dir_menu);
+    dir_menu->Append(DIALOGS_DIR_CHOOSE,  "&Choose a directory\tCtrl-D");
+    dir_menu->Append(DIALOGS_DIRNEW_CHOOSE,  "Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D");
+    menuDlg->Append(wxID_ANY,"&Directory operations",dir_menu);
 
     #if USE_DIRDLG_GENERIC
         dir_menu->AppendSeparator();
-        dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  wxT("&Choose a directory (generic)"));
+        dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  "&Choose a directory (generic)");
     #endif // USE_DIRDLG_GENERIC
 
 #endif // wxUSE_DIRDLG
@@ -506,26 +506,26 @@ bool MyApp::OnInit()
     wxMenu *info_menu = new wxMenu;
 
     #if wxUSE_STARTUP_TIPS
-        info_menu->Append(DIALOGS_TIP,  wxT("&Tip of the day\tCtrl-T"));
+        info_menu->Append(DIALOGS_TIP,  "&Tip of the day\tCtrl-T");
     #endif // wxUSE_STARTUP_TIPS
 
     #if wxUSE_PROGRESSDLG
-        info_menu->Append(DIALOGS_PROGRESS, wxT("Pro&gress dialog\tCtrl-G"));
+        info_menu->Append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G");
         #ifdef wxHAS_NATIVE_PROGRESSDIALOG
             info_menu->Append(DIALOGS_PROGRESS_GENERIC,
-                              wxT("Generic progress dialog\tCtrl-Alt-G"));
+                              "Generic progress dialog\tCtrl-Alt-G");
         #endif // wxHAS_NATIVE_PROGRESSDIALOG
     #endif // wxUSE_PROGRESSDLG
 
-        info_menu->Append(DIALOGS_APP_PROGRESS, wxT("&App progress\tShift-Ctrl-G"));
+        info_menu->Append(DIALOGS_APP_PROGRESS, "&App progress\tShift-Ctrl-G");
 
     #if wxUSE_BUSYINFO
-       info_menu->Append(DIALOGS_BUSYINFO, wxT("&Busy info dialog\tCtrl-B"));
-       info_menu->Append(DIALOGS_BUSYINFO_RICH, wxT("&Rich busy info dialog\tShift-Ctrl-B"));
+       info_menu->Append(DIALOGS_BUSYINFO, "&Busy info dialog\tCtrl-B");
+       info_menu->Append(DIALOGS_BUSYINFO_RICH, "&Rich busy info dialog\tShift-Ctrl-B");
     #endif // wxUSE_BUSYINFO
 
     #if wxUSE_LOG_DIALOG
-       info_menu->Append(DIALOGS_LOG_DIALOG, wxT("&Log dialog\tCtrl-L"));
+       info_menu->Append(DIALOGS_LOG_DIALOG, "&Log dialog\tCtrl-L");
     #endif // wxUSE_LOG_DIALOG
 
     #if wxUSE_INFOBAR
@@ -535,51 +535,51 @@ bool MyApp::OnInit()
 
     #if wxUSE_MSGDLG
         info_menu->Append(DIALOGS_MESSAGE_BOX_WXINFO,
-                             wxT("&wxWidgets information\tCtrl-W"));
+                             "&wxWidgets information\tCtrl-W");
     #endif // wxUSE_MSGDLG
 
-    menuDlg->Append(wxID_ANY,wxT("&Informative dialogs"),info_menu);
+    menuDlg->Append(wxID_ANY,"&Informative dialogs",info_menu);
 
 #endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG
 
 
 #if wxUSE_FINDREPLDLG
     wxMenu *find_menu = new wxMenu;
-    find_menu->AppendCheckItem(DIALOGS_FIND, wxT("&Find dialog\tCtrl-F"));
-    find_menu->AppendCheckItem(DIALOGS_REPLACE, wxT("Find and &replace dialog\tShift-Ctrl-F"));
-    menuDlg->Append(wxID_ANY,wxT("&Searching"),find_menu);
+    find_menu->AppendCheckItem(DIALOGS_FIND, "&Find dialog\tCtrl-F");
+    find_menu->AppendCheckItem(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F");
+    menuDlg->Append(wxID_ANY,"&Searching",find_menu);
 #endif // wxUSE_FINDREPLDLG
 
     wxMenu *dialogs_menu = new wxMenu;
 #if USE_MODAL_PRESENTATION
-    dialogs_menu->Append(DIALOGS_MODAL, wxT("&Modal dialog\tShift-Ctrl-W"));
+    dialogs_menu->Append(DIALOGS_MODAL, "&Modal dialog\tShift-Ctrl-W");
 #endif // USE_MODAL_PRESENTATION
-    dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, wxT("Mode&less dialog\tShift-Ctrl-Z"));
-    dialogs_menu->Append(DIALOGS_CENTRE_SCREEN, wxT("Centered on &screen\tShift-Ctrl-1"));
-    dialogs_menu->Append(DIALOGS_CENTRE_PARENT, wxT("Centered on &parent\tShift-Ctrl-2"));
+    dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, "Mode&less dialog\tShift-Ctrl-Z");
+    dialogs_menu->Append(DIALOGS_CENTRE_SCREEN, "Centered on &screen\tShift-Ctrl-1");
+    dialogs_menu->Append(DIALOGS_CENTRE_PARENT, "Centered on &parent\tShift-Ctrl-2");
 #if wxUSE_MINIFRAME
-    dialogs_menu->Append(DIALOGS_MINIFRAME, wxT("&Mini frame"));
+    dialogs_menu->Append(DIALOGS_MINIFRAME, "&Mini frame");
 #endif // wxUSE_MINIFRAME
-    dialogs_menu->Append(DIALOGS_ONTOP, wxT("Dialog staying on &top"));
-    menuDlg->Append(wxID_ANY, wxT("&Generic dialogs"), dialogs_menu);
+    dialogs_menu->Append(DIALOGS_ONTOP, "Dialog staying on &top");
+    menuDlg->Append(wxID_ANY, "&Generic dialogs", dialogs_menu);
 
 #if USE_SETTINGS_DIALOG
     wxMenu *sheet_menu = new wxMenu;
-    sheet_menu->Append(DIALOGS_PROPERTY_SHEET, wxT("&Standard property sheet\tShift-Ctrl-P"));
-    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, wxT("&Toolbook sheet\tShift-Ctrl-T"));
+    sheet_menu->Append(DIALOGS_PROPERTY_SHEET, "&Standard property sheet\tShift-Ctrl-P");
+    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, "&Toolbook sheet\tShift-Ctrl-T");
 
     if (wxPlatformIs(wxPORT_MAC))
-        sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, wxT("Button &Toolbook sheet\tShift-Ctrl-U"));
+        sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, "Button &Toolbook sheet\tShift-Ctrl-U");
 /*
 #ifdef __WXMAC__
-    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, wxT("Button &Toolbook sheet\tShift-Ctrl-U"));
+    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, "Button &Toolbook sheet\tShift-Ctrl-U");
 #endif
 */
-    menuDlg->Append(wxID_ANY, wxT("&Property sheets"), sheet_menu);
+    menuDlg->Append(wxID_ANY, "&Property sheets", sheet_menu);
 #endif // USE_SETTINGS_DIALOG
 
     wxMenu *menuNotif = new wxMenu;
-    menuNotif->Append(DIALOGS_REQUEST, wxT("&Request user attention\tCtrl-Shift-R"));
+    menuNotif->Append(DIALOGS_REQUEST, "&Request user attention\tCtrl-Shift-R");
 #if wxUSE_NOTIFICATION_MESSAGE
     menuNotif->AppendSeparator();
     menuNotif->Append(DIALOGS_NOTIFY_MSG, "User &Notification\tCtrl-Shift-N");
@@ -591,40 +591,40 @@ bool MyApp::OnInit()
     menuDlg->AppendSeparator();
 #endif // wxUSE_RICHTOOLTIP
 
-    menuDlg->Append(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, wxT("&Standard Buttons Sizer Dialog"));
-    menuDlg->Append(DIALOGS_TEST_DEFAULT_ACTION, wxT("&Test dialog default action"));
+    menuDlg->Append(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, "&Standard Buttons Sizer Dialog");
+    menuDlg->Append(DIALOGS_TEST_DEFAULT_ACTION, "&Test dialog default action");
     menuDlg->AppendCheckItem(DIALOGS_MODAL_HOOK, "Enable modal dialog hook");
 
     menuDlg->AppendSeparator();
-    menuDlg->Append(wxID_EXIT, wxT("E&xit\tAlt-X"));
+    menuDlg->Append(wxID_EXIT, "E&xit\tAlt-X");
 
 #if wxUSE_ABOUTDLG
     wxMenu *menuHelp = new wxMenu;
-    menuHelp->Append(DIALOGS_ABOUTDLG_SIMPLE, wxT("&About (simple)...\tF1"));
-    menuHelp->Append(DIALOGS_ABOUTDLG_FANCY, wxT("About (&fancy)...\tShift-F1"));
-    menuHelp->Append(DIALOGS_ABOUTDLG_FULL, wxT("About (f&ull)...\tCtrl-F1"));
-    menuHelp->Append(DIALOGS_ABOUTDLG_CUSTOM, wxT("About (&custom)...\tCtrl-Shift-F1"));
+    menuHelp->Append(DIALOGS_ABOUTDLG_SIMPLE, "&About (simple)...\tF1");
+    menuHelp->Append(DIALOGS_ABOUTDLG_FANCY, "About (&fancy)...\tShift-F1");
+    menuHelp->Append(DIALOGS_ABOUTDLG_FULL, "About (f&ull)...\tCtrl-F1");
+    menuHelp->Append(DIALOGS_ABOUTDLG_CUSTOM, "About (&custom)...\tCtrl-Shift-F1");
 #endif // wxUSE_ABOUTDLG
 
     wxMenu* editMenu = new wxMenu;
-    editMenu->Append(wxID_UNDO, _("&Undo\tCtrl+Z"));
-    editMenu->Append(wxID_REDO, _("&Redo\tCtrl+Y"));
+    editMenu->Append(wxID_UNDO, "&Undo\tCtrl+Z");
+    editMenu->Append(wxID_REDO, "&Redo\tCtrl+Y");
     editMenu->AppendSeparator();
-    editMenu->Append(wxID_CUT, _("Cu&t\tCtrl+X"));
-    editMenu->Append(wxID_COPY, _("&Copy\tCtrl+C"));
-    editMenu->Append(wxID_PASTE, _("&Paste\tCtrl+V"));
-    editMenu->Append(wxID_CLEAR, _("&Delete"));
+    editMenu->Append(wxID_CUT, "Cu&t\tCtrl+X");
+    editMenu->Append(wxID_COPY, "&Copy\tCtrl+C");
+    editMenu->Append(wxID_PASTE, "&Paste\tCtrl+V");
+    editMenu->Append(wxID_CLEAR, "&Delete");
     
     editMenu->AppendSeparator();
-    editMenu->Append(wxID_SELECTALL, _("Select All\tCtrl+A"));
+    editMenu->Append(wxID_SELECTALL, "Select All\tCtrl+A");
 
     wxMenuBar *menubar = new wxMenuBar;
-    menubar->Append(menuDlg, wxT("&Dialogs"));
+    menubar->Append(menuDlg, "&Dialogs");
     
-    menubar->Append(editMenu, wxT("&Edit"));
+    menubar->Append(editMenu, "&Edit");
     
 #if wxUSE_ABOUTDLG
-    menubar->Append(menuHelp, wxT("&Help"));
+    menubar->Append(menuHelp, "&Help");
 #endif // wxUSE_ABOUTDLG
 
     frame->SetMenuBar(menubar);
@@ -740,7 +740,7 @@ void MyFrame::ChooseColour(wxCommandEvent& event)
     m_clrData.SetChooseAlpha(event.GetId() == DIALOGS_CHOOSE_COLOUR_ALPHA);
 
     wxColourDialog dialog(this, &m_clrData);
-    dialog.SetTitle(_("Please choose the background colour"));
+    dialog.SetTitle("Please choose the background colour");
     if ( dialog.ShowModal() == wxID_OK )
     {
         m_clrData = dialog.GetColourData();
@@ -847,20 +847,20 @@ void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))
     // being flushed -- test it
     {
         wxBusyCursor bc;
-        wxLogMessage(wxT("This is some message - everything is ok so far."));
-        wxLogMessage(wxT("Another message...\n... this one is on multiple lines"));
-        wxLogWarning(wxT("And then something went wrong!"));
+        wxLogMessage("This is some message - everything is ok so far.");
+        wxLogMessage("Another message...\n... this one is on multiple lines");
+        wxLogWarning("And then something went wrong!");
 
         // and if ~wxBusyCursor doesn't do it, then call it manually
         wxYield();
     }
 
-    wxLogError(wxT("Intermediary error handler decided to abort."));
-    wxLogError(wxT("The top level caller detected an unrecoverable error."));
+    wxLogError("Intermediary error handler decided to abort.");
+    wxLogError("The top level caller detected an unrecoverable error.");
 
     wxLog::FlushActive();
 
-    wxLogMessage(wxT("And this is the same dialog but with only one message."));
+    wxLogMessage("And this is the same dialog but with only one message.");
 }
 #endif // wxUSE_LOG_DIALOG
 
@@ -921,19 +921,19 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
     switch ( dialog.ShowModal() )
     {
         case wxID_YES:
-            wxLogStatus(wxT("You pressed \"Yes\""));
+            wxLogStatus("You pressed \"Yes\"");
             break;
 
         case wxID_NO:
-            wxLogStatus(wxT("You pressed \"No\""));
+            wxLogStatus("You pressed \"No\"");
             break;
 
         case wxID_CANCEL:
-            wxLogStatus(wxT("You pressed \"Cancel\""));
+            wxLogStatus("You pressed \"Cancel\"");
             break;
 
         default:
-            wxLogError(wxT("Unexpected wxMessageDialog return code!"));
+            wxLogError("Unexpected wxMessageDialog return code!");
     }
 }
 
@@ -976,19 +976,19 @@ void MyFrame::MessageBoxWindowModalClosed(wxWindowModalDialogEvent& event)
     switch ( dialog->GetReturnCode() )
     {
         case wxID_YES:
-            wxLogStatus(wxT("You pressed \"Yes\""));
+            wxLogStatus("You pressed \"Yes\"");
             break;
 
         case wxID_NO:
-            wxLogStatus(wxT("You pressed \"No\""));
+            wxLogStatus("You pressed \"No\"");
             break;
 
         case wxID_CANCEL:
-            wxLogStatus(wxT("You pressed \"Cancel\""));
+            wxLogStatus("You pressed \"Cancel\"");
             break;
 
         default:
-            wxLogError(wxT("Unexpected wxMessageDialog return code!"));
+            wxLogError("Unexpected wxMessageDialog return code!");
     }
     delete dialog;
 }
@@ -1018,54 +1018,54 @@ void MyFrame::RichMessageDialog(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_NUMBERDLG
 void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event))
 {
-    long res = wxGetNumberFromUser( wxT("This is some text, actually a lot of text.\n")
-                                    wxT("Even two rows of text."),
-                                    wxT("Enter a number:"), wxT("Numeric input test"),
+    long res = wxGetNumberFromUser( "This is some text, actually a lot of text.\n"
+                                    "Even two rows of text.",
+                                    "Enter a number:", "Numeric input test",
                                      50, 0, 100, this );
 
     wxString msg;
     int icon;
     if ( res == -1 )
     {
-        msg = wxT("Invalid number entered or dialog cancelled.");
+        msg = "Invalid number entered or dialog cancelled.";
         icon = wxICON_HAND;
     }
     else
     {
-        msg.Printf(wxT("You've entered %lu"), res );
+        msg.Printf("You've entered %lu", res );
         icon = wxICON_INFORMATION;
     }
 
-    wxMessageBox(msg, wxT("Numeric test result"), wxOK | icon, this);
+    wxMessageBox(msg, "Numeric test result", wxOK | icon, this);
 }
 #endif // wxUSE_NUMBERDLG
 
 #if wxUSE_TEXTDLG
 void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event))
 {
-    wxString pwd = wxGetPasswordFromUser(wxT("Enter password:"),
-                                         wxT("Password entry dialog"),
+    wxString pwd = wxGetPasswordFromUser("Enter password:",
+                                         "Password entry dialog",
                                          wxEmptyString,
                                          this);
     if ( !pwd.empty() )
     {
-        wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()),
-                     wxT("Got password"), wxOK | wxICON_INFORMATION, this);
+        wxMessageBox(wxString::Format("Your password is '%s'", pwd.c_str()),
+                     "Got password", wxOK | wxICON_INFORMATION, this);
     }
 }
 
 void MyFrame::LineEntry(wxCommandEvent& WXUNUSED(event))
 {
     wxTextEntryDialog dialog(this,
-                             wxT("This is a small sample\n")
-                             wxT("A long, long string to test out the text entrybox"),
-                             wxT("Please enter a string"),
-                             wxT("Default value"),
+                             "This is a small sample\n"
+                             "A long, long string to test out the text entrybox",
+                             "Please enter a string",
+                             "Default value",
                              wxOK | wxCANCEL);
 
     if (dialog.ShowModal() == wxID_OK)
     {
-        wxMessageBox(dialog.GetValue(), wxT("Got string"), wxOK | wxICON_INFORMATION, this);
+        wxMessageBox(dialog.GetValue(), "Got string", wxOK | wxICON_INFORMATION, this);
     }
 }
 
@@ -1078,7 +1078,7 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
 
     if (dialog.ShowModal() == wxID_OK)
     {
-        wxMessageBox(dialog.GetValue(), wxT("Got text"), wxOK | wxICON_INFORMATION, this);
+        wxMessageBox(dialog.GetValue(), "Got text", wxOK | wxICON_INFORMATION, this);
     }
 }
 #endif // wxUSE_TEXTDLG
@@ -1086,19 +1086,19 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_CHOICEDLG
 void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
 {
-    const wxString choices[] = { wxT("One"), wxT("Two"), wxT("Three"), wxT("Four"), wxT("Five") } ;
+    const wxString choices[] = { "One", "Two", "Three", "Four", "Five" } ;
 
     wxSingleChoiceDialog dialog(this,
-                                wxT("This is a small sample\n")
-                                wxT("A single-choice convenience dialog"),
-                                wxT("Please select a value"),
+                                "This is a small sample\n"
+                                "A single-choice convenience dialog",
+                                "Please select a value",
                                 WXSIZEOF(choices), choices);
 
     dialog.SetSelection(2);
 
     if (dialog.ShowModal() == wxID_OK)
     {
-        wxMessageDialog dialog2(this, dialog.GetStringSelection(), wxT("Got string"));
+        wxMessageDialog dialog2(this, dialog.GetStringSelection(), "Got string");
         dialog2.ShowModal();
     }
 }
@@ -1107,16 +1107,16 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
 {
     const wxString choices[] =
     {
-        wxT("One"), wxT("Two"), wxT("Three"), wxT("Four"), wxT("Five"),
-        wxT("Six"), wxT("Seven"), wxT("Eight"), wxT("Nine"), wxT("Ten"),
-        wxT("Eleven"), wxT("Twelve"), wxT("Seventeen"),
+        "One", "Two", "Three", "Four", "Five",
+        "Six", "Seven", "Eight", "Nine", "Ten",
+        "Eleven", "Twelve", "Seventeen",
     };
 
     wxArrayInt selections;
     const int count = wxGetSelectedChoices(selections,
-                                        wxT("This is a small sample\n")
-                                        wxT("A multi-choice convenience dialog"),
-                                        wxT("Please select a value"),
+                                        "This is a small sample\n"
+                                        "A multi-choice convenience dialog",
+                                        "Please select a value",
                                         WXSIZEOF(choices), choices,
                                         this);
     if ( count >= 0 )
@@ -1124,14 +1124,14 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
         wxString msg;
         if ( count == 0 )
         {
-            msg = wxT("You did not select any items");
+            msg = "You did not select any items";
         }
         else
         {
-            msg.Printf(wxT("You selected %u items:\n"), (unsigned)count);
+            msg.Printf("You selected %u items:\n", (unsigned)count);
             for ( int n = 0; n < count; n++ )
             {
-                msg += wxString::Format(wxT("\t%u: %u (%s)\n"),
+                msg += wxString::Format("\t%u: %u (%s)\n",
                                         (unsigned)n, (unsigned)selections[n],
                                         choices[selections[n]].c_str());
             }
@@ -1510,9 +1510,9 @@ MyExtraPanel::MyExtraPanel(wxWindow *parent)
               m_str("extra text"),
               m_checked(false)
 {
-    m_btn = new wxButton(this, -1, wxT("Custom Button"));
+    m_btn = new wxButton(this, -1, "Custom Button");
     m_btn->Enable(false);
-    m_cb = new wxCheckBox(this, -1, wxT("Enable Custom Button"));
+    m_cb = new wxCheckBox(this, -1, "Enable Custom Button");
     m_cb->Bind(wxEVT_CHECKBOX, &MyExtraPanel::OnCheckBox, this);
     m_label = new wxStaticText(this, wxID_ANY, "Nothing selected");
     m_label->Bind(wxEVT_UPDATE_UI, &MyExtraPanel::OnUpdateLabelUI, this);
@@ -1546,13 +1546,13 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
     wxFileDialog dialog
                  (
                     this,
-                    wxT("Testing open file dialog"),
+                    "Testing open file dialog",
                     wxEmptyString,
                     wxEmptyString,
 #ifdef __WXMOTIF__
-                    wxT("C++ files (*.cpp)|*.cpp")
+                    "C++ files (*.cpp)|*.cpp"
 #else
-                    wxT("C++ files (*.cpp;*.h)|*.cpp;*.h")
+                    "C++ files (*.cpp;*.h)|*.cpp;*.h"
 #endif
                  );
 
@@ -1564,16 +1564,16 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
     {
         wxString info;
         wxWindow * const extra = dialog.GetExtraControl();
-        info.Printf(wxT("Full file name: %s\n")
-                    wxT("Path: %s\n")
-                    wxT("Name: %s\n")
-                    wxT("Custom window: %s"),
+        info.Printf("Full file name: %s\n"
+                    "Path: %s\n"
+                    "Name: %s\n"
+                    "Custom window: %s",
                     dialog.GetPath().c_str(),
                     dialog.GetDirectory().c_str(),
                     dialog.GetFilename().c_str(),
                     extra ? static_cast<MyExtraPanel*>(extra)->GetInfo()
                           : wxString("None"));
-        wxMessageDialog dialog2(this, info, wxT("Selected file"));
+        wxMessageDialog dialog2(this, info, "Selected file");
         dialog2.ShowModal();
     }
 }
@@ -1585,12 +1585,12 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
 {
     static wxString s_extDef;
     wxString path = wxFileSelector(
-                                    wxT("Select the file to load"),
+                                    "Select the file to load",
                                     wxEmptyString, wxEmptyString,
                                     s_extDef,
                                     wxString::Format
                                     (
-                                        wxT("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (%s)|%s"),
+                                        "Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (%s)|%s",
                                         wxFileSelectorDefaultWildcardStr,
                                         wxFileSelectorDefaultWildcardStr
                                     ),
@@ -1602,9 +1602,9 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
         return;
 
     // it is just a sample, would use wxSplitPath in real program
-    s_extDef = path.AfterLast(wxT('.'));
+    s_extDef = path.AfterLast('.');
 
-    wxLogMessage(wxT("You selected the file '%s', remembered extension '%s'"),
+    wxLogMessage("You selected the file '%s', remembered extension '%s'",
                  path, s_extDef);
 }
 
@@ -1612,16 +1612,16 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 {
     wxString wildcards =
 #ifdef __WXMOTIF__
-                    wxT("C++ files (*.cpp)|*.cpp");
+                    "C++ files (*.cpp)|*.cpp";
 #else
                     wxString::Format
                     (
-                        wxT("All files (%s)|%s|C++ files (*.cpp;*.h)|*.cpp;*.h"),
+                        "All files (%s)|%s|C++ files (*.cpp;*.h)|*.cpp;*.h",
                         wxFileSelectorDefaultWildcardStr,
                         wxFileSelectorDefaultWildcardStr
                     );
 #endif
-    wxFileDialog dialog(this, wxT("Testing open multiple file dialog"),
+    wxFileDialog dialog(this, "Testing open multiple file dialog",
                         wxEmptyString, wxEmptyString, wildcards,
                         wxFD_OPEN|wxFD_MULTIPLE);
 
@@ -1636,15 +1636,15 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
         size_t count = paths.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
-            s.Printf(wxT("File %d: %s (%s)\n"),
+            s.Printf("File %d: %s (%s)\n",
                      (int)n, paths[n].c_str(), filenames[n].c_str());
 
             msg += s;
         }
-        s.Printf(wxT("Filter index: %d"), dialog.GetFilterIndex());
+        s.Printf("Filter index: %d", dialog.GetFilterIndex());
         msg += s;
 
-        wxMessageDialog dialog2(this, msg, wxT("Selected files"));
+        wxMessageDialog dialog2(this, msg, "Selected files");
         dialog2.ShowModal();
     }
 }
@@ -1652,17 +1652,17 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
 {
     wxFileDialog dialog(this,
-                        wxT("Testing save file dialog"),
+                        "Testing save file dialog",
                         wxEmptyString,
-                        wxT("myletter.doc"),
-                        wxT("Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods"),
+                        "myletter.doc",
+                        "Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods",
                         wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
 
     dialog.SetFilterIndex(1);
 
     if (dialog.ShowModal() == wxID_OK)
     {
-        wxLogMessage(wxT("%s, filter %d"),
+        wxLogMessage("%s, filter %d",
                      dialog.GetPath().c_str(), dialog.GetFilterIndex());
     }
 }
@@ -1674,10 +1674,10 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
     wxGenericFileDialog dialog
                  (
                     this,
-                    wxT("Testing open file dialog"),
+                    "Testing open file dialog",
                     wxEmptyString,
                     wxEmptyString,
-                    wxT("C++ files (*.cpp;*.h)|*.cpp;*.h")
+                    "C++ files (*.cpp;*.h)|*.cpp;*.h"
                  );
 
     dialog.SetExtraControlCreator(&createMyExtraPanel);
@@ -1686,21 +1686,21 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString info;
-        info.Printf(wxT("Full file name: %s\n")
-                    wxT("Path: %s\n")
-                    wxT("Name: %s"),
+        info.Printf("Full file name: %s\n"
+                    "Path: %s\n"
+                    "Name: %s",
                     dialog.GetPath().c_str(),
                     dialog.GetDirectory().c_str(),
                     dialog.GetFilename().c_str());
-        wxMessageDialog dialog2(this, info, wxT("Selected file"));
+        wxMessageDialog dialog2(this, info, "Selected file");
         dialog2.ShowModal();
     }
 }
 
 void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 {
-    wxString wildcards = wxT("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");
-    wxGenericFileDialog dialog(this, wxT("Testing open multiple file dialog"),
+    wxString wildcards = "All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h";
+    wxGenericFileDialog dialog(this, "Testing open multiple file dialog",
                         wxEmptyString, wxEmptyString, wildcards,
                         wxFD_MULTIPLE);
 
@@ -1715,15 +1715,15 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
         size_t count = paths.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
-            s.Printf(wxT("File %d: %s (%s)\n"),
+            s.Printf("File %d: %s (%s)\n",
                      (int)n, paths[n].c_str(), filenames[n].c_str());
 
             msg += s;
         }
-        s.Printf(wxT("Filter index: %d"), dialog.GetFilterIndex());
+        s.Printf("Filter index: %d", dialog.GetFilterIndex());
         msg += s;
 
-        wxMessageDialog dialog2(this, msg, wxT("Selected files"));
+        wxMessageDialog dialog2(this, msg, "Selected files");
         dialog2.ShowModal();
     }
 }
@@ -1731,17 +1731,17 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) )
 {
     wxGenericFileDialog dialog(this,
-                        wxT("Testing save file dialog"),
+                        "Testing save file dialog",
                         wxEmptyString,
-                        wxT("myletter.doc"),
-                        wxT("Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods"),
+                        "myletter.doc",
+                        "Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods",
                         wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
 
     dialog.SetFilterIndex(1);
 
     if (dialog.ShowModal() == wxID_OK)
     {
-        wxLogMessage(wxT("%s, filter %d"),
+        wxLogMessage("%s, filter %d",
                      dialog.GetPath().c_str(), dialog.GetFilterIndex());
     }
 }
@@ -1754,11 +1754,11 @@ void MyFrame::DoDirChoose(int style)
     wxString dirHome;
     wxGetHomeDir(&dirHome);
 
-    wxDirDialog dialog(this, wxT("Testing directory picker"), dirHome, style);
+    wxDirDialog dialog(this, "Testing directory picker", dirHome, style);
 
     if (dialog.ShowModal() == wxID_OK)
     {
-        wxLogMessage(wxT("Selected path: %s"), dialog.GetPath().c_str());
+        wxLogMessage("Selected path: %s", dialog.GetPath().c_str());
     }
 }
 
@@ -1780,11 +1780,11 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
     wxString dirHome;
     wxGetHomeDir(&dirHome);
 
-    wxGenericDirDialog dialog(this, wxT("Testing generic directory picker"), dirHome);
+    wxGenericDirDialog dialog(this, "Testing generic directory picker", dirHome);
 
     if (dialog.ShowModal() == wxID_OK)
     {
-        wxMessageDialog dialog2(this, dialog.GetPath(), wxT("Selected path"));
+        wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path");
         dialog2.ShowModal();
     }
 }
@@ -1826,18 +1826,18 @@ void MyFrame::ModelessDlg(wxCommandEvent& event)
 
 void MyFrame::DlgCenteredScreen(wxCommandEvent& WXUNUSED(event))
 {
-    wxDialog dlg(this, wxID_ANY, wxT("Dialog centered on screen"),
+    wxDialog dlg(this, wxID_ANY, "Dialog centered on screen",
                  wxDefaultPosition, wxSize(200, 100));
-    (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre();
+    (new wxButton(&dlg, wxID_OK, "Close"))->Centre();
     dlg.CentreOnScreen();
     dlg.ShowModal();
 }
 
 void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event))
 {
-    wxDialog dlg(this, wxID_ANY, wxT("Dialog centered on parent"),
+    wxDialog dlg(this, wxID_ANY, "Dialog centered on parent",
                  wxDefaultPosition, wxSize(200, 100));
-    (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre();
+    (new wxButton(&dlg, wxID_OK, "Close"))->Centre();
     dlg.CentreOnParent();
     dlg.ShowModal();
 }
@@ -1845,16 +1845,16 @@ void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_MINIFRAME
 void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event))
 {
-    wxFrame *frame = new wxMiniFrame(this, wxID_ANY, wxT("Mini frame"),
+    wxFrame *frame = new wxMiniFrame(this, wxID_ANY, "Mini frame",
                                      wxDefaultPosition, wxSize(300, 100),
                                      wxCAPTION | wxCLOSE_BOX);
     new wxStaticText(frame,
                      wxID_ANY,
-                     wxT("Mini frames have slightly different appearance"),
+                     "Mini frames have slightly different appearance",
                      wxPoint(5, 5));
     new wxStaticText(frame,
                      wxID_ANY,
-                     wxT("from the normal frames but that's the only difference."),
+                     "from the normal frames but that's the only difference.",
                      wxPoint(5, 25));
 
     frame->CentreOnParent();
@@ -1864,10 +1864,10 @@ void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::DlgOnTop(wxCommandEvent& WXUNUSED(event))
 {
-    wxDialog dlg(this, wxID_ANY, wxT("Dialog staying on top of other windows"),
+    wxDialog dlg(this, wxID_ANY, "Dialog staying on top of other windows",
                  wxDefaultPosition, wxSize(300, 100),
                  wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP);
-    (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre();
+    (new wxButton(&dlg, wxID_OK, "Close"))->Centre();
     dlg.ShowModal();
 }
 
@@ -1885,13 +1885,13 @@ void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event))
         s_index = rand() % 5;
     }
 
-    wxTipProvider *tipProvider = wxCreateFileTipProvider(wxT("tips.txt"), s_index);
+    wxTipProvider *tipProvider = wxCreateFileTipProvider("tips.txt", s_index);
 
     bool showAtStartup = wxShowTip(this, tipProvider);
 
     if ( showAtStartup )
     {
-        wxMessageBox(wxT("Will show tips on startup"), wxT("Tips dialog"),
+        wxMessageBox("Will show tips on startup", "Tips dialog",
                      wxOK | wxICON_INFORMATION, this);
     }
 
@@ -1910,7 +1910,7 @@ void MyFrame::OnPropertySheet(wxCommandEvent& event)
 
 void MyFrame::OnRequestUserAttention(wxCommandEvent& WXUNUSED(event))
 {
-    wxLogStatus(wxT("Sleeping for 3 seconds to allow you to switch to another window"));
+    wxLogStatus("Sleeping for 3 seconds to allow you to switch to another window");
 
     wxSleep(3);
 
@@ -2760,8 +2760,8 @@ void MyFrame::DoShowProgress(wxGenericProgressDialog& dialog)
 
         if ( !cont )
         {
-            if ( wxMessageBox(wxT("Do you really want to cancel?"),
-                              wxT("Progress dialog question"),  // caption
+            if ( wxMessageBox("Do you really want to cancel?",
+                              "Progress dialog question",  // caption
                               wxYES_NO | wxICON_QUESTION) == wxYES )
                 break;
 
@@ -2774,11 +2774,11 @@ void MyFrame::DoShowProgress(wxGenericProgressDialog& dialog)
 
     if ( !cont )
     {
-        wxLogStatus(wxT("Progress dialog aborted!"));
+        wxLogStatus("Progress dialog aborted!");
     }
     else
     {
-        wxLogStatus(wxT("Countdown from %d finished"), max_);
+        wxLogStatus("Countdown from %d finished", max_);
     }
 }
 
@@ -2811,7 +2811,7 @@ void MyFrame::ShowAppProgress( wxCommandEvent& WXUNUSED(event) )
 
 static void InitAboutInfoMinimal(wxAboutDialogInfo& info)
 {
-    info.SetName(wxT("Dialogs Sample"));
+    info.SetName("Dialogs Sample");
     info.SetVersion(wxVERSION_NUM_DOT_STRING,
                     wxString::Format
                     (
@@ -2819,16 +2819,16 @@ static void InitAboutInfoMinimal(wxAboutDialogInfo& info)
                         wxMINOR_VERSION % 2 ? "Development" : "Stable",
                         wxVERSION_NUM_DOT_STRING
                     ));
-    info.SetDescription(wxT("This sample shows different wxWidgets dialogs"));
-    info.SetCopyright(wxT("(C) 1998-2006 wxWidgets dev team"));
-    info.AddDeveloper(wxT("Vadim Zeitlin"));
+    info.SetDescription("This sample shows different wxWidgets dialogs");
+    info.SetCopyright("(C) 1998-2006 wxWidgets dev team");
+    info.AddDeveloper("Vadim Zeitlin");
 }
 
 static void InitAboutInfoWebsite(wxAboutDialogInfo& info)
 {
     InitAboutInfoMinimal(info);
 
-    info.SetWebSite(wxT("http://www.wxwidgets.org/"), wxT("wxWidgets web site"));
+    info.SetWebSite("http://www.wxwidgets.org/", "wxWidgets web site");
 }
 
 static void InitAboutInfoAll(wxAboutDialogInfo& info)
@@ -2836,21 +2836,19 @@ static void InitAboutInfoAll(wxAboutDialogInfo& info)
     InitAboutInfoWebsite(info);
 
     // we can add a second developer
-    info.AddDeveloper(wxT("A.N. Other"));
+    info.AddDeveloper("A.N. Other");
 
     // or we can add several persons at once like this
-    static const wxChar *docwriters[] =
-    {
-        wxT("First D. Writer"),
-        wxT("Second One"),
-    };
+    wxArrayString docwriters;
+    docwriters.Add("First D. Writer");
+    docwriters.Add("Second One");
 
-    info.SetDocWriters(wxArrayString(WXSIZEOF(docwriters), docwriters));
+    info.SetDocWriters(docwriters);
     info.SetLicence(wxString::FromAscii(
 "                wxWindows Library Licence, Version 3.1\n"
 "                ======================================\n"
 "\n"
-"  Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al\n"
+"  Copyright (c) 1998-2018 Julian Smart, Robert Roebling et al\n"
 "\n"
 "  Everyone is permitted to copy and distribute verbatim copies\n"
 "  of this licence document, but changing it is not allowed.\n"
@@ -2861,7 +2859,7 @@ static void InitAboutInfoAll(wxAboutDialogInfo& info)
 "                    ...and so on and so forth...\n"
     ));
 
-    info.AddTranslator(wxT("Wun Ngo Wen (Martian)"));
+    info.AddTranslator("Wun Ngo Wen (Martian)");
 }
 
 void MyFrame::ShowSimpleAboutDialog(wxCommandEvent& WXUNUSED(event))
@@ -2901,7 +2899,7 @@ public:
     virtual void DoAddCustomControls() wxOVERRIDE
     {
         AddControl(new wxStaticLine(this), wxSizerFlags().Expand());
-        AddText(wxT("Some custom text"));
+        AddText("Some custom text");
         AddControl(new wxStaticLine(this), wxSizerFlags().Expand());
     }
 };
@@ -2923,7 +2921,7 @@ void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event))
 {
     wxWindowDisabler disableAll;
 
-    wxBusyInfo info(wxT("Working, please wait..."), this);
+    wxBusyInfo info("Working, please wait...", this);
 
     for ( int i = 0; i < 18; i++ )
     {
@@ -2972,7 +2970,7 @@ void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) )
                            (
                             this,
                             &m_findData,
-                            wxT("Find and replace dialog"),
+                            "Find and replace dialog",
                             wxFR_REPLACEDIALOG
                            );
 
@@ -2992,7 +2990,7 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
                         (
                             this,
                             &m_findData,
-                            wxT("Find dialog"),
+                            "Find dialog",
                             // just for testing
                             wxFR_NOWHOLEWORD
                         );
@@ -3004,10 +3002,10 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
 static wxString DecodeFindDialogEventFlags(int flags)
 {
     wxString str;
-    str << (flags & wxFR_DOWN ? wxT("down") : wxT("up")) << wxT(", ")
-        << (flags & wxFR_WHOLEWORD ? wxT("whole words only, ") : wxT(""))
-        << (flags & wxFR_MATCHCASE ? wxT("") : wxT("not "))
-        << wxT("case sensitive");
+    str << (flags & wxFR_DOWN ? "down" : "up") << ", "
+        << (flags & wxFR_WHOLEWORD ? "whole words only, " : "")
+        << (flags & wxFR_MATCHCASE ? "" : "not ")
+        << "case sensitive";
 
     return str;
 }
@@ -3018,16 +3016,16 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
 
     if ( type == wxEVT_FIND || type == wxEVT_FIND_NEXT )
     {
-        wxLogMessage(wxT("Find %s'%s' (flags: %s)"),
-                     type == wxEVT_FIND_NEXT ? wxT("next ") : wxT(""),
+        wxLogMessage("Find %s'%s' (flags: %s)",
+                     type == wxEVT_FIND_NEXT ? "next " : "",
                      event.GetFindString().c_str(),
                      DecodeFindDialogEventFlags(event.GetFlags()).c_str());
     }
     else if ( type == wxEVT_FIND_REPLACE ||
                 type == wxEVT_FIND_REPLACE_ALL )
     {
-        wxLogMessage(wxT("Replace %s'%s' with '%s' (flags: %s)"),
-                     type == wxEVT_FIND_REPLACE_ALL ? wxT("all ") : wxT(""),
+        wxLogMessage("Replace %s'%s' with '%s' (flags: %s)",
+                     type == wxEVT_FIND_REPLACE_ALL ? "all " : "",
                      event.GetFindString().c_str(),
                      event.GetReplaceString().c_str(),
                      DecodeFindDialogEventFlags(event.GetFlags()).c_str());
@@ -3037,28 +3035,28 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
         wxFindReplaceDialog *dlg = event.GetDialog();
 
         int idMenu;
-        const wxChar *txt;
+        wxString txt;
         if ( dlg == m_dlgFind )
         {
-            txt = wxT("Find");
+            txt = "Find";
             idMenu = DIALOGS_FIND;
             m_dlgFind = NULL;
         }
         else if ( dlg == m_dlgReplace )
         {
-            txt = wxT("Replace");
+            txt = "Replace";
             idMenu = DIALOGS_REPLACE;
             m_dlgReplace = NULL;
         }
         else
         {
-            txt = wxT("Unknown");
+            txt = "Unknown";
             idMenu = wxID_ANY;
 
-            wxFAIL_MSG( wxT("unexpected event") );
+            wxFAIL_MSG( "unexpected event" );
         }
 
-        wxLogMessage(wxT("%s dialog is being closed."), txt);
+        wxLogMessage("%s dialog is being closed.", txt);
 
         if ( idMenu != wxID_ANY )
         {
@@ -3069,7 +3067,7 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
     }
     else
     {
-        wxLogError(wxT("Unknown find dialog event!"));
+        wxLogError("Unknown find dialog event!");
     }
 }
 
@@ -3084,8 +3082,8 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
     wxPaintDC dc(this);
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.DrawText(
-                wxT("wxWidgets common dialogs")
-                wxT(" test application")
+                "wxWidgets common dialogs"
+                " test application"
                 , 10, 10);
 }
 
@@ -3096,12 +3094,12 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
 // ----------------------------------------------------------------------------
 
 MyModelessDialog::MyModelessDialog(wxWindow *parent)
-                : wxDialog(parent, wxID_ANY, wxString(wxT("Modeless dialog")))
+                : wxDialog(parent, wxID_ANY, wxString("Modeless dialog"))
 {
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 
-    wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, wxT("Press me"));
-    wxCheckBox *check = new wxCheckBox(this, wxID_ANY, wxT("Should be disabled"));
+    wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, "Press me");
+    wxCheckBox *check = new wxCheckBox(this, wxID_ANY, "Should be disabled");
     check->Disable();
 
     sizerTop->Add(btn, 1, wxEXPAND | wxALL, 5);
@@ -3112,7 +3110,7 @@ MyModelessDialog::MyModelessDialog(wxWindow *parent)
 
 void MyModelessDialog::OnButton(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(wxT("Button pressed in modeless dialog"), wxT("Info"),
+    wxMessageBox("Button pressed in modeless dialog", "Info",
                  wxOK | wxICON_INFORMATION, this);
 }
 
@@ -3120,8 +3118,8 @@ void MyModelessDialog::OnClose(wxCloseEvent& event)
 {
     if ( event.CanVeto() )
     {
-        wxMessageBox(wxT("Use the menu item to close this dialog"),
-                     wxT("Modeless dialog"),
+        wxMessageBox("Use the menu item to close this dialog",
+                     "Modeless dialog",
                      wxOK | wxICON_INFORMATION, this);
 
         event.Veto();
@@ -3133,13 +3131,13 @@ void MyModelessDialog::OnClose(wxCloseEvent& event)
 // ----------------------------------------------------------------------------
 
 MyModalDialog::MyModalDialog(wxWindow *parent)
-             : wxDialog(parent, wxID_ANY, wxString(wxT("Modal dialog")))
+             : wxDialog(parent, wxID_ANY, wxString("Modal dialog"))
 {
     wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
-    m_btnModal = new wxButton(this, wxID_ANY, wxT("&Modal dialog..."));
-    m_btnModeless = new wxButton(this, wxID_ANY, wxT("Mode&less dialog"));
-    m_btnDelete = new wxButton(this, wxID_ANY, wxT("&Delete button"));
+    m_btnModal = new wxButton(this, wxID_ANY, "&Modal dialog...");
+    m_btnModeless = new wxButton(this, wxID_ANY, "Mode&less dialog");
+    m_btnDelete = new wxButton(this, wxID_ANY, "&Delete button");
 
     sizerTop->Add(m_btnModal, 0, wxALIGN_CENTER | wxALL, 5);
     sizerTop->Add(m_btnModeless, 0, wxALIGN_CENTER | wxALL, 5);
@@ -3164,11 +3162,11 @@ void MyModalDialog::OnButton(wxCommandEvent& event)
     else if ( event.GetEventObject() == m_btnModal )
     {
 #if wxUSE_TEXTDLG
-        wxGetTextFromUser(wxT("Dummy prompt"),
-                          wxT("Modal dialog called from dialog"),
+        wxGetTextFromUser("Dummy prompt",
+                          "Modal dialog called from dialog",
                           wxEmptyString, this);
 #else
-        wxMessageBox(wxT("Modal dialog called from dialog"));
+        wxMessageBox("Modal dialog called from dialog");
 #endif // wxUSE_TEXTDLG
     }
     else if ( event.GetEventObject() == m_btnModeless )
@@ -3188,7 +3186,7 @@ void MyModalDialog::OnButton(wxCommandEvent& event)
 // ----------------------------------------------------------------------------
 
 StdButtonSizerDialog::StdButtonSizerDialog(wxWindow *parent)
-    : wxDialog(parent, wxID_ANY, wxString(wxT("StdButtonSizer dialog")),
+    : wxDialog(parent, wxID_ANY, wxString("StdButtonSizer dialog"),
       wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER),
       m_buttonsSizer(NULL)
 {
@@ -3197,29 +3195,29 @@ StdButtonSizerDialog::StdButtonSizerDialog(wxWindow *parent)
     wxBoxSizer *const sizer = new wxBoxSizer(wxHORIZONTAL);
     wxBoxSizer *const sizerInside1 = new wxBoxSizer(wxVERTICAL);
 
-    m_chkboxAffirmativeButton = new wxCheckBox(this, wxID_ANY, _("Enable Affirmative Button"));
+    m_chkboxAffirmativeButton = new wxCheckBox(this, wxID_ANY, "Enable Affirmative Button");
 
-    wxStaticBoxSizer *const sizer1 = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Affirmative Button"));
+    wxStaticBoxSizer *const sizer1 = new wxStaticBoxSizer(wxVERTICAL, this, "Affirmative Button");
 
-    m_radiobtnOk = new wxRadioButton(this, wxID_ANY, _("Ok"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-    m_radiobtnYes = new wxRadioButton(this, wxID_ANY, _("Yes"));
+    m_radiobtnOk = new wxRadioButton(this, wxID_ANY, "Ok", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+    m_radiobtnYes = new wxRadioButton(this, wxID_ANY, "Yes");
 
     wxBoxSizer *const sizerInside2 = new wxBoxSizer(wxVERTICAL);
 
-    m_chkboxDismissButton = new wxCheckBox(this, wxID_ANY, _("Enable Dismiss Button"));
+    m_chkboxDismissButton = new wxCheckBox(this, wxID_ANY, "Enable Dismiss Button");
 
-    wxStaticBoxSizer *const sizer2 = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Dismiss Button"));
+    wxStaticBoxSizer *const sizer2 = new wxStaticBoxSizer(wxVERTICAL, this, "Dismiss Button");
 
-    m_radiobtnCancel = new wxRadioButton(this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-    m_radiobtnClose = new wxRadioButton(this, wxID_ANY, _("Close"));
+    m_radiobtnCancel = new wxRadioButton(this, wxID_ANY, "Cancel", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+    m_radiobtnClose = new wxRadioButton(this, wxID_ANY, "Close");
 
     wxBoxSizer *const sizer3 = new wxBoxSizer(wxHORIZONTAL);
 
-    m_chkboxNo = new wxCheckBox(this, wxID_ANY, _("No"));
-    m_chkboxHelp = new wxCheckBox(this, wxID_ANY, _("Help"));
-    m_chkboxApply = new wxCheckBox(this, wxID_ANY, _("Apply"));
+    m_chkboxNo = new wxCheckBox(this, wxID_ANY, "No");
+    m_chkboxHelp = new wxCheckBox(this, wxID_ANY, "Help");
+    m_chkboxApply = new wxCheckBox(this, wxID_ANY, "Apply");
 
-    m_chkboxNoDefault = new wxCheckBox(this, wxID_ANY, wxT("No Default"));
+    m_chkboxNoDefault = new wxCheckBox(this, wxID_ANY, "No Default");
 
     sizer1->Add(m_radiobtnOk, 0, wxALL, 5);
     sizer1->Add(m_radiobtnYes, 0, wxALL, 5);
@@ -3394,7 +3392,7 @@ SettingsDialog::SettingsDialog(wxWindow* win, SettingsData& settingsData, int di
     else
         m_imageList = NULL;
 
-    Create(win, wxID_ANY, _("Preferences"), wxDefaultPosition, wxDefaultSize,
+    Create(win, wxID_ANY, "Preferences", wxDefaultPosition, wxDefaultSize,
         wxDEFAULT_DIALOG_STYLE| (int)wxPlatform::IfNot(wxOS_WINDOWS_CE, resizeBorder)
     );
 
@@ -3410,8 +3408,8 @@ SettingsDialog::SettingsDialog(wxWindow* win, SettingsData& settingsData, int di
     wxPanel* generalSettings = CreateGeneralSettingsPage(notebook);
     wxPanel* aestheticSettings = CreateAestheticSettingsPage(notebook);
 
-    notebook->AddPage(generalSettings, _("General"), true, tabImage1);
-    notebook->AddPage(aestheticSettings, _("Aesthetics"), false, tabImage2);
+    notebook->AddPage(generalSettings, "General", true, tabImage1);
+    notebook->AddPage(aestheticSettings, "Aesthetics", false, tabImage2);
 
     LayoutDialog();
 }
@@ -3431,15 +3429,15 @@ wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent)
     //// LOAD LAST FILE
 
     wxBoxSizer* itemSizer3 = new wxBoxSizer( wxHORIZONTAL );
-    wxCheckBox* checkBox3 = new wxCheckBox(panel, ID_LOAD_LAST_PROJECT, _("&Load last project on startup"), wxDefaultPosition, wxDefaultSize);
+    wxCheckBox* checkBox3 = new wxCheckBox(panel, ID_LOAD_LAST_PROJECT, "&Load last project on startup", wxDefaultPosition, wxDefaultSize);
     checkBox3->SetValidator(wxGenericValidator(&m_settingsData.m_loadLastOnStartup));
     itemSizer3->Add(checkBox3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
     item0->Add(itemSizer3, 0, wxGROW|wxALL, 0);
 
     //// AUTOSAVE
 
-    wxString autoSaveLabel = _("&Auto-save every");
-    wxString minsLabel = _("mins");
+    wxString autoSaveLabel = "&Auto-save every";
+    wxString minsLabel = "mins";
 
     wxBoxSizer* itemSizer12 = new wxBoxSizer( wxHORIZONTAL );
     wxCheckBox* checkBox12 = new wxCheckBox(panel, ID_AUTO_SAVE, autoSaveLabel, wxDefaultPosition, wxDefaultSize);
@@ -3460,7 +3458,7 @@ wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent)
     //// TOOLTIPS
 
     wxBoxSizer* itemSizer8 = new wxBoxSizer( wxHORIZONTAL );
-    wxCheckBox* checkBox6 = new wxCheckBox(panel, ID_SHOW_TOOLTIPS, _("Show &tooltips"), wxDefaultPosition, wxDefaultSize);
+    wxCheckBox* checkBox6 = new wxCheckBox(panel, ID_SHOW_TOOLTIPS, "Show &tooltips", wxDefaultPosition, wxDefaultSize);
     checkBox6->SetValidator(wxGenericValidator(&m_settingsData.m_showToolTips));
     itemSizer8->Add(checkBox6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
     item0->Add(itemSizer8, 0, wxGROW|wxALL, 0);
@@ -3481,10 +3479,10 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
 
     //// PROJECT OR GLOBAL
     wxString globalOrProjectChoices[2];
-    globalOrProjectChoices[0] = _("&New projects");
-    globalOrProjectChoices[1] = _("&This project");
+    globalOrProjectChoices[0] = "&New projects";
+    globalOrProjectChoices[1] = "&This project";
 
-    wxRadioBox* projectOrGlobal = new wxRadioBox(panel, ID_APPLY_SETTINGS_TO, _("&Apply settings to:"),
+    wxRadioBox* projectOrGlobal = new wxRadioBox(panel, ID_APPLY_SETTINGS_TO, "&Apply settings to:",
         wxDefaultPosition, wxDefaultSize, 2, globalOrProjectChoices);
     projectOrGlobal->SetValidator(wxGenericValidator(&m_settingsData.m_applyTo));
     item0->Add(projectOrGlobal, 0, wxGROW|wxALL, 5);
@@ -3493,9 +3491,9 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
 
     //// BACKGROUND STYLE
     wxArrayString backgroundStyleChoices;
-    backgroundStyleChoices.Add(wxT("Colour"));
-    backgroundStyleChoices.Add(wxT("Image"));
-    wxStaticBox* staticBox3 = new wxStaticBox(panel, wxID_ANY, _("Background style:"));
+    backgroundStyleChoices.Add("Colour");
+    backgroundStyleChoices.Add("Image");
+    wxStaticBox* staticBox3 = new wxStaticBox(panel, wxID_ANY, "Background style:");
 
     wxBoxSizer* styleSizer = new wxStaticBoxSizer( staticBox3, wxVERTICAL );
     item0->Add(styleSizer, 0, wxGROW|wxALL, 5);
@@ -3505,7 +3503,7 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
     wxChoice* choice2 = new wxChoice(panel, ID_BACKGROUND_STYLE, wxDefaultPosition, wxDefaultSize, backgroundStyleChoices);
     choice2->SetValidator(wxGenericValidator(&m_settingsData.m_bgStyle));
 
-    itemSizer2->Add(new wxStaticText(panel, wxID_ANY, _("&Window:")), 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
+    itemSizer2->Add(new wxStaticText(panel, wxID_ANY, "&Window:"), 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
     itemSizer2->Add(5, 5, 1, wxALL, 0);
     itemSizer2->Add(choice2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
 
@@ -3514,7 +3512,7 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
 #if wxUSE_SPINCTRL
     //// FONT SIZE SELECTION
 
-    wxStaticBox* staticBox1 = new wxStaticBox(panel, wxID_ANY, _("Tile font size:"));
+    wxStaticBox* staticBox1 = new wxStaticBox(panel, wxID_ANY, "Tile font size:");
     wxBoxSizer* itemSizer5 = new wxStaticBoxSizer( staticBox1, wxHORIZONTAL );
 
     wxSpinCtrl* spinCtrl = new wxSpinCtrl(panel, ID_FONT_SIZE, wxEmptyString, wxDefaultPosition,

From 99eba63796143bf75704e387b2ab4c49369ebd7c Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 27 Aug 2018 11:50:35 +0200
Subject: [PATCH 909/916] use Cocoa fix for nested modal loops for system
 dialogs also

---
 src/osx/carbon/colordlgosx.mm |  4 ++--
 src/osx/carbon/fontdlg.cpp    |  4 ++--
 src/osx/carbon/fontdlgosx.mm  |  4 ++--
 src/osx/cocoa/dialog.mm       | 26 ++++++++++++++++++++++++++
 src/osx/cocoa/dirdlg.mm       |  5 +++++
 src/osx/cocoa/evtloop.mm      | 17 -----------------
 src/osx/cocoa/filedlg.mm      |  5 +++++
 src/osx/cocoa/msgdlg.mm       |  5 +++++
 src/osx/cocoa/printdlg.mm     |  9 +++++++++
 src/osx/dialog_osx.cpp        | 32 +++++++++++++++++++++++++-------
 10 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm
index 6a63af1197..92d6e03df7 100644
--- a/src/osx/carbon/colordlgosx.mm
+++ b/src/osx/carbon/colordlgosx.mm
@@ -140,7 +140,7 @@ int wxColourDialog::ShowModal()
             //
             //	Start the color panel modal loop
             //
-            wxDialog::OSXBeginModalDialog();
+            OSXBeginModalDialog();
             NSModalSession session = [NSApp beginModalSessionForWindow:theColorPanel];
             for (;;)
             {
@@ -151,7 +151,7 @@ int wxColourDialog::ShowModal()
                     break;
             }
             [NSApp endModalSession:session];
-            wxDialog::OSXEndModalDialog();
+            OSXEndModalDialog();
 
     //free up the memory for the delegates - we don't need them anymore
     [theColorPanel setDelegate:nil];
diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp
index a6dadb57ef..470189ce73 100644
--- a/src/osx/carbon/fontdlg.cpp
+++ b/src/osx/carbon/fontdlg.cpp
@@ -86,9 +86,9 @@ int wxFontDialog::ShowModal()
 {
     WX_HOOK_MODAL_DIALOG();
 
-    wxDialog::OSXBeginModalDialog();
+    OSXBeginModalDialog();
     int retval = RunMixedFontDialog(this);
-    wxDialog::OSXEndModalDialog();
+    OSXEndModalDialog();
 
     return retval ;
 }
diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index 7168b5a484..b61908f0c4 100644
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/src/osx/carbon/fontdlgosx.mm
@@ -532,7 +532,7 @@ int wxFontDialog::ShowModal()
     //  the color panel until the color panel closes, switching
     //  back to the font panel modal loop once it does close.
     //
-    wxDialog::OSXBeginModalDialog();
+    OSXBeginModalDialog();
     do
     {
         //
@@ -571,7 +571,7 @@ int wxFontDialog::ShowModal()
         //out of its modal loop because the color panel was
         //opened) return the font panel modal loop
     }while([theFPDelegate isClosed] == NO);
-    wxDialog::OSXEndModalDialog();
+    OSXEndModalDialog();
     
     //free up the memory for the delegates - we don't need them anymore
     [theFPDelegate release];
diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm
index 8b1e48f1b4..d34fa5cb0b 100644
--- a/src/osx/cocoa/dialog.mm
+++ b/src/osx/cocoa/dialog.mm
@@ -44,3 +44,29 @@ void wxDialog::EndWindowModal()
     [NSApp endSheet: GetWXWindow()];
     [GetWXWindow() orderOut:GetWXWindow()];
 }
+
+bool wxDialog::OSXGetWorksWhenModal()
+{
+    bool worksWhenModal = false;
+
+    NSWindow* nswindow = IsModal() ? GetWXWindow() : nil;
+    if ( nswindow != nil )
+    {
+        if ( [nswindow isKindOfClass:[NSPanel class]] &&  [(NSPanel*)nswindow worksWhenModal] == YES )
+        {
+            [(NSPanel*)nswindow setWorksWhenModal:NO];
+            worksWhenModal = true;
+        }
+    }
+    return worksWhenModal;
+}
+
+void wxDialog::OSXSetWorksWhenModal(bool worksWhenModal)
+{
+    NSWindow* nswindow = IsModal() ? GetWXWindow() : nil;
+    if ( nswindow != nil )
+    {
+        if ( [nswindow isKindOfClass:[NSPanel class]] &&  [(NSPanel*)nswindow worksWhenModal] == YES )
+            [(NSPanel*)nswindow setWorksWhenModal:worksWhenModal];
+    }
+}
diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index f9ae000edb..c46c515a58 100644
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -116,9 +116,14 @@ int wxDirDialog::ShowModal()
     m_path.clear();
 
     int returnCode = -1;
+    
+    OSXBeginModalDialog();
 
     returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil];
     ModalFinishedCallback(oPanel, returnCode);
+    
+    OSXEndModalDialog();
+
 
     return GetReturnCode();
 }
diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm
index 558cbb2d4b..26169f86ab 100644
--- a/src/osx/cocoa/evtloop.mm
+++ b/src/osx/cocoa/evtloop.mm
@@ -436,26 +436,9 @@ void wxModalEventLoop::OSXDoRun()
 #if OSX_USE_MODAL_SESSION
     if ( m_modalWindow )
     {
-        bool restoreWorksWhenModal = false;
-        wxDialog* const parentDialog = wxDynamicCast(wxGetTopLevelParent(m_modalWindow->GetParent()), wxDialog);
-        NSWindow* parentWindow = parentDialog && parentDialog->IsModal() ? parentDialog->GetWXWindow() : nil;
-        if ( parentWindow != nil )
-        {
-            if ( [parentWindow isKindOfClass:[NSPanel class]] &&  [(NSPanel*)parentWindow worksWhenModal] == YES )
-            {
-                [(NSPanel*)parentWindow setWorksWhenModal:NO];
-                restoreWorksWhenModal = true;
-            }
-        }
- 
         BeginModalSession(m_modalWindow);
         wxCFEventLoop::OSXDoRun();
         EndModalSession();
-        
-        if ( restoreWorksWhenModal )
-        {
-            [(NSPanel*)parentWindow setWorksWhenModal:YES];
-        }
     }
     else
 #endif
diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index fe69dfbd56..24fdc457f7 100644
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -559,6 +559,8 @@ int wxFileDialog::ShowModal()
 
     wxGCC_WARNING_SUPPRESS(deprecated-declarations)
 
+    OSXBeginModalDialog();
+
     if ( HasFlag(wxFD_SAVE) )
     {
         NSSavePanel* sPanel = [NSSavePanel savePanel];
@@ -627,6 +629,9 @@ int wxFileDialog::ShowModal()
             
         ModalFinishedCallback(oPanel, returnCode);
     }
+    
+    OSXEndModalDialog();
+
 
     wxGCC_WARNING_RESTORE(deprecated-declarations)
 
diff --git a/src/osx/cocoa/msgdlg.mm b/src/osx/cocoa/msgdlg.mm
index 1de7e7aa7a..ffaf9438ca 100644
--- a/src/osx/cocoa/msgdlg.mm
+++ b/src/osx/cocoa/msgdlg.mm
@@ -168,8 +168,13 @@ int wxMessageDialog::ShowModal()
     {
         NSAlert* alert = (NSAlert*)ConstructNSAlert();
 
+        OSXBeginModalDialog();
+
         int button = -1;
         button = [alert runModal];
+        
+        OSXEndModalDialog();
+
         ModalFinishedCallback(alert, button);
         [alert release];
     }
diff --git a/src/osx/cocoa/printdlg.mm b/src/osx/cocoa/printdlg.mm
index 2b1c88a6ab..f873c4ce27 100644
--- a/src/osx/cocoa/printdlg.mm
+++ b/src/osx/cocoa/printdlg.mm
@@ -72,12 +72,16 @@ int wxMacPrintDialog::ShowModal()
     [dict setValue:[NSNumber numberWithInt:m_printDialogData.GetMinPage()] forKey:@"com_apple_print_PrintSettings_PMFirstPage"];
     [dict setValue:[NSNumber numberWithInt:m_printDialogData.GetMaxPage()] forKey:@"com_apple_print_PrintSettings_PMLastPage"];
 
+    OSXBeginModalDialog();
+
     if ( (NSInteger)[panel runModalWithPrintInfo:printInfo] == NSOKButton )
     {
         result = wxID_OK;
         m_printDialogData.GetPrintData().ConvertFromNative();
         ((wxOSXPrintData*)m_printDialogData.GetPrintData().GetNativeData())->TransferTo( &m_printDialogData );
     }
+    
+    OSXEndModalDialog();
 
     return result;
 }
@@ -93,6 +97,9 @@ int wxMacPageSetupDialog::ShowModal()
 
     NSPageLayout *pageLayout = [NSPageLayout pageLayout];
     NSPrintInfo* printInfo = ((wxOSXCocoaPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->GetNSPrintInfo();
+    
+    OSXBeginModalDialog();
+
     if ( [pageLayout runModalWithPrintInfo:printInfo] == NSOKButton )
     {
         result = wxID_OK;
@@ -100,6 +107,8 @@ int wxMacPageSetupDialog::ShowModal()
         m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() );
     }
 
+    OSXEndModalDialog();
+    
     return result;
 }
 
diff --git a/src/osx/dialog_osx.cpp b/src/osx/dialog_osx.cpp
index 750e6a2059..aeef9e0f1a 100644
--- a/src/osx/dialog_osx.cpp
+++ b/src/osx/dialog_osx.cpp
@@ -23,21 +23,39 @@
 
 #include "wx/osx/private.h"
 
-static int s_openDialogs = 0;
+wxVector<wxDialog*> wxDialog::s_modalStack;
+#if wxOSX_USE_COCOA
+wxVector<bool> wxDialog::s_modalWorksStack;
+#endif
+
 bool wxDialog::OSXHasModalDialogsOpen()
 {
-    return s_openDialogs > 0;
+    return s_modalStack.size() > 0;
 }
 
 void wxDialog::OSXBeginModalDialog()
 {
-    s_openDialogs++;
+#if wxOSX_USE_COCOA
+    // turning off worksWhenModal on 'parent'
+    if ( s_modalStack.size() > 0 )
+        s_modalStack.back()->OSXSetWorksWhenModal(false);
+    s_modalWorksStack.push_back(OSXGetWorksWhenModal());
+#endif
+    
+    s_modalStack.push_back(this);
 }
 
 void wxDialog::OSXEndModalDialog()
 {
-    wxASSERT_MSG( s_openDialogs > 0, "incorrect internal modal dialog count");
-    s_openDialogs--;
+    wxASSERT_MSG( s_modalStack.back() == this, "incorrect internal modal dialog stack");
+    s_modalStack.pop_back();
+#if wxOSX_USE_COCOA
+    s_modalWorksStack.pop_back();
+    
+    // restore worksWhenModal
+    if ( s_modalStack.size() > 0 )
+        s_modalStack.back()->OSXSetWorksWhenModal(s_modalWorksStack.back());
+#endif
 }
 
 void wxDialog::Init()
@@ -146,9 +164,9 @@ int wxDialog::ShowModal()
     wxModalEventLoop modalLoop(this);
     m_eventLoop = &modalLoop;
 
-    wxDialog::OSXBeginModalDialog();
+    OSXBeginModalDialog();
     modalLoop.Run();
-    wxDialog::OSXEndModalDialog();
+    OSXEndModalDialog();
 
     m_eventLoop = NULL;
 

From b38813a5e9efcb93df8d9d594e7ae63c6f96517e Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 27 Aug 2018 13:57:58 +0200
Subject: [PATCH 910/916] use Cocoa fix for nested modal loops for system
 dialogs also 2

Header was missing in 99eba63796143bf75704e387b2ab4c49369ebd7c, see #18204
---
 include/wx/osx/dialog.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index 88d5462f15..bce052f4c2 100644
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -60,8 +60,13 @@ public:
     virtual void EndModal(int retCode);
 
     static bool OSXHasModalDialogsOpen();
-    static void OSXBeginModalDialog();
-    static void OSXEndModalDialog();
+    void OSXBeginModalDialog();
+    void OSXEndModalDialog();
+    
+#if wxOSX_USE_COCOA
+    bool OSXGetWorksWhenModal();
+    void OSXSetWorksWhenModal(bool worksWhenModal);
+#endif
 
     // implementation
     // --------------
@@ -89,6 +94,11 @@ protected:
 
 private:
     void Init();
+    
+    static wxVector<wxDialog*> s_modalStack;
+#if wxOSX_USE_COCOA
+    static wxVector<bool> s_modalWorksStack;
+#endif
 };
 
 #endif

From 3591756166f95aec3ca396e61539794aa0354061 Mon Sep 17 00:00:00 2001
From: Hartwig <git@skywind.eu>
Date: Mon, 27 Aug 2018 21:07:11 +0200
Subject: [PATCH 911/916] Update wxDataViewColumn when sort order changes under
 macOS

The value returned by wxDataViewColumn::IsSortOrderAscending() wasn't
updated when the sort order changed due to the user clicking on a column
and reversing the sort order.

Fix this now by explicitly calling SetSortOrderVariable() when this
happens.

Closes https://github.com/wxWidgets/wxWidgets/pull/901
---
 src/osx/cocoa/dataview.mm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 83b3fd9343..23b0a2511e 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -652,9 +652,12 @@ outlineView:(NSOutlineView*)outlineView
     for (NSUInteger i=0; i<noOfDescriptors; ++i)
     {
         NSSortDescriptor* const newDescriptor = [newDescriptors objectAtIndex:i];
+        wxDataViewColumn* const sortingColumn = dvc->GetColumn([[newDescriptor key] intValue]);
+
+        sortingColumn->SetSortOrderVariable([newDescriptor ascending]);
 
         [wxSortDescriptors addObject:[[[wxSortDescriptorObject alloc] initWithModelPtr:model
-            sortingColumnPtr:dvc->GetColumn([[newDescriptor key] intValue])
+            sortingColumnPtr:sortingColumn
             ascending:[newDescriptor ascending]] autorelease]];
     }
     [(wxCocoaOutlineDataSource*)[outlineView dataSource] setSortDescriptors:wxSortDescriptors];

From 372daae9dcf7982fd56c5c1cf833892f1ddbe022 Mon Sep 17 00:00:00 2001
From: Hartwig <git@skywind.eu>
Date: Mon, 27 Aug 2018 21:07:11 +0200
Subject: [PATCH 912/916] Remove stray backspace character from
 wxCocoaDataViewControl

Somehow, a raw ASCII ^H made its way into this source file. Remove it.

See https://github.com/wxWidgets/wxWidgets/pull/901
---
 src/osx/cocoa/dataview.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 23b0a2511e..eefabd7ed1 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -2520,7 +2520,7 @@ void wxCocoaDataViewControl::SetRowHeight(int height)
 
 int wxCocoaDataViewControl::GetDefaultRowHeight() const
 {
-    // Custom setup of NSLayoutManager is necessary to match NSTableView sizing.
+    // Custom setup of NSLayoutManager is necessary to match NSTableView sizing.
     // See https://stackoverflow.com/questions/17095927/dynamically-changing-row-height-after-font-size-of-entire-nstableview-nsoutlin
     NSLayoutManager *lm = [[NSLayoutManager alloc] init];
     [lm setTypesetterBehavior:NSTypesetterBehavior_10_2_WithCompatibility];

From 54ddce99f5a00acd4124e1fcac691be8625b7d71 Mon Sep 17 00:00:00 2001
From: Nineis K <is_kk@hotmail.com>
Date: Tue, 28 Aug 2018 13:13:29 +0700
Subject: [PATCH 913/916] Fix wxColour::Green() wxColour::Blue()
 wxColour::Alpha() returns wrong value on macOS (#902)

---
 src/osx/core/colour.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index 39dac008b1..6f6b0ac969 100644
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -59,8 +59,8 @@ wxCGColorRefData::wxCGColorRefData(CGFloat r, CGFloat g, CGFloat b, CGFloat a)
 {
     CGFloat components[4];
     components[0] = r;
-    components[1] = b;
-    components[2] = g;
+    components[1] = g;
+    components[2] = b;
     components[3] = a;
 
     Init(components);
@@ -84,8 +84,8 @@ wxCGColorRefData::wxCGColorRefData(const wxCGColorRefData& other)
 void wxCGColorRefData::Init(CGFloat components[4])
 {
     m_red = components[0];
-    m_blue = components[1];
-    m_green = components[2];
+    m_green = components[1];
+    m_blue = components[2];
     m_alpha = components[3];
 
     m_cgColour = CGColorCreate(wxMacGetGenericRGBColorSpace(), components);
@@ -168,17 +168,17 @@ wxColour::ChannelType wxColour::Red() const
 
 wxColour::ChannelType wxColour::Green() const
 {
-    return wxRound(M_COLDATA->Red() * 255.0);
+    return wxRound(M_COLDATA->Green() * 255.0);
 }
 
 wxColour::ChannelType wxColour::Blue() const
 {
-    return wxRound(M_COLDATA->Red() * 255.0);
+    return wxRound(M_COLDATA->Blue() * 255.0);
 }
 
 wxColour::ChannelType wxColour::Alpha() const
 {
-    return wxRound(M_COLDATA->Red() * 255.0);
+    return wxRound(M_COLDATA->Alpha() * 255.0);
 }
 
 #if wxOSX_USE_COCOA_OR_CARBON

From 783b82913b7e7191d4c575fe725c91c911a45239 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 30 Aug 2018 00:21:02 +0200
Subject: [PATCH 914/916] Mention wxTL_NO_HEADER in wxTreeListCtrl
 documentation too

This style was documented in the global scope, but not in the class
description where it would be expected to be found.
---
 interface/wx/treelist.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/wx/treelist.h b/interface/wx/treelist.h
index e66d5b7247..71b368ba84 100644
--- a/interface/wx/treelist.h
+++ b/interface/wx/treelist.h
@@ -212,6 +212,9 @@ extern const wxTreeListItem wxTLI_LAST;
     @style{wxTL_USER_3STATE}
         Same as wxTL_3STATE but the user can also set the checkboxes to the
         undetermined state. Implies wxTL_3STATE.
+    @style{wxTL_NO_HEADER}
+        Don't show the column headers, that are shown by default. Notice that
+        this style is only available since wxWidgets 2.9.5.
     @style{wxTL_DEFAULT_STYLE}
         Style used by the control by default, just wxTL_SINGLE currently.
     @endStyleTable

From 4c29056ea41895081fde0f1e1346cc6c7fcdb1e1 Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Fri, 31 Aug 2018 12:42:46 +0200
Subject: [PATCH 915/916] include wxcrtvararg.h (non precomp) for
 wxVsnprintf/wxSscanf

---
 src/common/memory.cpp | 1 +
 src/x11/font.cpp      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index f31d76136f..a2ad41e444 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -27,6 +27,7 @@
     #include "wx/app.h"
     #include "wx/hash.h"
     #include "wx/log.h"
+    #include "wx/wxcrtvararg.h" // for wxVsnprintf 
 #endif
 
 #if wxUSE_THREADS
diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index a20332d680..dd818e5c4c 100644
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -35,6 +35,7 @@
     #include "wx/utils.h"       // for wxGetDisplay()
     #include "wx/settings.h"
     #include "wx/gdicmn.h"
+    #include "wx/wxcrtvararg.h" // for wxSscanf
 #endif
 
 #include "wx/fontutil.h"    // for wxNativeFontInfo

From a5756073f76b549019406751814b4dd198d63563 Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Fri, 31 Aug 2018 12:44:20 +0200
Subject: [PATCH 916/916] set WXWIN_COMPATIBILITY_x_y to 0 for OpenVMS

---
 setup.h_vms | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.h_vms b/setup.h_vms
index 8d374384ab..47a90bd472 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 18 May 2018                                                        *
+ * Date : 30 August 2018                                                     *
  *                                                                           *
  *****************************************************************************/
 
@@ -184,11 +184,11 @@ typedef pid_t GPid;
     #define wxUSE_GUI            1
 #endif
 
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_8 0
 
-#define WXWIN_COMPATIBILITY_3_0 1
+#define WXWIN_COMPATIBILITY_3_0 0
 
-#define wxEVENTS_COMPATIBILITY_2_8 1
+#define wxEVENTS_COMPATIBILITY_2_8 0
 
 #define wxDIALOG_UNIT_COMPATIBILITY   1