Merge remote-tracking branch 'remotes/upstream/master'

.mailmap

@@ -1,6 +1,7 @@
 ARATA Mizuki							<minorinoki@gmail.com>
 Artur Wieczorek							<artwik@wp.pl>
 Daniel Kulp		<dan@kulp.com>				<dkulp@apache.org>
+Blake Eryx		<seasweptdreams@gmail.com>		<Blake-Eryx@users.noreply.github.com>
 Bogdan Iordanescu						<bogdan_iordanescu@yahoo.com>
 Cătălin Răceanu							<maildus@gmail.com>
 			<maildus@gmail.com>			<catalinr@users.noreply.github.com>
@@ -31,7 +32,9 @@ Richard Fath							<richard.fath@t-online.de>
 Steve Browne		<swbrowne@gmail.com>			<sbrowne@unknown>
 			<swbrowne@gmail.com>			<amn3sia@gmail.com>
 Tim Kosse		<tim.kosse@gmx.de>			<tim.kosse@filezilla-project.org>
-Tim Stahlhut		<stahta01@users.sourceforge.net>	<stahta01@users.noreply.github.com>
+Tim Stahlhut		<stahta01@gmail.com>
+Tim Stahlhut		<stahta01@gmail.com>			<stahta01@users.sourceforge.net>
+Tim Stahlhut		<stahta01@gmail.com>			<stahta01@users.noreply.github.com>
 Tobias Taschner		<ttaschner@protect-software.com>	<TcT2k@users.noreply.github.com>
 			<ttaschner@protect-software.com>	<github@tc84.de>
 Václav Slavík		<vaclav@slavik.io>			<vslavik@fastmail.fm>

.travis.yml

@@ -19,7 +19,7 @@ matrix:
           env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11"
         - dist: trusty
           compiler: clang
-          env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs"
+          env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs --disable-webview"
         - dist: trusty
           compiler: gcc
           env: wxTOOLSET=cmake wxCMAKE_GENERATOR="Unix Makefiles"

appveyor.yml

@@ -36,11 +36,22 @@ environment:
     GENERATOR: 'Visual Studio 12'
     SHARED: ON
     CONFIGURATION: Release
+  - TOOLSET: cmake_qt
+    GENERATOR: 'Visual Studio 14 2015 Win64'
+    SHARED: ON
+    CONFIGURATION: Release
 
 clone_depth: 50
 
 install: git submodule update --init
 
+init:
+- ps: |
+    if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+        throw "There are newer queued builds for this pull request, failing early." }
+
 before_build:
 - ps: |
     $env:PATH = $env:PATH -replace "C:\\Program Files\\Git\\usr\\bin",""
@@ -49,10 +60,6 @@ before_build:
       %{$_ -replace "define wxUSE_STL 0", "define wxUSE_STL $env:wxUSE_STL"} |
       sc include\wx\msw\setup.h
     }
-    if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
-        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
-        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
-        throw "There are newer queued builds for this pull request, failing early." }
 
 build_script: c:\projects\wxwidgets\build\tools\appveyor.bat
 

autoconf_inc.m4

@@ -512,6 +512,12 @@ dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_G
         COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1)
+dnl ### begin block 20_COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ###
+    COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_SHARED_0[wx.bkl] ###
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
@@ -530,12 +536,6 @@ dnl ### begin block 20_COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0[../../samples/dialogs/
         COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
     fi
     AC_SUBST(COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0)
-dnl ### begin block 20_COND_SHARED_0_TOOLKIT_PM_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ###
-    COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
-    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
-        COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_SHARED_0_TOOLKIT_PM_WXUNIV_0)
 dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
     COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then

build/bakefiles/files.bkl

@@ -242,11 +242,40 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                               wxQT                                       -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 
+<set var="QT_WIN32_SRC" hints="files">
+    src/msw/ole/comimpl.cpp
+    src/msw/dialup.cpp
+    src/msw/dib.cpp
+    src/msw/joystick.cpp
+    src/msw/ole/oleutils.cpp
+    src/msw/ole/uuid.cpp
+    src/msw/ole/safearray.cpp
+    src/msw/sound.cpp
+    src/msw/ole/automtn.cpp
+</set>
+
+<set var="QT_WIN32_HDR" hints="files">
+    wx/msw/dib.h
+    wx/msw/ole/automtn.h
+    wx/msw/joystick.h
+    wx/msw/sound.h
+    wx/msw/ole/safearray.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/comimpl.h
+    wx/msw/ole/uuid.h
+</set>
+
+<set var="QT_PLATFORM_SRC" hints="files">
+    <if cond="PLATFORM_WIN32=='1'">$(QT_WIN32_SRC)</if>
+</set>
+
+<set var="QT_PLATFORM_HDR" hints="files">
+    <if cond="PLATFORM_WIN32=='1'">$(QT_WIN32_HDR)</if>
+</set>
+
 <set var="QT_HDR" hints="files">
     wx/qt/accel.h
     wx/qt/app.h
-    wx/qt/apptbase.h
-    wx/qt/apptrait.h
     wx/qt/bitmap.h
     wx/qt/bmpbuttn.h
     wx/qt/brush.h
@@ -262,7 +291,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/qt/colour.h
     wx/qt/combobox.h
     wx/qt/control.h
-    wx/qt/converter.h
     wx/qt/ctrlsub.h
     wx/qt/cursor.h
     wx/qt/dataform.h
@@ -313,17 +341,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/qt/statusbar.h
     wx/qt/stattext.h
     wx/qt/textctrl.h
-    wx/qt/textdlg.h
     wx/qt/textentry.h
     wx/qt/tglbtn.h
-    wx/qt/timer.h
     wx/qt/toolbar.h
     wx/qt/tooltip.h
     wx/qt/toplevel.h
     <!-- wx/qt/treectrl.h -->
-    wx/qt/utils.h
     wx/qt/window.h
-    wx/qt/private/winevent.h
     wx/generic/fdrepdlg.h
     wx/generic/filepickerg.h
     wx/generic/clrpickerg.h
@@ -336,6 +360,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/activityindicator.h
     wx/qt/dataview.h
     wx/qt/dvrenderers.h
+    $(QT_PLATFORM_HDR)
 </set>
 
 <set var="QT_SRC" hints="files">
@@ -433,6 +458,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/qt/uiaction.cpp
     src/qt/utils.cpp
     src/qt/window.cpp
+    $(QT_PLATFORM_SRC)
 </set>
 
 <set var="MEDIA_QT_SRC" hints="files">
@@ -1124,7 +1150,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
-    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
@@ -1286,7 +1311,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/caret.cpp
     src/generic/imaglist.cpp
     src/unix/dialup.cpp
-    src/unix/displayx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/uiactionx11.cpp
@@ -1604,6 +1628,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk1/utilsgtk.cpp
     src/gtk1/win_gtk.c
     src/gtk1/window.cpp
+    src/unix/displayx11.cpp
 </set>
 <set var="GTK1_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
@@ -1749,6 +1774,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/pen.cpp
     src/x11/region.cpp
     src/x11/utilsx.cpp
+    src/unix/displayx11.cpp
 </set>
 <set var="MOTIF_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
@@ -1940,6 +1966,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/utils.cpp
     src/x11/utilsx.cpp
     src/x11/window.cpp
+    src/unix/displayx11.cpp
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
@@ -2046,8 +2073,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/sound.cpp
     src/msw/ole/automtn.cpp
     src/msw/rt/notifmsgrt.cpp
-    src/generic/activityindicator.cpp
     src/msw/ole/uuid.cpp
+    src/msw/evtloop.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
     wx/msw/nonownedwnd.h
@@ -2055,12 +2082,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/popupwin.h
     wx/msw/uxtheme.h
     wx/msw/htmlhelp.h
-    wx/generic/activityindicator.h
     wx/msw/helpwin.h
     wx/msw/taskbar.h
     wx/msw/helpchm.h
     wx/msw/sound.h
     wx/msw/joystick.h
+    wx/msw/evtloop.h
 </set>
 
 <set var="MSW_SRC" hints="files">
@@ -2085,7 +2112,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dialog.cpp
     src/msw/dirdlg.cpp
     src/msw/dragimag.cpp
-    src/msw/evtloop.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge.cpp
@@ -2133,6 +2159,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/datetimectrl.cpp
     src/msw/timectrl.cpp
     src/msw/datecontrols.cpp
+    src/generic/activityindicator.cpp
 </set>
 <set var="MSW_HDR" hints="files">
     wx/generic/clrpickerg.h
@@ -2169,7 +2196,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/dirdlg.h
     wx/msw/dragimag.h
     wx/msw/enhmeta.h
-    wx/msw/evtloop.h
     wx/msw/filedlg.h
     wx/msw/font.h
     wx/msw/frame.h
@@ -2240,6 +2266,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/timectrl.h
     wx/msw/datectrl.h
     wx/msw/calctrl.h
+    wx/generic/activityindicator.h
 </set>
 <set var="MSW_RSC" hints="files">
     <!-- Resources must be installed together with headers: -->
@@ -2368,7 +2395,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/brush.cpp
     src/osx/dialog_osx.cpp
     src/osx/fontutil.cpp
-    src/osx/imaglist.cpp
     src/osx/minifram.cpp
     src/osx/nonownedwnd_osx.cpp
     src/osx/palette.cpp
@@ -2382,7 +2408,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/core/bitmap.cpp
     src/osx/core/colour.cpp
     src/osx/core/dcmemory.cpp
-    src/osx/core/display.cpp
     src/osx/core/fontenum.cpp
     src/osx/core/hid.cpp
     src/osx/core/printmac.cpp
@@ -2468,6 +2493,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/statusbr.cpp
     src/generic/textmeasure.cpp
     src/generic/icon.cpp
+    src/osx/statbmp_osx.cpp
+    src/generic/imaglist.cpp
 </if>
 </set>
 
@@ -2511,7 +2538,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/fontdlg.h
     wx/osx/frame.h
     wx/osx/gauge.h
-    wx/osx/imaglist.h
     wx/osx/listbox.h
     wx/osx/listctrl.h
     wx/osx/mdi.h
@@ -2566,6 +2592,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/statusbr.h
     wx/osx/appprogress.h
     wx/generic/icon.h
+    wx/generic/imaglist.h
 </set>
 
 <!-- ====================================================================== -->
@@ -2627,6 +2654,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/timectrl_osx.cpp
     src/common/taskbarcmn.cpp
     src/osx/cocoa/activityindicator.mm
+    src/osx/cocoa/statbmp.mm
+    src/osx/core/display.cpp
 </set>
 <set var="OSX_COCOA_HDR" hints="files">
     wx/osx/cocoa/chkconf.h
@@ -2672,11 +2701,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/iphone/toolbar.mm
     src/osx/iphone/utils.mm
     src/osx/iphone/window.mm
-    src/osx/cocoa/stdpaths.mm
     src/osx/iphone/settings.mm
     src/osx/sound_osx.cpp
     src/osx/core/sound.cpp
     src/generic/animateg.cpp
+    src/osx/iphone/statbmp.mm
 </set>
 
 <set var="OSX_IPHONE_HDR" hints="files">
@@ -2701,9 +2730,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="UNIV_PLATFORM_SRC" hints="files">
-    <if cond="TOOLKIT=='MSW'">
-        src/msw/evtloop.cpp
-    </if>
 <!--
     Including src/generic/animateg.cpp hre unconditionally results in bakefile
     errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.
@@ -2719,9 +2745,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </if>
 </set>
 <set var="UNIV_PLATFORM_HDR" hints="files">
-    <if cond="TOOLKIT=='MSW'">
-        wx/msw/evtloop.h
-    </if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         wx/generic/animate.h
     </if>

build/cmake/config.cmake

@@ -65,6 +65,7 @@ function(wx_write_config)
     set(CXX ${CMAKE_CXX_COMPILER})
     set(DMALLOC_LIBS)
     find_program(EGREP egrep)
+    mark_as_advanced(EGREP)
     set(EXTRALIBS_GUI)
     set(EXTRALIBS_HTML)
     set(EXTRALIBS_SDL)

build/cmake/files.cmake

@@ -165,11 +165,32 @@ set(BASE_OSX_NOTWXMAC_HDR
     ${BASE_COREFOUNDATION_HDR}
 )
 
+set(QT_WIN32_SRC
+    src/msw/ole/automtn.cpp
+    src/msw/ole/safearray.cpp
+    src/msw/sound.cpp
+    src/msw/ole/oleutils.cpp
+    src/msw/ole/uuid.cpp
+    src/msw/ole/comimpl.cpp
+    src/msw/dialup.cpp
+    src/msw/dib.cpp
+    src/msw/joystick.cpp
+)
+
+set(QT_WIN32_HDR
+    wx/msw/ole/automtn.h
+    wx/msw/joystick.h
+    wx/msw/dib.h
+    wx/msw/ole/uuid.h
+    wx/msw/ole/safearray.h
+    wx/msw/sound.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/comimpl.h
+)
+
 set(QT_HDR
     wx/qt/accel.h
     wx/qt/app.h
-    wx/qt/apptbase.h
-    wx/qt/apptrait.h
     wx/qt/bitmap.h
     wx/qt/bmpbuttn.h
     wx/qt/brush.h
@@ -187,7 +208,6 @@ set(QT_HDR
     wx/qt/colour.h
     wx/qt/combobox.h
     wx/qt/control.h
-    wx/qt/converter.h
     wx/qt/ctrlsub.h
     wx/qt/cursor.h
     wx/qt/dataform.h
@@ -241,16 +261,12 @@ set(QT_HDR
     wx/qt/statusbar.h
     wx/qt/stattext.h
     wx/qt/textctrl.h
-    wx/qt/textdlg.h
     wx/qt/textentry.h
     wx/qt/tglbtn.h
-    wx/qt/timer.h
     wx/qt/toolbar.h
     wx/qt/tooltip.h
     wx/qt/toplevel.h
-    wx/qt/utils.h
     wx/qt/window.h
-    wx/qt/private/winevent.h
     wx/qt/dvrenderer.h
     wx/qt/dvrenderers.h
     wx/generic/animate.h
@@ -258,6 +274,7 @@ set(QT_HDR
     wx/qt/taskbar.h
     wx/qt/dataview.h
     wx/generic/activityindicator.h
+    ${QT_PLATFORM_HDR}
 )
 
 set(QT_SRC
@@ -355,12 +372,21 @@ set(QT_SRC
     src/qt/calctrl.cpp
     src/qt/dataview.cpp
     src/qt/taskbar.cpp
+    ${QT_PLATFORM_SRC}
 )
 
 set(MEDIA_QT_SRC
     src/qt/mediactrl.cpp
 )
 
+set(OPENGL_QT_HDR
+    wx/qt/glcanvas.h
+)
+
+set(OPENGL_QT_SRC
+    src/qt/glcanvas.cpp
+)
+
 set(BASE_CMN_SRC
     src/common/any.cpp
     src/common/appbase.cpp
@@ -1032,7 +1058,6 @@ set(GUI_CMN_HDR
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
-    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
@@ -1181,7 +1206,6 @@ set(XWIN_LOWLEVEL_SRC
     src/generic/caret.cpp
     src/generic/imaglist.cpp
     src/unix/dialup.cpp
-    src/unix/displayx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/uiactionx11.cpp
@@ -1488,6 +1512,7 @@ set(GTK1_LOWLEVEL_SRC
     src/gtk1/utilsgtk.cpp
     src/gtk1/win_gtk.c
     src/gtk1/window.cpp
+    src/unix/displayx11.cpp
 )
 
 set(GTK1_LOWLEVEL_HDR
@@ -1631,6 +1656,7 @@ set(MOTIF_LOWLEVEL_SRC
     src/x11/pen.cpp
     src/x11/region.cpp
     src/x11/utilsx.cpp
+    src/unix/displayx11.cpp
 )
 
 set(MOTIF_LOWLEVEL_HDR
@@ -1819,6 +1845,7 @@ set(X11_LOWLEVEL_SRC
     src/x11/utils.cpp
     src/x11/utilsx.cpp
     src/x11/window.cpp
+    src/unix/displayx11.cpp
 )
 
 set(X11_LOWLEVEL_HDR
@@ -1920,8 +1947,8 @@ set(MSW_LOWLEVEL_SRC
     src/msw/notifmsg.cpp
     src/msw/ole/automtn.cpp
     src/msw/taskbar.cpp
-    src/generic/activityindicator.cpp
     src/msw/richtooltip.cpp
+    src/msw/evtloop.cpp
 )
 
 set(MSW_LOWLEVEL_HDR
@@ -1932,10 +1959,10 @@ set(MSW_LOWLEVEL_HDR
     wx/msw/htmlhelp.h
     wx/msw/helpchm.h
     wx/msw/sound.h
-    wx/generic/activityindicator.h
     wx/msw/joystick.h
     wx/msw/helpwin.h
     wx/msw/taskbar.h
+    wx/msw/evtloop.h
 )
 
 set(MSW_DESKTOP_LOWLEVEL_SRC
@@ -1973,7 +2000,6 @@ set(MSW_SRC
     src/msw/dialog.cpp
     src/msw/dirdlg.cpp
     src/msw/dragimag.cpp
-    src/msw/evtloop.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge.cpp
@@ -2020,6 +2046,7 @@ set(MSW_SRC
     src/msw/commandlinkbutton.cpp
     src/msw/datetimectrl.cpp
     src/msw/hyperlink.cpp
+    src/generic/activityindicator.cpp
 )
 
 set(MSW_HDR
@@ -2057,7 +2084,6 @@ set(MSW_HDR
     wx/msw/dirdlg.h
     wx/msw/dragimag.h
     wx/msw/enhmeta.h
-    wx/msw/evtloop.h
     wx/msw/filedlg.h
     wx/msw/font.h
     wx/msw/frame.h
@@ -2128,6 +2154,7 @@ set(MSW_HDR
     wx/msw/datetimectrl.h
     wx/msw/timectrl.h
     wx/generic/animate.h
+    wx/generic/activityindicator.h
 )
 
 set(MSW_RSC
@@ -2247,7 +2274,6 @@ set(OSX_LOWLEVEL_SRC
     src/osx/brush.cpp
     src/osx/dialog_osx.cpp
     src/osx/fontutil.cpp
-    src/osx/imaglist.cpp
     src/osx/minifram.cpp
     src/osx/nonownedwnd_osx.cpp
     src/osx/palette.cpp
@@ -2259,7 +2285,6 @@ set(OSX_LOWLEVEL_SRC
     src/osx/core/bitmap.cpp
     src/osx/core/colour.cpp
     src/osx/core/dcmemory.cpp
-    src/osx/core/display.cpp
     src/osx/core/fontenum.cpp
     src/osx/core/hid.cpp
     src/osx/core/printmac.cpp
@@ -2346,6 +2371,8 @@ set(OSX_COMMON_SRC
     src/generic/textmeasure.cpp
     src/generic/icon.cpp
     #TODO: </if>
+    src/osx/statbmp_osx.cpp
+    src/generic/imaglist.cpp
 )
 
 set(OSX_SHARED_HDR
@@ -2387,7 +2414,6 @@ set(OSX_SHARED_HDR
     wx/osx/fontdlg.h
     wx/osx/frame.h
     wx/osx/gauge.h
-    wx/osx/imaglist.h
     wx/osx/listbox.h
     wx/osx/listctrl.h
     wx/osx/mdi.h
@@ -2442,6 +2468,7 @@ set(OSX_SHARED_HDR
     wx/generic/statusbr.h
     wx/osx/appprogress.h
     wx/generic/icon.h
+    wx/generic/imaglist.h
 )
 
 set(OSX_COCOA_SRC
@@ -2499,6 +2526,8 @@ set(OSX_COCOA_SRC
     src/osx/cocoa/notifmsg.mm
     src/osx/datectrl_osx.cpp
     src/osx/core/sound.cpp
+    src/osx/cocoa/statbmp.mm
+    src/osx/core/display.cpp
 )
 
 set(OSX_COCOA_HDR
@@ -2525,7 +2554,6 @@ set(OSX_COCOA_HDR
 set(OSX_IPHONE_SRC
     ${OSX_COMMON_SRC}
     src/generic/regiong.cpp
-    src/osx/cocoa/stdpaths.mm
     # iphone files
     src/osx/iphone/anybutton.mm
     src/osx/iphone/button.mm
@@ -2546,6 +2574,7 @@ set(OSX_IPHONE_SRC
     src/osx/sound_osx.cpp
     src/generic/animateg.cpp
     src/osx/core/sound.cpp
+    src/osx/iphone/statbmp.mm
 )
 
 set(OSX_IPHONE_HDR
@@ -2567,7 +2596,6 @@ set(UNIV_THEMES_SRC
 set(UNIV_SRC
     ${UNIV_PLATFORM_SRC}
     src/generic/accel.cpp
-    src/generic/activityindicator.cpp
     src/generic/clrpickerg.cpp
     src/generic/collpaneg.cpp
     src/generic/colrdlgg.cpp
@@ -2617,12 +2645,12 @@ set(UNIV_SRC
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp
     src/univ/winuniv.cpp
+    src/generic/activityindicator.cpp
 )
 
 set(UNIV_HDR
     ${UNIV_PLATFORM_HDR}
     wx/generic/accel.h
-    wx/generic/activityindicator.h
     wx/generic/animate.h
     wx/generic/clrpickerg.h
     wx/generic/collpaneg.h
@@ -2679,6 +2707,7 @@ set(UNIV_HDR
     wx/univ/toolbar.h
     wx/univ/toplevel.h
     wx/univ/window.h
+    wx/generic/activityindicator.h
 )
 
 set(MEDIA_CMN_SRC

build/cmake/functions.cmake

@@ -75,6 +75,8 @@ endmacro()
 
 # Set properties common to builtin third party libraries and wx libs
 function(wx_set_common_target_properties target_name)
+    cmake_parse_arguments(wxCOMMON_TARGET_PROPS "DEFAULT_WARNINGS" "" "" ${ARGN})
+
     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})
@@ -96,6 +98,13 @@ function(wx_set_common_target_properties target_name)
         ARCHIVE_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}"
         RUNTIME_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}${wxPLATFORM_LIB_DIR}"
         )
+    if(NOT wxCOMMON_TARGET_PROPS_DEFAULT_WARNINGS)
+        # Enable higher warnings for most compilers/IDEs
+        if(MSVC)
+            target_compile_options(${target_name} PRIVATE /W4)
+        endif()
+        # TODO: add warning flags for other compilers
+    endif()
 endfunction()
 
 # Set common properties on wx library target
@@ -446,7 +455,7 @@ function(wx_set_builtin_target_properties target_name)
 
     set_target_properties(${target_name} PROPERTIES FOLDER "Third Party Libraries")
 
-    wx_set_common_target_properties(${target_name})
+    wx_set_common_target_properties(${target_name} DEFAULT_WARNINGS)
     if(NOT wxBUILD_SHARED)
         wx_install(TARGETS ${name} ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}")
     endif()

build/cmake/init.cmake

@@ -121,6 +121,10 @@ if(wxUSE_ON_FATAL_EXCEPTION AND MSVC AND (MSVC_VERSION GREATER 1800) )
     add_compile_options("/EHa")
 endif()
 
+if(NOT wxBUILD_DEBUG_LEVEL STREQUAL "Default")
+    add_compile_options("-DwxDEBUG_LEVEL=${wxBUILD_DEBUG_LEVEL}")
+endif()
+
 # Constants for setup.h creation
 set(wxUSE_STD_DEFAULT ON)
 if(wxUSE_UNICODE)
@@ -138,10 +142,6 @@ if(DEFINED wxUSE_OLE AND wxUSE_OLE)
     set(wxUSE_OLE_AUTOMATION 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()
@@ -150,12 +150,71 @@ if(wxUSE_THREADS)
     find_package(Threads REQUIRED)
 endif()
 
+if(wxUSE_LIBLZMA)
+    find_package(LibLZMA REQUIRED)
+endif()
+
+if(UNIX AND wxUSE_SECRETSTORE)
+    # The required APIs are always available under MSW and OS X but we must
+    # have GNOME libsecret under Unix to be able to compile this class.
+    find_package(Libsecret REQUIRED)
+    if(NOT LIBSECRET_FOUND)
+        message(WARNING "libsecret not found, wxSecretStore won't be available")
+        wx_option_force_value(wxUSE_SECRETSTORE OFF)
+    endif()
+endif()
+
 if(wxUSE_GUI)
-    if(WIN32 AND wxUSE_METAFILE)
+    if(WXMSW AND wxUSE_METAFILE)
         # this one should probably be made separately configurable
         set(wxUSE_ENH_METAFILE ON)
     endif()
 
+    # Direct2D check
+    if(WIN32 AND wxUSE_GRAPHICS_DIRECT2D)
+        check_include_file(d2d1.h HAVE_D2D1_H)
+        if (NOT HAVE_D2D1_H)
+            wx_option_force_value(wxUSE_GRAPHICS_DIRECT2D OFF)
+        endif()
+    endif()
+     if(MSVC) # match setup.h
+        if(MSVC_VERSION LESS 1600)
+            wx_option_force_value(wxUSE_GRAPHICS_DIRECT2D OFF)
+        else()
+            wx_option_force_value(wxUSE_GRAPHICS_DIRECT2D ${wxUSE_GRAPHICS_CONTEXT})
+        endif()
+     endif()
+
+    # WXQT checks
+    if(WXQT)
+        wx_option_force_value(wxUSE_WEBVIEW OFF)
+        wx_option_force_value(wxUSE_METAFILE OFF)
+        if(WIN32)
+            wx_option_force_value(wxUSE_ACCESSIBILITY OFF)
+            wx_option_force_value(wxUSE_OWNER_DRAWN OFF)
+        endif()
+    endif()
+
+    # WXGTK checks, match include/wx/gtk/chkconf.h
+    if(WXGTK)
+        wx_option_force_value(wxUSE_METAFILE OFF)
+
+        if(WIN32)
+            wx_option_force_value(wxUSE_CAIRO ON)
+            wx_option_force_value(wxUSE_ACCESSIBILITY OFF)
+            wx_option_force_value(wxUSE_OWNER_DRAWN OFF)
+        endif()
+
+        if(NOT UNIX)
+            wx_option_force_value(wxUSE_WEBVIEW OFF)
+            wx_option_force_value(wxUSE_MEDIACTRL OFF)
+            wx_option_force_value(wxUSE_UIACTIONSIMULATOR OFF)
+            wx_option_force_value(wxUSE_OPENGL OFF)
+            set(wxUSE_GLCANVAS OFF)
+        endif()
+    endif()
+
+    # extra dependencies
     if(wxUSE_OPENGL)
         find_package(OpenGL)
         if(NOT OPENGL_FOUND)
@@ -173,8 +232,26 @@ if(wxUSE_GUI)
         endif()
     endif()
 
+    if(wxUSE_PRIVATE_FONTS AND WXGTK)
+        find_package(Fontconfig)
+        if(NOT FONTCONFIG_FOUND)
+            message(WARNING "Fontconfig not found, Private fonts won't be available")
+            wx_option_force_value(wxUSE_PRIVATE_FONTS OFF)
+        endif()
+    endif()
+
     if(wxUSE_MEDIACTRL AND UNIX AND NOT APPLE AND NOT WIN32)
-        find_package(GStreamer)
+        find_package(GStreamer 1.0 COMPONENTS video)
+        if(NOT GSTREAMER_FOUND)
+            find_package(GStreamer 0.10 COMPONENTS interfaces)
+        endif()
+
+        set(wxUSE_GSTREAMER ${GSTREAMER_FOUND})
+        set(wxUSE_GSTREAMER_PLAYER OFF)
+        if(GSTREAMER_PLAYER_INCLUDE_DIRS)
+            set(wxUSE_GSTREAMER_PLAYER ON)
+        endif()
+
         if(NOT GSTREAMER_FOUND)
             message(WARNING "GStreamer not found, wxMediaCtrl won't be available")
             wx_option_force_value(wxUSE_MEDIACTRL OFF)

build/cmake/lib/base/CMakeLists.txt

@@ -24,15 +24,6 @@ elseif(APPLE)
     endif()
 elseif(UNIX)
     wx_append_sources(BASE_FILES BASE_UNIX)
-    if(wxUSE_SECRETSTORE)
-        # The required APIs are always available under MSW and OS X but we must
-        # have GNOME libsecret under Unix to be able to compile this class.
-        find_package(Libsecret REQUIRED)
-        if(NOT LIBSECRET_FOUND)
-            message(WARNING "libsecret not found, wxSecretStore won't be available")
-            wx_option_force_value(wxUSE_SECRETSTORE OFF)
-        endif()
-    endif()
 endif()
 
 wx_add_library(base IS_BASE ${BASE_FILES})

build/cmake/lib/core/CMakeLists.txt

@@ -41,6 +41,11 @@ elseif(WXOSX_COCOA)
     wx_append_sources(CORE_SRC OSX_LOWLEVEL)
     wx_append_sources(CORE_SRC OSX_SHARED)
     wx_append_sources(CORE_SRC OSX_COCOA)
+elseif(WXQT)
+    wx_append_sources(CORE_SRC QT)
+    if(WIN32)
+        wx_append_sources(CORE_SRC QT_WIN32)
+    endif()
 endif()
 
 wx_add_library(core ${CORE_SRC})
@@ -65,6 +70,19 @@ if(WXOSX_COCOA)
     wx_lib_link_libraries(core PUBLIC
         "-framework AudioToolbox"
         )
+    if(wxUSE_WEBKIT)
+        wx_lib_link_libraries(core PUBLIC
+            "-framework WebKit"
+            )
+    endif()
+endif()
+if(WXGTK AND wxUSE_PRIVATE_FONTS)
+    wx_lib_include_directories(core PUBLIC
+        ${FONTCONFIG_INCLUDE_DIR}
+    )
+    wx_lib_link_libraries(core PUBLIC
+        ${FONTCONFIG_LIBRARIES}
+    )
 endif()
 
 wx_finalize_lib(core)

build/cmake/lib/gl/CMakeLists.txt

@@ -11,12 +11,14 @@ include(../../source_groups.cmake)
 
 wx_append_sources(GL_FILES OPENGL_CMN)
 
-if(WIN32)
+if(WXMSW)
     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)
+elseif(WXQT)
+    wx_append_sources(GL_FILES OPENGL_QT)
 endif()
 
 wx_add_library(gl ${GL_FILES})

build/cmake/lib/media/CMakeLists.txt

@@ -17,6 +17,8 @@ elseif(WXOSX_COCOA)
     wx_append_sources(MEDIA_FILES MEDIA_OSX_COCOA)
 elseif(UNIX)
     wx_append_sources(MEDIA_FILES MEDIA_UNIX)
+elseif(WXQT)
+    wx_append_sources(MEDIA_FILES MEDIA_QT)
 endif()
 
 wx_add_library(media ${MEDIA_FILES})
@@ -30,7 +32,26 @@ if(WXOSX_COCOA)
         )
 elseif(UNIX)
     wx_lib_include_directories(media PUBLIC ${GSTREAMER_INCLUDE_DIRS})
+    if(GSTREAMER_INTERFACES_INCLUDE_DIRS)
+        wx_lib_include_directories(media PUBLIC ${GSTREAMER_INTERFACES_INCLUDE_DIRS})
+    endif()
+    if(GSTREAMER_VIDEO_INCLUDE_DIRS)
+        wx_lib_include_directories(media PUBLIC ${GSTREAMER_VIDEO_INCLUDE_DIRS})
+    endif()
+    if(GSTREAMER_PLAYER_INCLUDE_DIRS)
+        wx_lib_include_directories(media PUBLIC ${GSTREAMER_PLAYER_INCLUDE_DIRS})
+    endif()
+
     wx_lib_link_libraries(media PUBLIC ${GSTREAMER_LIBRARIES})
+    if(GSTREAMER_INTERFACES_LIBRARIES)
+        wx_lib_link_libraries(media PUBLIC ${GSTREAMER_INTERFACES_LIBRARIES})
+    endif()
+    if(GSTREAMER_VIDEO_LIBRARIES)
+        wx_lib_link_libraries(media PUBLIC ${GSTREAMER_VIDEO_LIBRARIES})
+    endif()
+    if(GSTREAMER_PLAYER_LIBRARIES)
+        wx_lib_link_libraries(media PUBLIC ${GSTREAMER_PLAYER_LIBRARIES})
+    endif()
 endif()
 
 wx_finalize_lib(media)

build/cmake/modules/FindFontconfig.cmake

@@ -0,0 +1,69 @@
+# - Try to find the  Fontconfig
+# Once done this will define
+#
+#  FONTCONFIG_FOUND - system has Fontconfig
+#  FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers
+#  FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG
+#  FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG
+
+# Copyright (c) 2006,2007 Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products 
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+
+  # in cache already
+  set(FONTCONFIG_FOUND TRUE)
+
+else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
+
+  if (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PC_FONTCONFIG QUIET fontconfig)
+
+    set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER})
+  endif (NOT WIN32)
+
+  find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
+    PATHS
+    ${PC_FONTCONFIG_INCLUDEDIR}
+    ${PC_FONTCONFIG_INCLUDE_DIRS}
+    /usr/X11/include
+  )
+
+  find_library(FONTCONFIG_LIBRARIES NAMES fontconfig
+    PATHS
+    ${PC_FONTCONFIG_LIBDIR}
+    ${PC_FONTCONFIG_LIBRARY_DIRS}
+  )
+
+  include(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR )
+  
+  mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR)
+
+endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)

build/cmake/modules/FindGStreamer.cmake

@@ -22,6 +22,7 @@
 #  gstreamer-interfaces: GSTREAMER_INTERFACES_INCLUDE_DIRS and GSTREAMER_INTERFACES_LIBRARIES
 #  gstreamer-pbutils:    GSTREAMER_PBUTILS_INCLUDE_DIRS and GSTREAMER_PBUTILS_LIBRARIES
 #  gstreamer-video:      GSTREAMER_VIDEO_INCLUDE_DIRS and GSTREAMER_VIDEO_LIBRARIES
+#  gstreamer-player:     GSTREAMER_PLAYER_INCLUDE_DIRS and GSTREAMER_PLAYER_LIBRARIES
 #
 # Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
 #
@@ -48,28 +49,32 @@
 
 find_package(PkgConfig)
 
-# The minimum GStreamer version we support.
+# Determine the version in the library name, default is 1.0
-set(GSTREAMER_MINIMUM_VERSION 0.10.30)
+set(GST_LIB_VERSION 1.0)
+if(DEFINED GStreamer_FIND_VERSION AND GStreamer_FIND_VERSION VERSION_LESS 1.0)
+    set(GST_LIB_VERSION 0.10)
+endif()
 
 # Helper macro to find a GStreamer plugin (or GStreamer itself)
 #   _component_prefix is prepended to the _INCLUDE_DIRS and _LIBRARIES variables (eg. "GSTREAMER_AUDIO")
-#   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer-0.10", or "gstreamer-video-0.10").
+#   _pkgconfig_name is the component's pkg-config name (eg. "gstreamer", or "gstreamer-video").
-#   _header is the component's header, relative to the gstreamer-0.10 directory (eg. "gst/gst.h").
+#   _header is the component's header, relative to the gstreamer-${GST_LIB_VERSION} directory (eg. "gst/gst.h").
-#   _library is the component's library name (eg. "gstreamer-0.10" or "gstvideo-0.10")
+#   _library is the component's library name (eg. "gstreamer" or "gstvideo")
 macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
-    # FIXME: The QUIET keyword can be used once we require CMake 2.8.2.
+    pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name}-${GST_LIB_VERSION})
-    pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
 
     find_path(${_component_prefix}_INCLUDE_DIRS
         NAMES ${_header}
         HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
-        PATH_SUFFIXES gstreamer-0.10
+        PATH_SUFFIXES gstreamer-${GST_LIB_VERSION}
     )
 
     find_library(${_component_prefix}_LIBRARIES
-        NAMES ${_library}
+        NAMES ${_library}-${GST_LIB_VERSION}
         HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
     )
+
+    mark_as_advanced(${_component_prefix}_INCLUDE_DIRS ${_component_prefix}_LIBRARIES)
 endmacro()
 
 # ------------------------
@@ -77,8 +82,8 @@ endmacro()
 # ------------------------
 
 # 1.1. Find headers and libraries
-FIND_GSTREAMER_COMPONENT(GSTREAMER gstreamer-0.10 gst/gst.h gstreamer-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER gstreamer gst/gst.h gstreamer)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-0.10 gst/gst.h gstbase-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base gst/gst.h gstbase)
 
 # 1.2. Check GStreamer version
 if (GSTREAMER_INCLUDE_DIRS)
@@ -98,28 +103,22 @@ if (GSTREAMER_INCLUDE_DIRS)
     endif ()
 endif ()
 
-# FIXME: With CMake 2.8.3 we can just pass GSTREAMER_VERSION to FIND_PACKAGE_HANDLE_STARNDARD_ARGS as VERSION_VAR
-#        and remove the version check here (GSTREAMER_MINIMUM_VERSION would be passed to FIND_PACKAGE).
-set(VERSION_OK TRUE)
-if ("${GSTREAMER_VERSION}" VERSION_LESS "${GSTREAMER_MINIMUM_VERSION}")
-    set(VERSION_OK FALSE)
-endif ()
-
 # -------------------------
 # 2. Find GStreamer plugins
 # -------------------------
 
-FIND_GSTREAMER_COMPONENT(GSTREAMER_APP gstreamer-app-0.10 gst/app/gstappsink.h gstapp-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_APP gstreamer-app gst/app/gstappsink.h gstapp)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_AUDIO gstreamer-audio-0.10 gst/audio/audio.h gstaudio-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_AUDIO gstreamer-audio gst/audio/audio.h gstaudio)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_FFT gstreamer-fft-0.10 gst/fft/gstfft.h gstfft-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_FFT gstreamer-fft gst/fft/gstfft.h gstfft)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_INTERFACES gstreamer-interfaces-0.10 gst/interfaces/mixer.h gstinterfaces-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_INTERFACES gstreamer-interfaces gst/interfaces/mixer.h gstinterfaces)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils-0.10 gst/pbutils/pbutils.h gstpbutils-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils gst/pbutils/pbutils.h gstpbutils)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_VIDEO gstreamer-video-0.10 gst/video/video.h gstvideo-0.10)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_VIDEO gstreamer-video gst/video/video.h gstvideo)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_PLAYER gstreamer-player gst/player/player.h gstplayer)
 
 # ------------------------------------------------
 # 3. Process the COMPONENTS passed to FIND_PACKAGE
 # ------------------------------------------------
-set(_GSTREAMER_REQUIRED_VARS GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES VERSION_OK GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES)
+set(_GSTREAMER_REQUIRED_VARS GSTREAMER_VERSION GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES)
 
 foreach (_component ${GStreamer_FIND_COMPONENTS})
     set(_gst_component "GSTREAMER_${_component}")

build/cmake/modules/FindGTK3.cmake

@@ -29,7 +29,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 find_package(PkgConfig)
-pkg_check_modules(GTK3 gtk+-3.0)
+pkg_check_modules(GTK3 QUIET gtk+-3.0)
 set(VERSION_OK TRUE)
 if (GTK3_VERSION)
 if (GTK3_FIND_VERSION_EXACT)

build/cmake/modules/FindLibSoup.cmake

@@ -52,3 +52,5 @@ endif()
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSoup REQUIRED_VARS LIBSOUP_INCLUDE_DIRS LIBSOUP_LIBRARIES
     VERSION_VAR   PC_LIBSOUP_VERSION)
+
+mark_as_advanced(LIBSOUP_LIBRARIES LIBSOUP_INCLUDE_DIRS)

build/cmake/modules/FindLibsecret.cmake

@@ -30,7 +30,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 find_package(PkgConfig)
-pkg_check_modules(LIBSECRET libsecret-1)
+pkg_check_modules(LIBSECRET QUIET libsecret-1)
 
 set(VERSION_OK TRUE)
 if (LIBSECRET_VERSION)

build/cmake/options.cmake

@@ -23,6 +23,9 @@ wx_option(wxBUILD_COMPATIBILITY
 set(wxBUILD_CUSTOM_SETUP_HEADER_PATH "" CACHE PATH "Include path containing custom wx/setup.h")
 mark_as_advanced(wxBUILD_CUSTOM_SETUP_HEADER_PATH)
 
+wx_option(wxBUILD_DEBUG_LEVEL "Debug Level" Default STRINGS Default 0 1 2)
+mark_as_advanced(wxBUILD_DEBUG_LEVEL)
+
 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")
@@ -68,9 +71,6 @@ 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)")
@@ -208,8 +208,8 @@ 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))
+    if(WIN32)
-        wx_option(wxUSE_GRAPHICS_DIRECT2D "enable Direct2D graphics context" OFF)
+        wx_option(wxUSE_GRAPHICS_DIRECT2D "enable Direct2D graphics context")
     endif()
 endif()
 
@@ -353,9 +353,6 @@ 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(WXMSW)
-    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")
@@ -403,6 +400,7 @@ if(WIN32)
         set(wxUSE_WINRT_DEFAULT OFF)
     endif()
     wx_option(wxUSE_WINRT "enable WinRT support" ${wxUSE_WINRT_DEFAULT})
+    wx_option(wxUSE_ACCESSIBILITY "enable accessibility support")
 endif()
 
 # this one is not really MSW-specific but it exists mainly to be turned off

build/cmake/samples/CMakeLists.txt

@@ -264,13 +264,17 @@ if(WIN32)
 
         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)
+    wx_add_sample(regtest RES regtest.rc DEPENDS wxUSE_REGKEY)
-    endif()
+    wx_add_sample(oleauto DEPENDS wxUSE_OLE)
+
+    if(WXMSW)
+        wx_add_sample(nativdlg nativdlg.cpp nativdlg.h resource.h RES nativdlg.rc)
         #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)
-    wx_add_sample(regtest RES regtest.rc DEPENDS wxUSE_REGKEY)
         wx_add_sample(taskbarbutton DEPENDS wxUSE_TASKBARBUTTON)
+        if(MSVC)
+            wx_add_sample(flash DEPENDS wxUSE_ACTIVEX)
+        endif()
+    endif()
 endif()

build/cmake/setup.cmake

@@ -221,6 +221,7 @@ if(NOT WIN32)
     if(wxUSE_LIBICONV AND NOT APPLE)
         find_package(Iconv REQUIRED)
         set(HAVE_ICONV ON)
+        set(ICONV_CONST " ")
         if(ICONV_SECOND_ARGUMENT_IS_CONST)
             set(ICONV_CONST "const")
         endif()
@@ -554,7 +555,7 @@ endforeach()
 # Check various functions
 foreach(func
     fsync
-    snprintf vsnprintf strnlen
+    snprintf vsnprintf strnlen strtoull
     setpriority
     )
     string(TOUPPER ${func} func_upper)

build/cmake/setup.h.in

@@ -68,6 +68,9 @@
 /* Define this if your version of GTK+ is >= 3.0 */
 #cmakedefine __WXGTK3__ 1
 
+/* Define this if your version of GTK+ is >= 3.90.0 */
+#cmakedefine __WXGTK4__ 1
+
 /* Define this if you want to use GPE features */
 #cmakedefine __WXGPE__ 1
 
@@ -105,12 +108,21 @@
 #cmakedefine __UNIXWARE__ 1
 #cmakedefine __VMS__ 1
 
-#undef __IA64__
+#cmakedefine __IA64__ 1
-#undef __ALPHA__
+#cmakedefine __ALPHA__ 1
+
+/* NanoX (with wxX11) */
+#cmakedefine01 wxUSE_NANOX
+
+/* PowerPC Darwin & Mac OS X */
+#cmakedefine __POWERPC__ 1
 
 /* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
 #undef __Point__
 
+/* MS-DOS with DJGPP */
+#cmakedefine __DOS__ 1
+
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #cmakedefine __WINDOWS__ 1
@@ -123,10 +135,10 @@
 #cmakedefine __GNUWIN32__ 1
 #endif
 #ifndef STRICT
-#undef STRICT
+#cmakedefine STRICT
 #endif
 #ifndef WINVER
-#undef WINVER
+#cmakedefine WINVER
 #endif
 
 /* --- start common options --- */
@@ -640,9 +652,9 @@
 
    Recommended setting: 1 (wxMediaCtrl won't work by default without it).
  */
-#define wxUSE_GSTREAMER 0
+#cmakedefine01 wxUSE_GSTREAMER
 
-#define wxUSE_GSTREAMER_PLAYER 0
+#cmakedefine01 wxUSE_GSTREAMER_PLAYER
 
 /*
    Use XTest extension to implement wxUIActionSimulator?
@@ -652,7 +664,7 @@
 
    Recommended setting: 1, wxUIActionSimulator won't work in wxGTK3 without it.
  */
-#define wxUSE_XTEST 0
+#cmakedefine01 wxUSE_XTEST
 
 /* --- start MSW options --- */
 
@@ -749,39 +761,39 @@
 /*
  * Define if your compiler has <hash_map>
  */
-#undef HAVE_HASH_MAP
+#cmakedefine HAVE_HASH_MAP 1
 /*
  * Define if your compiler has <ext/hash_map>
  */
-#undef HAVE_EXT_HASH_MAP
+#cmakedefine HAVE_EXT_HASH_MAP 1
 /*
  * Define if your compiler has std::hash_map/hash_set
  */
-#undef HAVE_STD_HASH_MAP
+#cmakedefine HAVE_STD_HASH_MAP 1
 /*
  * Define if your compiler has __gnu_cxx::hash_map/hash_set
  */
-#undef HAVE_GNU_CXX_HASH_MAP
+#cmakedefine HAVE_GNU_CXX_HASH_MAP 1
 
 /*
  * Define if your compiler has std::unordered_map
  */
-#undef HAVE_STD_UNORDERED_MAP
+#cmakedefine HAVE_STD_UNORDERED_MAP 1
 
 /*
  * Define if your compiler has std::unordered_set
  */
-#undef HAVE_STD_UNORDERED_SET
+#cmakedefine HAVE_STD_UNORDERED_SET 1
 
 /*
  * Define if your compiler has std::tr1::unordered_map
  */
-#undef HAVE_TR1_UNORDERED_MAP
+#cmakedefine HAVE_TR1_UNORDERED_MAP 1
 
 /*
  * Define if your compiler has std::tr1::unordered_set
  */
-#undef HAVE_TR1_UNORDERED_SET
+#cmakedefine HAVE_TR1_UNORDERED_SET 1
 
 /*
  * Define if your compiler has <tr1/type_traits>
@@ -806,49 +818,49 @@
 /*
  * Define if compiler's visibility support in libstdc++ is broken
  */
-#undef HAVE_BROKEN_LIBSTDCXX_VISIBILITY
+#cmakedefine HAVE_BROKEN_LIBSTDCXX_VISIBILITY
 
 /*
  * The built-in regex supports advanced REs in additional to POSIX's basic
  * and extended. Your system regex probably won't support this, and in this
  * case WX_NO_REGEX_ADVANCED should be defined.
  */
-#undef WX_NO_REGEX_ADVANCED
+#cmakedefine WX_NO_REGEX_ADVANCED
 /*
  * On GNU systems use re_search instead of regexec, since the latter does a
  * strlen on the search text affecting the performance of some operations.
  */
-#undef HAVE_RE_SEARCH
+#cmakedefine HAVE_RE_SEARCH
 /*
  * Use SDL for audio (Unix)
  */
-#define wxUSE_LIBSDL 0
+#cmakedefine01 wxUSE_LIBSDL
 
 /*
  * Compile sound backends as plugins
  */
-#define wxUSE_PLUGINS 0
+#cmakedefine01 wxUSE_PLUGINS
 
 /*
  * Use GTK print for printing under GTK+ 2.10+
  */
-#define wxUSE_GTKPRINT 0
+#cmakedefine01 wxUSE_GTKPRINT
 /*
  * Use GNOME VFS for MIME types
  */
-#define wxUSE_LIBGNOMEVFS 0
+#cmakedefine01 wxUSE_LIBGNOMEVFS
 /*
  * Use libnotify library.
  */
-#define wxUSE_LIBNOTIFY 0
+#cmakedefine01 wxUSE_LIBNOTIFY
 /*
  * Use libnotify 0.7+ API.
  */
-#define wxUSE_LIBNOTIFY_0_7 0
+#cmakedefine01 wxUSE_LIBNOTIFY_0_7
 /*
  * Use libXpm
  */
-#define wxHAVE_LIB_XPM 0
+#cmakedefine01 wxHAVE_LIB_XPM
 /*
  * Define if you have pthread_cleanup_push/pop()
  */
@@ -860,7 +872,7 @@
 /*
  * Define if large (64 bit file offsets) files are supported.
  */
-#undef HAVE_LARGEFILE_SUPPORT
+#cmakedefine HAVE_LARGEFILE_SUPPORT 1
 
 /*
  * Use OpenGL
@@ -870,22 +882,17 @@
 /*
  * Use MS HTML Help via libmspack (Unix)
  */
-#define wxUSE_LIBMSPACK 0
+#cmakedefine01 wxUSE_LIBMSPACK
 
 /*
  * Matthews garbage collection (used for MrEd?)
  */
-#define WXGARBAGE_COLLECTION_ON 0
+#cmakedefine01 WXGARBAGE_COLLECTION_ON
 
 /*
  * wxWebKitCtrl
  */
-#define wxUSE_WEBKIT 0
+#cmakedefine01 wxUSE_WEBKIT
-
-/*
- * Objective-C class name uniquifying
- */
-#define wxUSE_OBJC_UNIQUIFYING 0
 
 /*
  * The const keyword is being introduced more in wxWindows.
@@ -901,7 +908,7 @@
 /*
  * use the session manager to detect KDE/GNOME
  */
-#define wxUSE_DETECT_SM     0
+#cmakedefine01 wxUSE_DETECT_SM
 
 
 /* define with the name of timezone variable */
@@ -921,13 +928,16 @@
 
 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
-#undef WX_GETTIMEOFDAY_NO_TZ
+#cmakedefine WX_GETTIMEOFDAY_NO_TZ 1
 
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #cmakedefine WX_GMTOFF_IN_TM 1
 
+/* check if nl_langinfo() can be called with argument _NL_TIME_FIRST_WEEKDAY */
+#cmakedefine HAVE_NL_TIME_FIRST_WEEKDAY 1
+
 /* Define if you have poll(2) function */
-#undef HAVE_POLL
+#cmakedefine HAVE_POLL 1
 
 /* Define if you have pw_gecos field in struct passwd */
 #cmakedefine HAVE_PW_GECOS 1
@@ -954,7 +964,7 @@
 #cmakedefine HAVE_NANOSLEEP 1
 
 /* Define if you have sched_yield */
-#undef HAVE_SCHED_YIELD
+#cmakedefine HAVE_SCHED_YIELD 1
 
 /* Define if you have pthread_mutexattr_t and functions to work with it */
 #cmakedefine HAVE_PTHREAD_MUTEXATTR_T 1
@@ -966,13 +976,13 @@
 #cmakedefine HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
 
 /* Define if you have pthread_cancel */
-#undef HAVE_PTHREAD_CANCEL
+#cmakedefine HAVE_PTHREAD_CANCEL 1
 
 /* Define if you have pthread_mutex_timedlock */
-#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK 1
 
 /* Define if you have pthread_attr_setstacksize */
-#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
+#cmakedefine HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 
 /* Define if you have shl_load() */
 #cmakedefine HAVE_SHL_LOAD 1
@@ -981,7 +991,7 @@
 #cmakedefine HAVE_SNPRINTF 1
 
 /* Define if you have snprintf() declaration in the header */
-#undef HAVE_SNPRINTF_DECL
+#cmakedefine HAVE_SNPRINTF_DECL 1
 
 /* Define if you have a snprintf() which supports positional arguments
    (defined in the unix98 standard) */
@@ -997,30 +1007,30 @@
 #cmakedefine HAVE_STATVFS 1
 
 /* Define if you have strtoull() and strtoll() */
-#undef HAVE_STRTOULL
+#cmakedefine HAVE_STRTOULL 1
 
 /* Define if you have all functions to set thread priority */
-#undef HAVE_THREAD_PRIORITY_FUNCTIONS
+#cmakedefine HAVE_THREAD_PRIORITY_FUNCTIONS 1
 
 /* Define if you have vsnprintf() */
 #cmakedefine HAVE_VSNPRINTF 1
 
 /* Define if you have vsnprintf() declaration in the header */
-#undef HAVE_VSNPRINTF_DECL
+#cmakedefine HAVE_VSNPRINTF_DECL 1
 
 /* Define if you have a _broken_ vsnprintf() declaration in the header,
  * with 'char*' for the 3rd parameter instead of 'const char*' */
-#undef HAVE_BROKEN_VSNPRINTF_DECL
+#cmakedefine HAVE_BROKEN_VSNPRINTF_DECL 1
 
 /* Define if you have a _broken_ vsscanf() declaration in the header,
  * with 'char*' for the 1st parameter instead of 'const char*' */
-#undef HAVE_BROKEN_VSSCANF_DECL
+#cmakedefine HAVE_BROKEN_VSSCANF_DECL 1
 
 /* Define if you have vsscanf() */
 #cmakedefine HAVE_VSSCANF 1
 
 /* Define if you have vsscanf() declaration in the header */
-#undef HAVE_VSSCANF_DECL
+#cmakedefine HAVE_VSSCANF_DECL 1
 
 /* Define if you have usleep() */
 #cmakedefine HAVE_USLEEP 1
@@ -1092,7 +1102,7 @@
 #cmakedefine HAVE_FLOCK 1
 
 /* Define if you have getaddrinfo function. */
-#undef HAVE_GETADDRINFO
+#cmakedefine HAVE_GETADDRINFO 1
 
 /* Define if you have a gethostbyname_r function taking 6 arguments. */
 #cmakedefine HAVE_FUNC_GETHOSTBYNAME_R_6 1
@@ -1110,13 +1120,13 @@
 #cmakedefine HAVE_GETHOSTNAME 1
 
 /* Define if you have a getservbyname_r function taking 6 arguments. */
-#undef HAVE_FUNC_GETSERVBYNAME_R_6
+#cmakedefine HAVE_FUNC_GETSERVBYNAME_R_6 1
 
 /* Define if you have a getservbyname_r function taking 5 arguments. */
-#undef HAVE_FUNC_GETSERVBYNAME_R_5
+#cmakedefine HAVE_FUNC_GETSERVBYNAME_R_5 1
 
 /* Define if you have a getservbyname_r function taking 4 arguments. */
-#undef HAVE_FUNC_GETSERVBYNAME_R_4
+#cmakedefine HAVE_FUNC_GETSERVBYNAME_R_4 1
 
 /* Define if you only have a getservbyname function */
 #cmakedefine HAVE_GETSERVBYNAME 1
@@ -1149,10 +1159,10 @@
 #cmakedefine HAVE_STRTOK_R 1
 
 /* Define if you have thr_setconcurrency function */
-#undef HAVE_THR_SETCONCURRENCY
+#cmakedefine HAVE_THR_SETCONCURRENCY 1
 
 /* Define if you have pthread_setconcurrency function */
-#undef HAVE_PTHREAD_SET_CONCURRENCY
+#cmakedefine HAVE_PTHREAD_SET_CONCURRENCY 1
 
 /* Define if you have the uname function.  */
 #cmakedefine HAVE_UNAME 1
@@ -1161,10 +1171,10 @@
 #cmakedefine HAVE_UNSETENV 1
 
 /* Define if you have the <X11/XKBlib.h> header file.  */
-#undef HAVE_X11_XKBLIB_H
+#cmakedefine HAVE_X11_XKBLIB_H 1
 
 /* Define if you have the <X11/extensions/xf86vmode.h> header file.  */
-#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
+#cmakedefine HAVE_X11_EXTENSIONS_XF86VMODE_H 1
 
 /* Define if you have the <sched.h> header file.  */
 #cmakedefine HAVE_SCHED_H 1
@@ -1182,13 +1192,13 @@
 #cmakedefine HAVE_WCSTR_H 1
 
 /* Define if you have <widec.h> (Solaris only) */
-#undef HAVE_WIDEC_H
+#cmakedefine HAVE_WIDEC_H 1
 
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #cmakedefine HAVE_ICONV 1
 
 /* Define as "const" if the declaration of iconv() needs const.  */
-#define ICONV_CONST @ICONV_CONST@
+#cmakedefine ICONV_CONST @ICONV_CONST@
 
 /* Define if you have the <langinfo.h> header file.  */
 #cmakedefine HAVE_LANGINFO_H 1
@@ -1215,28 +1225,28 @@
 #cmakedefine HAVE_VSWPRINTF 1
 
 /* Define this if you have _vsnwprintf */
-#undef HAVE__VSNWPRINTF
+#cmakedefine HAVE__VSNWPRINTF 1
 
 /* vswscanf() */
 #cmakedefine HAVE_VSWSCANF 1
 
 /* Define if fseeko and ftello are available.  */
-#undef HAVE_FSEEKO
+#cmakedefine HAVE_FSEEKO 1
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
-#undef HAVE_XIM
+#cmakedefine HAVE_XIM 1
 
 /* Define this if you have X11/extensions/shape.h */
-#undef HAVE_XSHAPE
+#cmakedefine HAVE_XSHAPE 1
 
 /* Define this if you have type SPBCDATA */
-#undef HAVE_SPBCDATA
+#cmakedefine HAVE_SPBCDATA 1
 
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
-#undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+#cmakedefine HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE 1
 
 /* Define if you have Pango xft support */
-#undef HAVE_PANGO_XFT
+#cmakedefine HAVE_PANGO_XFT 1
 
 /* Define if you have the <sys/select.h> header file.  */
 #cmakedefine HAVE_SYS_SELECT_H 1
@@ -1279,10 +1289,10 @@
 
 /* When using an external jpeg library and the Windows headers already define
  * boolean, define to the type used by the jpeg library for boolean.  */
-#undef wxHACK_BOOLEAN
+#cmakedefine wxHACK_BOOLEAN
 
 /* Define if the header pbt.h is missing.  */
-#undef NEED_PBT_H
+#cmakedefine NEED_PBT_H
 
 #endif /* __WIN32__ */
 
@@ -1297,9 +1307,10 @@
  */
 
 /* wxLogChain class available */
-#define wxHAS_LOG_CHAIN
+#cmakedefine wxHAS_LOG_CHAIN
 
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
-#undef wxHAS_WORKING_GTK_DC_BLIT
+#cmakedefine wxHAS_WORKING_GTK_DC_BLIT
 
 #endif /* __WX_SETUP_H__ */
+

build/cmake/toolkit.cmake

@@ -46,6 +46,8 @@ if(wxBUILD_TOOLKIT MATCHES "^gtk*")
     set(WXGTK ON)
 elseif(wxBUILD_TOOLKIT MATCHES "^osx*")
     set(WXOSX ON)
+elseif(wxBUILD_TOOLKIT MATCHES "qt")
+    set(WXQT ON)
 endif()
 
 set(wxTOOLKIT_DEFINITIONS __WX${toolkit_upper}__)
@@ -113,7 +115,19 @@ if(WXGTK)
     endif()
 endif()
 
+if(WXQT)
+    set(QT_COMPONENTS Core Widgets Gui OpenGL Test)
+    foreach(QT_COMPONENT ${QT_COMPONENTS})
+        find_package(Qt5 COMPONENTS ${QT_COMPONENT} REQUIRED)
+        list(APPEND wxTOOLKIT_INCLUDE_DIRS ${Qt5${QT_COMPONENT}_INCLUDE_DIRS})
+        list(APPEND wxTOOLKIT_LIBRARIES ${Qt5${QT_COMPONENT}_LIBRARIES})
+        list(APPEND wxTOOLKIT_DEFINITIONS ${Qt5${QT_COMPONENT}_COMPILE_DEFINITIONS})
+    endforeach()
+    set(wxTOOLKIT_VERSION ${Qt5Core_VERSION})
+endif()
+
 if(APPLE)
     list(APPEND wxTOOLKIT_DEFINITIONS __WXMAC__ __WXOSX__)
 endif()
+
 endif() # wxUSE_GUI

build/files

@@ -189,7 +189,29 @@ BASE_OSX_NOTWXMAC_HDR =
 
 ## Qt
 
+QT_WIN32_SRC=
+    src/msw/ole/automtn.cpp
+    src/msw/ole/comimpl.cpp
+    src/msw/ole/oleutils.cpp
+    src/msw/ole/safearray.cpp
+    src/msw/ole/uuid.cpp
+    src/msw/dialup.cpp
+    src/msw/dib.cpp
+    src/msw/joystick.cpp
+    src/msw/sound.cpp
+
+QT_WIN32_HDR=
+    wx/msw/ole/automtn.h
+    wx/msw/ole/comimpl.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/safearray.h
+    wx/msw/ole/uuid.h
+    wx/msw/dib.h
+    wx/msw/joystick.h
+    wx/msw/sound.h
+
 QT_HDR =
+    $(QT_PLATFORM_HDR)
     wx/generic/activityindicator.h
     wx/generic/animate.h
     wx/generic/caret.h
@@ -204,8 +226,6 @@ QT_HDR =
     wx/qt/accel.h
     wx/qt/anybutton.h
     wx/qt/app.h
-    wx/qt/apptbase.h
-    wx/qt/apptrait.h
     wx/qt/bitmap.h
     wx/qt/bmpbuttn.h
     wx/qt/brush.h
@@ -220,7 +240,6 @@ QT_HDR =
     wx/qt/colour.h
     wx/qt/combobox.h
     wx/qt/control.h
-    wx/qt/converter.h
     wx/qt/ctrlsub.h
     wx/qt/cursor.h
     wx/qt/dataform.h
@@ -258,7 +277,6 @@ QT_HDR =
     wx/qt/popupwin.h
     wx/qt/printdlg.h
     wx/qt/printqt.h
-    wx/qt/private/winevent.h
     wx/qt/radiobox.h
     wx/qt/radiobut.h
     wx/qt/region.h
@@ -273,17 +291,15 @@ QT_HDR =
     wx/qt/statusbar.h
     wx/qt/taskbar.h
     wx/qt/textctrl.h
-    wx/qt/textdlg.h
     wx/qt/textentry.h
     wx/qt/tglbtn.h
-    wx/qt/timer.h
     wx/qt/toolbar.h
     wx/qt/tooltip.h
     wx/qt/toplevel.h
-    wx/qt/utils.h
     wx/qt/window.h
 
 QT_SRC=
+    $(QT_PLATFORM_SRC)
     src/common/taskbarcmn.cpp
     src/generic/activityindicator.cpp
     src/generic/animateg.cpp
@@ -316,7 +332,6 @@ QT_SRC=
     src/qt/combobox.cpp
     src/qt/control.cpp
     src/qt/converter.cpp
-    src/qt/converter.cpp
     src/qt/ctrlsub.cpp
     src/qt/cursor.cpp
     src/qt/dataobj.cpp
@@ -383,6 +398,12 @@ QT_SRC=
 MEDIA_QT_SRC=
     src/qt/mediactrl.cpp
 
+OPENGL_QT_HDR=
+    wx/qt/glcanvas.h
+
+OPENGL_QT_SRC=
+    src/qt/glcanvas.cpp
+
 ## Common
 
 BASE_CMN_SRC =
@@ -967,7 +988,6 @@ GUI_CMN_HDR =
     wx/dirctrl.h
     wx/dirdlg.h
     wx/display.h
-    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
@@ -1201,7 +1221,6 @@ XWIN_LOWLEVEL_SRC =
     src/generic/caret.cpp
     src/generic/imaglist.cpp
     src/unix/dialup.cpp
-    src/unix/displayx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/joystick.cpp
@@ -1466,6 +1485,7 @@ GTK2_HDR =
 
 GTK1_LOWLEVEL_SRC =
     $(XWIN_LOWLEVEL_SRC)
+    src/unix/displayx11.cpp
     src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/generic/textmeasure.cpp
@@ -1631,6 +1651,7 @@ GTK1_HDR =
 
 MOTIF_LOWLEVEL_SRC =
     $(XWIN_LOWLEVEL_SRC)
+    src/unix/displayx11.cpp
     src/generic/textmeasure.cpp
     src/x11/bitmap.cpp
     src/x11/brush.cpp
@@ -1794,6 +1815,7 @@ MOTIF_HDR =
 
 X11_LOWLEVEL_SRC =
     $(XWIN_LOWLEVEL_SRC)
+    src/unix/displayx11.cpp
     src/generic/icon.cpp
     src/generic/textmeasure.cpp
     src/generic/timer.cpp
@@ -1862,7 +1884,6 @@ X11_LOWLEVEL_HDR =
 
 MSW_LOWLEVEL_SRC =
     src/common/taskbarcmn.cpp
-    src/generic/activityindicator.cpp
     src/msw/aboutdlg.cpp
     src/msw/app.cpp
     src/msw/bitmap.cpp
@@ -1881,6 +1902,7 @@ MSW_LOWLEVEL_SRC =
     src/msw/dib.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
+    src/msw/evtloop.cpp
     src/msw/font.cpp
     src/msw/fontenum.cpp
     src/msw/fontutil.cpp
@@ -1929,7 +1951,7 @@ MSW_LOWLEVEL_SRC =
     src/msw/window.cpp
 
 MSW_LOWLEVEL_HDR =
-    wx/generic/activityindicator.h
+    wx/msw/evtloop.h
     wx/msw/helpchm.h
     wx/msw/helpwin.h
     wx/msw/htmlhelp.h
@@ -1942,6 +1964,7 @@ MSW_LOWLEVEL_HDR =
     wx/msw/uxtheme.h
 
 MSW_SRC =
+    src/generic/activityindicator.cpp
     src/generic/animateg.cpp
     src/generic/clrpickerg.cpp
     src/generic/collpaneg.cpp
@@ -1971,7 +1994,6 @@ MSW_SRC =
     src/msw/dialog.cpp
     src/msw/dirdlg.cpp
     src/msw/dragimag.cpp
-    src/msw/evtloop.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge.cpp
@@ -2013,6 +2035,7 @@ MSW_SRC =
     src/msw/treectrl.cpp
 
 MSW_HDR =
+    wx/generic/activityindicator.h
     wx/generic/animate.h
     wx/generic/clrpickerg.h
     wx/generic/collpaneg.h
@@ -2053,7 +2076,6 @@ MSW_HDR =
     wx/msw/dirdlg.h
     wx/msw/dragimag.h
     wx/msw/enhmeta.h
-    wx/msw/evtloop.h
     wx/msw/filedlg.h
     wx/msw/font.h
     wx/msw/frame.h
@@ -2234,7 +2256,6 @@ OSX_LOWLEVEL_SRC =
     src/osx/brush.cpp
     src/osx/dialog_osx.cpp
     src/osx/fontutil.cpp
-    src/osx/imaglist.cpp
     src/osx/minifram.cpp
     src/osx/nonownedwnd_osx.cpp
     src/osx/palette.cpp
@@ -2247,7 +2268,6 @@ OSX_LOWLEVEL_SRC =
     src/osx/core/bitmap.cpp
     src/osx/core/colour.cpp
     src/osx/core/dcmemory.cpp
-    src/osx/core/display.cpp
     src/osx/core/fontenum.cpp
     src/osx/core/hid.cpp
     src/osx/core/printmac.cpp
@@ -2278,6 +2298,7 @@ OSX_COMMON_SRC =
     src/osx/slider_osx.cpp
     src/osx/spinbutt_osx.cpp
     src/osx/srchctrl_osx.cpp
+    src/osx/statbmp_osx.cpp
     src/osx/statbox_osx.cpp
     src/osx/statline_osx.cpp
     src/osx/stattext_osx.cpp
@@ -2325,6 +2346,7 @@ OSX_COMMON_SRC =
     src/generic/fontdlgg.cpp
     src/generic/fontpickerg.cpp
     src/generic/icon.cpp
+    src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
@@ -2371,7 +2393,6 @@ OSX_SHARED_HDR =
     wx/osx/fontdlg.h
     wx/osx/frame.h
     wx/osx/gauge.h
-    wx/osx/imaglist.h
     wx/osx/listbox.h
     wx/osx/listctrl.h
     wx/osx/mdi.h
@@ -2422,6 +2443,7 @@ OSX_SHARED_HDR =
     wx/generic/fontdlgg.h
     wx/generic/fontpickerg.h
     wx/generic/icon.h
+    wx/generic/imaglist.h
     wx/generic/listctrl.h
     wx/generic/prntdlgg.h
     wx/generic/statusbr.h
@@ -2467,6 +2489,7 @@ OSX_COCOA_SRC =
     src/osx/cocoa/slider.mm
     src/osx/cocoa/spinbutt.mm
     src/osx/cocoa/srchctrl.mm
+    src/osx/cocoa/statbmp.mm
     src/osx/cocoa/statbox.mm
     src/osx/cocoa/statline.mm
     src/osx/cocoa/stattext.mm
@@ -2476,6 +2499,7 @@ OSX_COCOA_SRC =
     src/osx/cocoa/toolbar.mm
     src/osx/cocoa/tooltip.mm
     src/osx/cocoa/window.mm
+    src/osx/core/display.cpp
     src/osx/core/hidjoystick.cpp
     src/osx/core/sound.cpp
     src/osx/dataview_osx.cpp
@@ -2512,7 +2536,6 @@ OSX_IPHONE_SRC =
     $(OSX_COMMON_SRC)
     src/generic/animateg.cpp
     src/generic/regiong.cpp
-    src/osx/cocoa/stdpaths.mm
     src/osx/core/sound.cpp
     src/osx/iphone/anybutton.mm
     src/osx/iphone/button.mm
@@ -2525,6 +2548,7 @@ OSX_IPHONE_SRC =
     src/osx/iphone/scrolbar.mm
     src/osx/iphone/settings.mm
     src/osx/iphone/slider.mm
+    src/osx/iphone/statbmp.mm
     src/osx/iphone/stattext.mm
     src/osx/iphone/textctrl.mm
     src/osx/iphone/toolbar.mm

build/msw/makefile.bcc

@@ -1851,8 +1851,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_automtn.obj \
 	$(OBJS)\monodll_notifmsgrt.obj \
-	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_uuid.obj \
+	$(OBJS)\monodll_evtloop.obj \
 	$(OBJS)\monodll_clrpickerg.obj \
 	$(OBJS)\monodll_collpaneg.obj \
 	$(OBJS)\monodll_filepickerg.obj \
@@ -1874,7 +1874,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_dialog.obj \
 	$(OBJS)\monodll_dirdlg.obj \
 	$(OBJS)\monodll_dragimag.obj \
-	$(OBJS)\monodll_evtloop.obj \
 	$(OBJS)\monodll_filedlg.obj \
 	$(OBJS)\monodll_frame.obj \
 	$(OBJS)\monodll_msw_gauge.obj \
@@ -1922,6 +1921,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datetimectrl.obj \
 	$(OBJS)\monodll_timectrl.obj \
 	$(OBJS)\monodll_datecontrols.obj \
+	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_msw_checklst.obj \
 	$(OBJS)\monodll_msw_fdrepdlg.obj \
 	$(OBJS)\monodll_fontdlg.obj \
@@ -2192,9 +2192,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_automtn.obj \
 	$(OBJS)\monodll_notifmsgrt.obj \
-	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_uuid.obj \
 	$(OBJS)\monodll_evtloop.obj \
+	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_generic_accel.obj \
 	$(OBJS)\monodll_clrpickerg.obj \
 	$(OBJS)\monodll_collpaneg.obj \
@@ -2680,8 +2680,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_automtn.obj \
 	$(OBJS)\monolib_notifmsgrt.obj \
-	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_uuid.obj \
+	$(OBJS)\monolib_evtloop.obj \
 	$(OBJS)\monolib_clrpickerg.obj \
 	$(OBJS)\monolib_collpaneg.obj \
 	$(OBJS)\monolib_filepickerg.obj \
@@ -2703,7 +2703,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_dialog.obj \
 	$(OBJS)\monolib_dirdlg.obj \
 	$(OBJS)\monolib_dragimag.obj \
-	$(OBJS)\monolib_evtloop.obj \
 	$(OBJS)\monolib_filedlg.obj \
 	$(OBJS)\monolib_frame.obj \
 	$(OBJS)\monolib_msw_gauge.obj \
@@ -2751,6 +2750,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datetimectrl.obj \
 	$(OBJS)\monolib_timectrl.obj \
 	$(OBJS)\monolib_datecontrols.obj \
+	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_msw_checklst.obj \
 	$(OBJS)\monolib_msw_fdrepdlg.obj \
 	$(OBJS)\monolib_fontdlg.obj \
@@ -3021,9 +3021,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_automtn.obj \
 	$(OBJS)\monolib_notifmsgrt.obj \
-	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_uuid.obj \
 	$(OBJS)\monolib_evtloop.obj \
+	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_generic_accel.obj \
 	$(OBJS)\monolib_clrpickerg.obj \
 	$(OBJS)\monolib_collpaneg.obj \
@@ -3384,8 +3384,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_sound.obj \
 	$(OBJS)\coredll_automtn.obj \
 	$(OBJS)\coredll_notifmsgrt.obj \
-	$(OBJS)\coredll_activityindicator.obj \
 	$(OBJS)\coredll_uuid.obj \
+	$(OBJS)\coredll_evtloop.obj \
 	$(OBJS)\coredll_clrpickerg.obj \
 	$(OBJS)\coredll_collpaneg.obj \
 	$(OBJS)\coredll_filepickerg.obj \
@@ -3407,7 +3407,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_dialog.obj \
 	$(OBJS)\coredll_dirdlg.obj \
 	$(OBJS)\coredll_dragimag.obj \
-	$(OBJS)\coredll_evtloop.obj \
 	$(OBJS)\coredll_filedlg.obj \
 	$(OBJS)\coredll_frame.obj \
 	$(OBJS)\coredll_msw_gauge.obj \
@@ -3455,6 +3454,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datetimectrl.obj \
 	$(OBJS)\coredll_timectrl.obj \
 	$(OBJS)\coredll_datecontrols.obj \
+	$(OBJS)\coredll_activityindicator.obj \
 	$(OBJS)\coredll_msw_checklst.obj \
 	$(OBJS)\coredll_msw_fdrepdlg.obj \
 	$(OBJS)\coredll_fontdlg.obj \
@@ -3725,9 +3725,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_sound.obj \
 	$(OBJS)\coredll_automtn.obj \
 	$(OBJS)\coredll_notifmsgrt.obj \
-	$(OBJS)\coredll_activityindicator.obj \
 	$(OBJS)\coredll_uuid.obj \
 	$(OBJS)\coredll_evtloop.obj \
+	$(OBJS)\coredll_animateg.obj \
 	$(OBJS)\coredll_generic_accel.obj \
 	$(OBJS)\coredll_clrpickerg.obj \
 	$(OBJS)\coredll_collpaneg.obj \
@@ -4054,8 +4054,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_sound.obj \
 	$(OBJS)\corelib_automtn.obj \
 	$(OBJS)\corelib_notifmsgrt.obj \
-	$(OBJS)\corelib_activityindicator.obj \
 	$(OBJS)\corelib_uuid.obj \
+	$(OBJS)\corelib_evtloop.obj \
 	$(OBJS)\corelib_clrpickerg.obj \
 	$(OBJS)\corelib_collpaneg.obj \
 	$(OBJS)\corelib_filepickerg.obj \
@@ -4077,7 +4077,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_dialog.obj \
 	$(OBJS)\corelib_dirdlg.obj \
 	$(OBJS)\corelib_dragimag.obj \
-	$(OBJS)\corelib_evtloop.obj \
 	$(OBJS)\corelib_filedlg.obj \
 	$(OBJS)\corelib_frame.obj \
 	$(OBJS)\corelib_msw_gauge.obj \
@@ -4125,6 +4124,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datetimectrl.obj \
 	$(OBJS)\corelib_timectrl.obj \
 	$(OBJS)\corelib_datecontrols.obj \
+	$(OBJS)\corelib_activityindicator.obj \
 	$(OBJS)\corelib_msw_checklst.obj \
 	$(OBJS)\corelib_msw_fdrepdlg.obj \
 	$(OBJS)\corelib_fontdlg.obj \
@@ -4395,9 +4395,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_sound.obj \
 	$(OBJS)\corelib_automtn.obj \
 	$(OBJS)\corelib_notifmsgrt.obj \
-	$(OBJS)\corelib_activityindicator.obj \
 	$(OBJS)\corelib_uuid.obj \
 	$(OBJS)\corelib_evtloop.obj \
+	$(OBJS)\corelib_animateg.obj \
 	$(OBJS)\corelib_generic_accel.obj \
 	$(OBJS)\corelib_clrpickerg.obj \
 	$(OBJS)\corelib_collpaneg.obj \
@@ -6934,9 +6934,6 @@ $(OBJS)\monodll_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp
 $(OBJS)\monodll_customdraw.obj: ..\..\src\msw\customdraw.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\customdraw.cpp
 
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
 $(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
@@ -7888,18 +7885,13 @@ $(OBJS)\monodll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -7928,8 +7920,13 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -9478,9 +9475,6 @@ $(OBJS)\monolib_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp
 $(OBJS)\monolib_customdraw.obj: ..\..\src\msw\customdraw.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\customdraw.cpp
 
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
 $(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
@@ -10432,18 +10426,13 @@ $(OBJS)\monolib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -10472,8 +10461,13 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -12436,9 +12430,6 @@ $(OBJS)\coredll_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp
 $(OBJS)\coredll_customdraw.obj: ..\..\src\msw\customdraw.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\customdraw.cpp
 
-$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
 $(OBJS)\coredll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
@@ -12940,18 +12931,13 @@ $(OBJS)\coredll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -12980,8 +12966,13 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -14167,9 +14158,6 @@ $(OBJS)\corelib_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp
 $(OBJS)\corelib_customdraw.obj: ..\..\src\msw\customdraw.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\customdraw.cpp
 
-$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
 $(OBJS)\corelib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
@@ -14671,18 +14659,13 @@ $(OBJS)\corelib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -14711,8 +14694,13 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"

build/msw/makefile.gcc

@@ -1877,8 +1877,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.o \
 	$(OBJS)\monodll_automtn.o \
 	$(OBJS)\monodll_notifmsgrt.o \
-	$(OBJS)\monodll_activityindicator.o \
 	$(OBJS)\monodll_uuid.o \
+	$(OBJS)\monodll_evtloop.o \
 	$(OBJS)\monodll_clrpickerg.o \
 	$(OBJS)\monodll_collpaneg.o \
 	$(OBJS)\monodll_filepickerg.o \
@@ -1900,7 +1900,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_dialog.o \
 	$(OBJS)\monodll_dirdlg.o \
 	$(OBJS)\monodll_dragimag.o \
-	$(OBJS)\monodll_evtloop.o \
 	$(OBJS)\monodll_filedlg.o \
 	$(OBJS)\monodll_frame.o \
 	$(OBJS)\monodll_msw_gauge.o \
@@ -1948,6 +1947,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datetimectrl.o \
 	$(OBJS)\monodll_timectrl.o \
 	$(OBJS)\monodll_datecontrols.o \
+	$(OBJS)\monodll_activityindicator.o \
 	$(OBJS)\monodll_msw_checklst.o \
 	$(OBJS)\monodll_msw_fdrepdlg.o \
 	$(OBJS)\monodll_fontdlg.o \
@@ -2220,9 +2220,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.o \
 	$(OBJS)\monodll_automtn.o \
 	$(OBJS)\monodll_notifmsgrt.o \
-	$(OBJS)\monodll_activityindicator.o \
 	$(OBJS)\monodll_uuid.o \
 	$(OBJS)\monodll_evtloop.o \
+	$(OBJS)\monodll_animateg.o \
 	$(OBJS)\monodll_generic_accel.o \
 	$(OBJS)\monodll_clrpickerg.o \
 	$(OBJS)\monodll_collpaneg.o \
@@ -2712,8 +2712,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.o \
 	$(OBJS)\monolib_automtn.o \
 	$(OBJS)\monolib_notifmsgrt.o \
-	$(OBJS)\monolib_activityindicator.o \
 	$(OBJS)\monolib_uuid.o \
+	$(OBJS)\monolib_evtloop.o \
 	$(OBJS)\monolib_clrpickerg.o \
 	$(OBJS)\monolib_collpaneg.o \
 	$(OBJS)\monolib_filepickerg.o \
@@ -2735,7 +2735,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_dialog.o \
 	$(OBJS)\monolib_dirdlg.o \
 	$(OBJS)\monolib_dragimag.o \
-	$(OBJS)\monolib_evtloop.o \
 	$(OBJS)\monolib_filedlg.o \
 	$(OBJS)\monolib_frame.o \
 	$(OBJS)\monolib_msw_gauge.o \
@@ -2783,6 +2782,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datetimectrl.o \
 	$(OBJS)\monolib_timectrl.o \
 	$(OBJS)\monolib_datecontrols.o \
+	$(OBJS)\monolib_activityindicator.o \
 	$(OBJS)\monolib_msw_checklst.o \
 	$(OBJS)\monolib_msw_fdrepdlg.o \
 	$(OBJS)\monolib_fontdlg.o \
@@ -3055,9 +3055,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.o \
 	$(OBJS)\monolib_automtn.o \
 	$(OBJS)\monolib_notifmsgrt.o \
-	$(OBJS)\monolib_activityindicator.o \
 	$(OBJS)\monolib_uuid.o \
 	$(OBJS)\monolib_evtloop.o \
+	$(OBJS)\monolib_animateg.o \
 	$(OBJS)\monolib_generic_accel.o \
 	$(OBJS)\monolib_clrpickerg.o \
 	$(OBJS)\monolib_collpaneg.o \
@@ -3432,8 +3432,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_sound.o \
 	$(OBJS)\coredll_automtn.o \
 	$(OBJS)\coredll_notifmsgrt.o \
-	$(OBJS)\coredll_activityindicator.o \
 	$(OBJS)\coredll_uuid.o \
+	$(OBJS)\coredll_evtloop.o \
 	$(OBJS)\coredll_clrpickerg.o \
 	$(OBJS)\coredll_collpaneg.o \
 	$(OBJS)\coredll_filepickerg.o \
@@ -3455,7 +3455,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_dialog.o \
 	$(OBJS)\coredll_dirdlg.o \
 	$(OBJS)\coredll_dragimag.o \
-	$(OBJS)\coredll_evtloop.o \
 	$(OBJS)\coredll_filedlg.o \
 	$(OBJS)\coredll_frame.o \
 	$(OBJS)\coredll_msw_gauge.o \
@@ -3503,6 +3502,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datetimectrl.o \
 	$(OBJS)\coredll_timectrl.o \
 	$(OBJS)\coredll_datecontrols.o \
+	$(OBJS)\coredll_activityindicator.o \
 	$(OBJS)\coredll_msw_checklst.o \
 	$(OBJS)\coredll_msw_fdrepdlg.o \
 	$(OBJS)\coredll_fontdlg.o \
@@ -3775,9 +3775,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_sound.o \
 	$(OBJS)\coredll_automtn.o \
 	$(OBJS)\coredll_notifmsgrt.o \
-	$(OBJS)\coredll_activityindicator.o \
 	$(OBJS)\coredll_uuid.o \
 	$(OBJS)\coredll_evtloop.o \
+	$(OBJS)\coredll_animateg.o \
 	$(OBJS)\coredll_generic_accel.o \
 	$(OBJS)\coredll_clrpickerg.o \
 	$(OBJS)\coredll_collpaneg.o \
@@ -4110,8 +4110,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_sound.o \
 	$(OBJS)\corelib_automtn.o \
 	$(OBJS)\corelib_notifmsgrt.o \
-	$(OBJS)\corelib_activityindicator.o \
 	$(OBJS)\corelib_uuid.o \
+	$(OBJS)\corelib_evtloop.o \
 	$(OBJS)\corelib_clrpickerg.o \
 	$(OBJS)\corelib_collpaneg.o \
 	$(OBJS)\corelib_filepickerg.o \
@@ -4133,7 +4133,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_dialog.o \
 	$(OBJS)\corelib_dirdlg.o \
 	$(OBJS)\corelib_dragimag.o \
-	$(OBJS)\corelib_evtloop.o \
 	$(OBJS)\corelib_filedlg.o \
 	$(OBJS)\corelib_frame.o \
 	$(OBJS)\corelib_msw_gauge.o \
@@ -4181,6 +4180,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datetimectrl.o \
 	$(OBJS)\corelib_timectrl.o \
 	$(OBJS)\corelib_datecontrols.o \
+	$(OBJS)\corelib_activityindicator.o \
 	$(OBJS)\corelib_msw_checklst.o \
 	$(OBJS)\corelib_msw_fdrepdlg.o \
 	$(OBJS)\corelib_fontdlg.o \
@@ -4453,9 +4453,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_sound.o \
 	$(OBJS)\corelib_automtn.o \
 	$(OBJS)\corelib_notifmsgrt.o \
-	$(OBJS)\corelib_activityindicator.o \
 	$(OBJS)\corelib_uuid.o \
 	$(OBJS)\corelib_evtloop.o \
+	$(OBJS)\corelib_animateg.o \
 	$(OBJS)\corelib_generic_accel.o \
 	$(OBJS)\corelib_clrpickerg.o \
 	$(OBJS)\corelib_collpaneg.o \
@@ -7116,9 +7116,6 @@ $(OBJS)\monodll_systhemectrl.o: ../../src/msw/systhemectrl.cpp
 $(OBJS)\monodll_customdraw.o: ../../src/msw/customdraw.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monodll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -8069,23 +8066,16 @@ $(OBJS)\monodll_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-ifeq ($(WXUNIV),1)
-$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8112,7 +8102,12 @@ $(OBJS)\monodll_prntdlgg.o: ../../src/generic/prntdlgg.cpp
 endif
 
 ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp
+$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_activityindicator.o: ../../src/generic/activityindicator.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -9662,9 +9657,6 @@ $(OBJS)\monolib_systhemectrl.o: ../../src/msw/systhemectrl.cpp
 $(OBJS)\monolib_customdraw.o: ../../src/msw/customdraw.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\monolib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -10615,23 +10607,16 @@ $(OBJS)\monolib_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-ifeq ($(WXUNIV),1)
-$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10658,7 +10643,12 @@ $(OBJS)\monolib_prntdlgg.o: ../../src/generic/prntdlgg.cpp
 endif
 
 ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp
+$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_activityindicator.o: ../../src/generic/activityindicator.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -12622,9 +12612,6 @@ $(OBJS)\coredll_systhemectrl.o: ../../src/msw/systhemectrl.cpp
 $(OBJS)\coredll_customdraw.o: ../../src/msw/customdraw.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\coredll_animateg.o: ../../src/generic/animateg.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\coredll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -13125,23 +13112,16 @@ $(OBJS)\coredll_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-ifeq ($(WXUNIV),1)
-$(OBJS)\coredll_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13168,7 +13148,12 @@ $(OBJS)\coredll_prntdlgg.o: ../../src/generic/prntdlgg.cpp
 endif
 
 ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp
+$(OBJS)\coredll_animateg.o: ../../src/generic/animateg.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_activityindicator.o: ../../src/generic/activityindicator.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -14355,9 +14340,6 @@ $(OBJS)\corelib_systhemectrl.o: ../../src/msw/systhemectrl.cpp
 $(OBJS)\corelib_customdraw.o: ../../src/msw/customdraw.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\corelib_animateg.o: ../../src/generic/animateg.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\corelib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14858,23 +14840,16 @@ $(OBJS)\corelib_notifmsgrt.o: ../../src/msw/rt/notifmsgrt.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-ifeq ($(WXUNIV),1)
-$(OBJS)\corelib_activityindicator.o: ../../src/generic/activityindicator.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -14901,7 +14876,12 @@ $(OBJS)\corelib_prntdlgg.o: ../../src/generic/prntdlgg.cpp
 endif
 
 ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp
+$(OBJS)\corelib_animateg.o: ../../src/generic/animateg.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_activityindicator.o: ../../src/generic/activityindicator.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 

build/msw/makefile.vc

@@ -2168,8 +2168,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_automtn.obj \
 	$(OBJS)\monodll_notifmsgrt.obj \
-	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_uuid.obj \
+	$(OBJS)\monodll_evtloop.obj \
 	$(OBJS)\monodll_clrpickerg.obj \
 	$(OBJS)\monodll_collpaneg.obj \
 	$(OBJS)\monodll_filepickerg.obj \
@@ -2191,7 +2191,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msw_dialog.obj \
 	$(OBJS)\monodll_dirdlg.obj \
 	$(OBJS)\monodll_dragimag.obj \
-	$(OBJS)\monodll_evtloop.obj \
 	$(OBJS)\monodll_filedlg.obj \
 	$(OBJS)\monodll_frame.obj \
 	$(OBJS)\monodll_msw_gauge.obj \
@@ -2239,6 +2238,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_datetimectrl.obj \
 	$(OBJS)\monodll_timectrl.obj \
 	$(OBJS)\monodll_datecontrols.obj \
+	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_msw_checklst.obj \
 	$(OBJS)\monodll_msw_fdrepdlg.obj \
 	$(OBJS)\monodll_fontdlg.obj \
@@ -2509,9 +2509,9 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_sound.obj \
 	$(OBJS)\monodll_automtn.obj \
 	$(OBJS)\monodll_notifmsgrt.obj \
-	$(OBJS)\monodll_activityindicator.obj \
 	$(OBJS)\monodll_uuid.obj \
 	$(OBJS)\monodll_evtloop.obj \
+	$(OBJS)\monodll_animateg.obj \
 	$(OBJS)\monodll_generic_accel.obj \
 	$(OBJS)\monodll_clrpickerg.obj \
 	$(OBJS)\monodll_collpaneg.obj \
@@ -3003,8 +3003,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_automtn.obj \
 	$(OBJS)\monolib_notifmsgrt.obj \
-	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_uuid.obj \
+	$(OBJS)\monolib_evtloop.obj \
 	$(OBJS)\monolib_clrpickerg.obj \
 	$(OBJS)\monolib_collpaneg.obj \
 	$(OBJS)\monolib_filepickerg.obj \
@@ -3026,7 +3026,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msw_dialog.obj \
 	$(OBJS)\monolib_dirdlg.obj \
 	$(OBJS)\monolib_dragimag.obj \
-	$(OBJS)\monolib_evtloop.obj \
 	$(OBJS)\monolib_filedlg.obj \
 	$(OBJS)\monolib_frame.obj \
 	$(OBJS)\monolib_msw_gauge.obj \
@@ -3074,6 +3073,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_datetimectrl.obj \
 	$(OBJS)\monolib_timectrl.obj \
 	$(OBJS)\monolib_datecontrols.obj \
+	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_msw_checklst.obj \
 	$(OBJS)\monolib_msw_fdrepdlg.obj \
 	$(OBJS)\monolib_fontdlg.obj \
@@ -3344,9 +3344,9 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_sound.obj \
 	$(OBJS)\monolib_automtn.obj \
 	$(OBJS)\monolib_notifmsgrt.obj \
-	$(OBJS)\monolib_activityindicator.obj \
 	$(OBJS)\monolib_uuid.obj \
 	$(OBJS)\monolib_evtloop.obj \
+	$(OBJS)\monolib_animateg.obj \
 	$(OBJS)\monolib_generic_accel.obj \
 	$(OBJS)\monolib_clrpickerg.obj \
 	$(OBJS)\monolib_collpaneg.obj \
@@ -3773,8 +3773,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_sound.obj \
 	$(OBJS)\coredll_automtn.obj \
 	$(OBJS)\coredll_notifmsgrt.obj \
-	$(OBJS)\coredll_activityindicator.obj \
 	$(OBJS)\coredll_uuid.obj \
+	$(OBJS)\coredll_evtloop.obj \
 	$(OBJS)\coredll_clrpickerg.obj \
 	$(OBJS)\coredll_collpaneg.obj \
 	$(OBJS)\coredll_filepickerg.obj \
@@ -3796,7 +3796,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msw_dialog.obj \
 	$(OBJS)\coredll_dirdlg.obj \
 	$(OBJS)\coredll_dragimag.obj \
-	$(OBJS)\coredll_evtloop.obj \
 	$(OBJS)\coredll_filedlg.obj \
 	$(OBJS)\coredll_frame.obj \
 	$(OBJS)\coredll_msw_gauge.obj \
@@ -3844,6 +3843,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_datetimectrl.obj \
 	$(OBJS)\coredll_timectrl.obj \
 	$(OBJS)\coredll_datecontrols.obj \
+	$(OBJS)\coredll_activityindicator.obj \
 	$(OBJS)\coredll_msw_checklst.obj \
 	$(OBJS)\coredll_msw_fdrepdlg.obj \
 	$(OBJS)\coredll_fontdlg.obj \
@@ -4114,9 +4114,9 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_sound.obj \
 	$(OBJS)\coredll_automtn.obj \
 	$(OBJS)\coredll_notifmsgrt.obj \
-	$(OBJS)\coredll_activityindicator.obj \
 	$(OBJS)\coredll_uuid.obj \
 	$(OBJS)\coredll_evtloop.obj \
+	$(OBJS)\coredll_animateg.obj \
 	$(OBJS)\coredll_generic_accel.obj \
 	$(OBJS)\coredll_clrpickerg.obj \
 	$(OBJS)\coredll_collpaneg.obj \
@@ -4449,8 +4449,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_sound.obj \
 	$(OBJS)\corelib_automtn.obj \
 	$(OBJS)\corelib_notifmsgrt.obj \
-	$(OBJS)\corelib_activityindicator.obj \
 	$(OBJS)\corelib_uuid.obj \
+	$(OBJS)\corelib_evtloop.obj \
 	$(OBJS)\corelib_clrpickerg.obj \
 	$(OBJS)\corelib_collpaneg.obj \
 	$(OBJS)\corelib_filepickerg.obj \
@@ -4472,7 +4472,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msw_dialog.obj \
 	$(OBJS)\corelib_dirdlg.obj \
 	$(OBJS)\corelib_dragimag.obj \
-	$(OBJS)\corelib_evtloop.obj \
 	$(OBJS)\corelib_filedlg.obj \
 	$(OBJS)\corelib_frame.obj \
 	$(OBJS)\corelib_msw_gauge.obj \
@@ -4520,6 +4519,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_datetimectrl.obj \
 	$(OBJS)\corelib_timectrl.obj \
 	$(OBJS)\corelib_datecontrols.obj \
+	$(OBJS)\corelib_activityindicator.obj \
 	$(OBJS)\corelib_msw_checklst.obj \
 	$(OBJS)\corelib_msw_fdrepdlg.obj \
 	$(OBJS)\corelib_fontdlg.obj \
@@ -4790,9 +4790,9 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_sound.obj \
 	$(OBJS)\corelib_automtn.obj \
 	$(OBJS)\corelib_notifmsgrt.obj \
-	$(OBJS)\corelib_activityindicator.obj \
 	$(OBJS)\corelib_uuid.obj \
 	$(OBJS)\corelib_evtloop.obj \
+	$(OBJS)\corelib_animateg.obj \
 	$(OBJS)\corelib_generic_accel.obj \
 	$(OBJS)\corelib_clrpickerg.obj \
 	$(OBJS)\corelib_collpaneg.obj \
@@ -7643,9 +7643,6 @@ $(OBJS)\monodll_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp
 $(OBJS)\monodll_customdraw.obj: ..\..\src\msw\customdraw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\customdraw.cpp
 
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
 $(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
@@ -8597,18 +8594,13 @@ $(OBJS)\monodll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -8637,8 +8629,13 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -10187,9 +10184,6 @@ $(OBJS)\monolib_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp
 $(OBJS)\monolib_customdraw.obj: ..\..\src\msw\customdraw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\customdraw.cpp
 
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
 $(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
@@ -11141,18 +11135,13 @@ $(OBJS)\monolib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -11181,8 +11170,13 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -13145,9 +13139,6 @@ $(OBJS)\coredll_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp
 $(OBJS)\coredll_customdraw.obj: ..\..\src\msw\customdraw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\customdraw.cpp
 
-$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
 $(OBJS)\coredll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
@@ -13649,18 +13640,13 @@ $(OBJS)\coredll_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -13689,8 +13675,13 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\coredll_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -14876,9 +14867,6 @@ $(OBJS)\corelib_systhemectrl.obj: ..\..\src\msw\systhemectrl.cpp
 $(OBJS)\corelib_customdraw.obj: ..\..\src\msw\customdraw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\customdraw.cpp
 
-$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
 $(OBJS)\corelib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
@@ -15380,18 +15368,13 @@ $(OBJS)\corelib_notifmsgrt.obj: ..\..\src\msw\rt\notifmsgrt.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -15420,8 +15403,13 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
+$(OBJS)\corelib_animateg.obj: ..\..\src\generic\animateg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_activityindicator.obj: ..\..\src\generic\activityindicator.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\activityindicator.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"

build/msw/wx_config.props

@@ -10,4 +10,10 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(VisualStudioVersion)' >= '15.0' and '$(WindowsTargetPlatformVersion)'==''">
+    <!-- Latest Target Version property -->
+    <LatestTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <TargetPlatformVersion>$(WindowsTargetPlatformVersion)</TargetPlatformVersion>
+  </PropertyGroup>
 </Project>

build/msw/wx_core.vcxproj

@@ -1280,7 +1280,6 @@
     <ClInclude Include="..\..\include\wx\dirctrl.h" />
     <ClInclude Include="..\..\include\wx\dirdlg.h" />
     <ClInclude Include="..\..\include\wx\display.h" />
-    <ClInclude Include="..\..\include\wx\display_impl.h" />
     <ClInclude Include="..\..\include\wx\dnd.h" />
     <ClInclude Include="..\..\include\wx\docmdi.h" />
     <ClInclude Include="..\..\include\wx\docview.h" />

build/msw/wx_core.vcxproj.filters

@@ -1267,9 +1267,6 @@
     <ClInclude Include="..\..\include\wx\display.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\display_impl.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\dnd.h">
       <Filter>Common Headers</Filter>
     </ClInclude>

build/msw/wx_vc7_core.vcproj

@@ -2270,9 +2270,6 @@
 			<File
 				RelativePath="..\..\include\wx\display.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\display_impl.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\dnd.h">
 			</File>

build/msw/wx_vc8_core.vcproj

@@ -3528,10 +3528,6 @@
 				RelativePath="..\..\include\wx\display.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\display_impl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\dnd.h"
 				>

build/msw/wx_vc9_core.vcproj

@@ -3524,10 +3524,6 @@
 				RelativePath="..\..\include\wx\display.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\display_impl.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\dnd.h"
 				>

build/osx/wxcocoa.xcodeproj/project.pbxproj

@@ -823,6 +823,12 @@
 		4040AE89BF9F34668091064A /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; };
 		4040AE89BF9F34668091064B /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; };
 		4040AE89BF9F34668091064C /* dragimgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A67053D16D63C588E555C84 /* dragimgg.cpp */; };
+		750C716389AD3ADBABC9D689 /* statbmp_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */; };
+		750C716389AD3ADBABC9D68A /* statbmp_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */; };
+		750C716389AD3ADBABC9D68B /* statbmp_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */; };
+		215958201947310B88BBEDB3 /* statbmp.mm in Sources */ = {isa = PBXBuildFile; fileRef = FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */; };
+		215958201947310B88BBEDB4 /* statbmp.mm in Sources */ = {isa = PBXBuildFile; fileRef = FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */; };
+		215958201947310B88BBEDB5 /* statbmp.mm in Sources */ = {isa = PBXBuildFile; fileRef = FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */; };
 		4156FDB73D0A397A870E4302 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; };
 		4156FDB73D0A397A870E4303 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; };
 		4156FDB73D0A397A870E4304 /* overlay.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FBD8031E28A3C9CB7C45784 /* overlay.mm */; };
@@ -4754,6 +4760,7 @@
 		F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_panel.cpp; path = ../../src/xrc/xh_panel.cpp; sourceTree = "<group>"; };
 		F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../src/stc/scintilla/lexers/LexMetapost.cxx; sourceTree = "<group>"; };
 		F52DCBC0442233738B39138E /* CaseFolder.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CaseFolder.cxx; path = ../../src/stc/scintilla/src/CaseFolder.cxx; sourceTree = "<group>"; };
+		F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = statbmp_osx.cpp; path = ../../src/osx/statbmp_osx.cpp; sourceTree = "<group>"; };
 		F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/generic/icon.cpp; sourceTree = "<group>"; };
 		F6EA240B3DB93D398A990FAD /* tif_dirread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirread.c; path = ../../src/tiff/libtiff/tif_dirread.c; sourceTree = "<group>"; };
 		F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jbig.c; path = ../../src/tiff/libtiff/tif_jbig.c; sourceTree = "<group>"; };
@@ -4779,6 +4786,7 @@
 		FD0C7FCA25A3312E8F2FCF3C /* LexTeX.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexTeX.cxx; path = ../../src/stc/scintilla/lexers/LexTeX.cxx; sourceTree = "<group>"; };
 		FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_srchctrl.cpp; path = ../../src/xrc/xh_srchctrl.cpp; sourceTree = "<group>"; };
 		FD5F11A3646F397BA62EB037 /* htmllbox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = htmllbox.cpp; path = ../../src/generic/htmllbox.cpp; sourceTree = "<group>"; };
+		FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = statbmp.mm; path = ../../src/osx/cocoa/statbmp.mm; sourceTree = "<group>"; };
 		FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalLexer.cxx; path = ../../src/stc/scintilla/src/ExternalLexer.cxx; sourceTree = "<group>"; };
 		FDAEFCE0ED9D30DA94340A3B /* xtistrm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xtistrm.cpp; path = ../../src/common/xtistrm.cpp; sourceTree = "<group>"; };
 		FDB0E2D0966C3E408C4A2D3D /* infback.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = infback.c; path = ../../src/zlib/infback.c; sourceTree = "<group>"; };
@@ -5301,6 +5309,8 @@
 		2E7B4F88F81E37B4A9FF6C0F /* core */ = {
 			isa = PBXGroup;
 			children = (
+				F582C6B3A5AA3367BB4DBE97 /* statbmp_osx.cpp */,
+				FD6B26B5A6A733A89EF5AB9C /* statbmp.mm */,
 				B0665A40F3FC3F218074C63C /* artmac.cpp */,
 				302A13BC64C238A297F4399F /* brush.cpp */,
 				BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */,
@@ -7537,6 +7547,7 @@
 				0FFFFA2F762B3160955D1D8A /* gauge_osx.cpp in Sources */,
 				E4B826CE70283D999CB591F5 /* listbox_osx.cpp in Sources */,
 				B198DA8239E9358A9D56B98A /* menu_osx.cpp in Sources */,
+				750C716389AD3ADBABC9D68B /* statbmp_osx.cpp in Sources */,
 				1DF3A4F85FCB3BA79A552F3F /* menuitem_osx.cpp in Sources */,
 				A3321FE2A87D3BD69E0BB00B /* notebook_osx.cpp in Sources */,
 				0C9A379D97B133FA831175A9 /* printdlg_osx.cpp in Sources */,
@@ -7554,6 +7565,7 @@
 				664A54F914443110B7BB692A /* tglbtn_osx.cpp in Sources */,
 				A569A33A2097316D8110C2C3 /* toolbar_osx.cpp in Sources */,
 				0AEBA7389E223781A7A257A3 /* webkit.mm in Sources */,
+				215958201947310B88BBEDB5 /* statbmp.mm in Sources */,
 				F5FF98C231B33E3EB7902C66 /* colordlgosx.mm in Sources */,
 				2386B575BC3931D2AF86CB35 /* fontdlgosx.mm in Sources */,
 				2EECB3C2F9523D0B95847A81 /* accel.cpp in Sources */,
@@ -8119,6 +8131,7 @@
 				E882402BEE0330A080A65170 /* strconv.cpp in Sources */,
 				30493B486DFF35AF80D12C4A /* stream.cpp in Sources */,
 				795613831EC8332A83FF26E8 /* string.cpp in Sources */,
+				750C716389AD3ADBABC9D68A /* statbmp_osx.cpp in Sources */,
 				55F0D287F60F3EDEA16CCB65 /* stringimpl.cpp in Sources */,
 				88E1AE56FD393C8BA5CF8546 /* stringops.cpp in Sources */,
 				056E30EA43753A7CB1AF8C9F /* strvararg.cpp in Sources */,
@@ -8577,6 +8590,7 @@
 				5F2C2A46781739D897CF293E /* xh_chckl.cpp in Sources */,
 				CE17002B5B7E37558274763A /* xh_choic.cpp in Sources */,
 				26E4813A97DE323E88119164 /* xh_choicbk.cpp in Sources */,
+				215958201947310B88BBEDB4 /* statbmp.mm in Sources */,
 				E7AF3BF2B3473AD9BE66D1A2 /* xh_clrpicker.cpp in Sources */,
 				1AB50C98FF473B33A3CA4D3A /* xh_cmdlinkbn.cpp in Sources */,
 				E7921B0472B63E4091F4F518 /* xh_collpane.cpp in Sources */,
@@ -9342,6 +9356,7 @@
 				E882402BEE0330A080A6516F /* strconv.cpp in Sources */,
 				30493B486DFF35AF80D12C49 /* stream.cpp in Sources */,
 				795613831EC8332A83FF26E7 /* string.cpp in Sources */,
+				750C716389AD3ADBABC9D689 /* statbmp_osx.cpp in Sources */,
 				55F0D287F60F3EDEA16CCB64 /* stringimpl.cpp in Sources */,
 				88E1AE56FD393C8BA5CF8545 /* stringops.cpp in Sources */,
 				056E30EA43753A7CB1AF8C9E /* strvararg.cpp in Sources */,
@@ -9800,6 +9815,7 @@
 				5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */,
 				CE17002B5B7E375582747639 /* xh_choic.cpp in Sources */,
 				26E4813A97DE323E88119163 /* xh_choicbk.cpp in Sources */,
+				215958201947310B88BBEDB3 /* statbmp.mm in Sources */,
 				E7AF3BF2B3473AD9BE66D1A1 /* xh_clrpicker.cpp in Sources */,
 				1AB50C98FF473B33A3CA4D39 /* xh_cmdlinkbn.cpp in Sources */,
 				E7921B0472B63E4091F4F517 /* xh_collpane.cpp in Sources */,

build/osx/wxiphone.xcodeproj/project.pbxproj

@@ -803,7 +803,6 @@
 		F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */; };
 		F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00969CBE3B8F32C78C195619 /* panel.cpp */; };
 		F1E4D7CA634E33808AE3B522 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 373242CD08F330208A7CF438 /* fontenumcmn.cpp */; };
-		F1F484DD591337399FCD0463 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5617D10CB7136EC9A4194EF /* display.cpp */; };
 		F22C401903993639AE05A295 /* xh_stbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 147800BBCB80346798B35D75 /* xh_stbox.cpp */; };
 		F24F637D59F637CA9A7E23C9 /* xh_filectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */; };
 		F2813BF297C73A3ABD02EC98 /* glcanvas_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */; };
@@ -1402,7 +1401,6 @@
 		A46D50BEBF523B3F88831086 /* LexAsn1.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsn1.cxx; path = ../../src/stc/scintilla/lexers/LexAsn1.cxx; sourceTree = "<group>"; };
 		A4A745D1821A32D591D76650 /* imagiff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagiff.cpp; path = ../../src/common/imagiff.cpp; sourceTree = "<group>"; };
 		A54B80C17F823CB5900AD2E8 /* framecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = framecmn.cpp; path = ../../src/common/framecmn.cpp; sourceTree = "<group>"; };
-		A5617D10CB7136EC9A4194EF /* display.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = display.cpp; path = ../../src/osx/core/display.cpp; sourceTree = "<group>"; };
 		A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headerctrlcmn.cpp; path = ../../src/common/headerctrlcmn.cpp; sourceTree = "<group>"; };
 		A57CF60203F53459A03951A9 /* arrstr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arrstr.cpp; path = ../../src/common/arrstr.cpp; sourceTree = "<group>"; };
 		A5BBC1E494D33D028CA547FF /* jddctmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jddctmgr.c; path = ../../src/jpeg/jddctmgr.c; sourceTree = "<group>"; };
@@ -1953,7 +1951,6 @@
 				A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */,
 				9D1F14339D1C331087650931 /* colour.cpp */,
 				343D4FDD5CC030618EF24729 /* dcmemory.cpp */,
-				A5617D10CB7136EC9A4194EF /* display.cpp */,
 				36E1DBA275AD325DB759C180 /* fontenum.cpp */,
 				160EB9744CB63A0B81DC651F /* hid.cpp */,
 				5CC5C13F8AA1387BADB7E60C /* printmac.cpp */,
@@ -3008,7 +3005,6 @@
 				03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */,
 				FF50EC0EC5F23DF890C6E95F /* colour.cpp in Sources */,
 				BD2B17EB72E73A6EB6E0B26F /* dcmemory.cpp in Sources */,
-				F1F484DD591337399FCD0463 /* display.cpp in Sources */,
 				371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */,
 				86BE5213D3F131D8A6862679 /* hid.cpp in Sources */,
 				AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */,

build/tools/appveyor-test.bat

@@ -42,10 +42,15 @@ echo --- Note: ignoring possible test failures under Cygwin
 echo.
 exit /b 0
 
+:cmake_qt
+set CMAKE_TEST_REGEX="test_base"
+goto :cmake
+
 :cmake
 if "%CONFIGURATION%"=="" set CONFIGURATION=Release
+if "%CMAKE_TEST_REGEX%"=="" set CMAKE_TEST_REGEX="test_[base|gui]"
 cd ..\build_cmake
-ctest -V -C %CONFIGURATION% -R "test_[base|gui]" --output-on-failure --interactive-debug-mode 0 .
+ctest -V -C %CONFIGURATION% -R %CMAKE_TEST_REGEX% --output-on-failure --interactive-debug-mode 0 .
 if %errorlevel% NEQ 0 goto :error
 goto :eof
 

build/tools/appveyor.bat

@@ -78,6 +78,12 @@ set SKIPTESTS=1
 set CMAKE_NATIVE_FLAGS=-j3
 goto cmake
 
+:cmake_qt
+set SKIPINSTALL=1
+set QT5DIR="C:\Qt\5.11\msvc2015_64"
+set CMAKE_CONFIGURE_FLAGS=-DCMAKE_PREFIX_PATH=%QT5DIR% -DwxBUILD_TOOLKIT="qt" -DCMAKE_CXX_STANDARD=11
+goto cmake
+
 :cmake
 echo --- Tools versions:
 cmake --version

build/tools/before_install.sh

@@ -21,7 +21,18 @@ case $(uname -s) in
                 *--with-qt*)       libtoolkit_dev='qtdeclarative5-dev'      ;;
             esac
 
-            $SUDO apt-get install -y $libgtk_dev $libtoolkit_dev libnotify-dev
+            pgk_check="libgstreamermm-1.0-dev libgstreamermm-0.10-dev \
+                libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
+                libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev \
+                libwebkitgtk-dev libglu1-mesa-dev libsecret-1-dev libnotify-dev"
+
+            for pkg in $pgk_check; do
+                if $(apt-cache pkgnames | grep -q $pkg) ; then
+                    pkg_install="$pkg_install $pkg"
+                fi
+            done
+
+            $SUDO apt-get install -y $libgtk_dev $libtoolkit_dev $pkg_install
         fi
         ;;
 

build/update-setup-h

@@ -116,7 +116,6 @@ update_msw_setup_h setup.h.in
 update_msw_setup_h build/cmake/setup.h.in
 
 update_osx_setup_h include/wx/osx/setup0.h
-update_msw_setup_h setup.h.in
 
 update_single_setup_h wxUniv include/wx/univ/setup_inc.h include/wx/univ/setup0.h
 

configure

@@ -745,10 +745,10 @@ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin
 COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin
 COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin
 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
 COND_SHARED_0
+COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0
 COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1
 COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
 COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
@@ -1285,6 +1285,7 @@ enable_statusbar
 enable_taskbaricon
 enable_tbarnative
 enable_textctrl
+enable_timepick
 enable_tipwindow
 enable_togglebtn
 enable_toolbar
@@ -10905,23 +10906,23 @@ fi
               fi
           fi
 
-          # Check whether --enable-datepick was given.
+          # Check whether --enable-timepick was given.
-if test "${enable_datepick+set}" = set; then :
+if test "${enable_timepick+set}" = set; then :
-  enableval=$enable_datepick;
+  enableval=$enable_timepick;
                           if test "$enableval" = yes; then
-                            wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=yes'
+                            wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=yes'
                           else
-                            wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=no'
+                            wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=no'
                           fi
 
 else
 
-                          wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}"
+                          wx_cv_use_timepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$wx_cv_use_datepick"
+          eval "$wx_cv_use_timepick"
 
 
           enablestring=
@@ -20193,6 +20194,7 @@ elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
 fi
 
 if test "x$MACOSX_SDK_OPTS" != "x"; then
+    eval "CPP=\"$CPP $MACOSX_SDK_OPTS\""
     eval "CC=\"$CC $MACOSX_SDK_OPTS\""
     eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
     eval "LD=\"$LD $MACOSX_SDK_OPTS\""
@@ -20205,6 +20207,7 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
     else
         MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
     fi
+    eval "CPP=\"$CPP $MACOSX_VERSION_MIN_OPTS\""
     eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
     eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
     eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
@@ -20491,6 +20494,8 @@ if test "$USE_UNIX" = 1 ; then
 
 fi
 
+export CC CFLAGS CPP CPPFLAGS CXX CXXFLAGS LDD LDFLAGS OBJCFLAGS OBJCXXFLAGS
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
@@ -23368,7 +23373,7 @@ fi
     fi
 fi
 
-if test "$HAVE_LZMA" = "no" -o "$wxUSE_LIBTIFF" = "builtin"; then
+if test "$wxUSE_LIBLZMA" = "no" -a "$wxUSE_LIBTIFF" = "builtin"; then
     ac_configure_args="$ac_configure_args --disable-lzma"
 fi
 
@@ -27521,14 +27526,6 @@ fi
 $as_echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;}
             wxUSE_DISPLAY="no"
         fi
-    elif test "$wxUSE_MSW" = 1; then
-                ac_fn_c_check_header_compile "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "#include <windows.h>
-"
-if test "x$ac_cv_header_ddraw_h" = xyes; then :
-
-fi
-
-
     fi
 fi
 
@@ -38991,7 +38988,7 @@ EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS_MEDIA="$GST_LIBS"
 EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
-    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK`
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $SDL_LIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK`
 fi
 if test "$wxUSE_OPENGL" = "yes"; then
     EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
@@ -41092,6 +41089,11 @@ EOF
         COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1=""
     fi
 
+    COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_PLATFORM_WIN32_1_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
+    fi
+
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
         COND_SHARED_0=""
@@ -41107,11 +41109,6 @@ EOF
         COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
     fi
 
-    COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
-    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
-        COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
-    fi
-
     COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
         COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""

configure.in

@@ -952,7 +952,7 @@ WX_ARG_FEATURE(statusbar,   [  --enable-statusbar      use wxStatusBar class], w
 WX_ARG_FEATURE(taskbaricon, [  --enable-taskbaricon    use wxTaskBarIcon class], wxUSE_TASKBARICON)
 WX_ARG_FEATURE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
 WX_ARG_FEATURE(textctrl,    [  --enable-textctrl       use wxTextCtrl class], wxUSE_TEXTCTRL)
-WX_ARG_FEATURE(datepick,    [  --enable-timepick       use wxTimePickerCtrl class], wxUSE_TIMEPICKCTRL)
+WX_ARG_FEATURE(timepick,    [  --enable-timepick       use wxTimePickerCtrl class], wxUSE_TIMEPICKCTRL)
 WX_ARG_FEATURE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
 WX_ARG_FEATURE(togglebtn,   [  --enable-togglebtn      use wxToggleButton class], wxUSE_TOGGLEBTN)
 WX_ARG_FEATURE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUSE_TOOLBAR)
@@ -1279,6 +1279,7 @@ elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
 fi
 
 if test "x$MACOSX_SDK_OPTS" != "x"; then
+    eval "CPP=\"$CPP $MACOSX_SDK_OPTS\""
     eval "CC=\"$CC $MACOSX_SDK_OPTS\""
     eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
     eval "LD=\"$LD $MACOSX_SDK_OPTS\""
@@ -1291,6 +1292,7 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
     else
         MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
     fi
+    eval "CPP=\"$CPP $MACOSX_VERSION_MIN_OPTS\""
     eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
     eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
     eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
@@ -1475,6 +1477,10 @@ if test "$USE_UNIX" = 1 ; then
     AC_DEFINE(__UNIX__)
 fi
 
+dnl Values of these variables shouldn't change any longer from now on, we
+dnl export them to ensure they're picked up by sub-configure scripts.
+export CC CFLAGS CPP CPPFLAGS CXX CXXFLAGS LDD LDFLAGS OBJCFLAGS OBJCXXFLAGS
+
 dnl ------------------------------------------------------------------------
 dnl Check for headers
 dnl ------------------------------------------------------------------------
@@ -2583,7 +2589,7 @@ 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
+if test "$wxUSE_LIBLZMA" = "no" -a "$wxUSE_LIBTIFF" = "builtin"; then
     ac_configure_args="$ac_configure_args --disable-lzma"
 fi
 
@@ -3472,9 +3478,6 @@ if test "$wxUSE_DISPLAY" = "yes"; then
             AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
             wxUSE_DISPLAY="no"
         fi
-    elif test "$wxUSE_MSW" = 1; then
-        dnl DirectDraw for MSW - optionally used by WxDisplay.
-        AC_CHECK_HEADER([ddraw.h], [], [], [#include <windows.h>])
     fi
 fi
 
@@ -7935,7 +7938,7 @@ EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS_MEDIA="$GST_LIBS"
 EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
-    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK`
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $SDL_LIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK`
 fi
 if test "$wxUSE_OPENGL" = "yes"; then
     EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"

demos/poem/wxpoem.cpp

@@ -163,7 +163,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
         height = *max_y;
     }
 
-    if (DrawIt && wxColourDisplay())
+    if (DrawIt)
     {
         dc->SetBrush(*wxLIGHT_GREY_BRUSH);
         dc->SetPen(*wxGREY_PEN);
@@ -347,8 +347,6 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
     if (DrawIt)
     {
         // Draw dark grey thick border
-        if (wxColourDisplay())
-        {
         dc->SetBrush(*wxGREY_BRUSH);
         dc->SetPen(*wxGREY_PEN);
 
@@ -360,7 +358,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
         dc->DrawRectangle(width-THIN_LINE_BORDER, THIN_LINE_BORDER, width, height-THIN_LINE_BORDER);
         // Bottom side
         dc->DrawRectangle(THIN_LINE_BORDER, height-THIN_LINE_BORDER, width-THIN_LINE_BORDER, height);
-        }
+
         // Draw border
         // Have grey background, plus 3-d border -
         // One black rectangle.
@@ -376,10 +374,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
 
         // Right and bottom white lines - 'grey' (black!) if
         // we're running on a mono display.
-        if (wxColourDisplay())
         dc->SetPen(*wxWHITE_PEN);
-        else
-            dc->SetPen(*wxBLACK_PEN);
 
         dc->DrawLine(width-THICK_LINE_BORDER, THICK_LINE_BORDER,
                      width-THICK_LINE_BORDER, height-THICK_LINE_BORDER);

docs/changes.txt

@@ -51,6 +51,8 @@ Changes in behaviour not resulting in compilation errors
   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.
 
+- wxEVT_AUINOTEBOOK_PAGE_CHANGED event is now sent after changing the page,
+  as expected, and not before doing it.
 
 Changes in behaviour which may result in build errors
 -----------------------------------------------------
@@ -106,6 +108,7 @@ All:
 - Fix problem with wx-config installation and use under NetBSD (wiz).
 - Avoid spurious errors on thread creation under NetBSD.
 - Improve high DPI support in wxAui (Simon Rozman).
+- Fix a bug with parsing time zones in wxDateTime::ParseFormat() (evileye).
 
 All (GUI):
 
@@ -127,14 +130,17 @@ All (GUI):
 - Allow binding to events generated by their items in submenus too.
 - Add wxGrid::SetCornerLabelValue() (Pavel Kalugin).
 - Add strikethrough support for fonts defined in XRC.
+- Add wxDisplay::GetPPI().
 
 wxGTK:
 
 - Implement wxTextCtrl::HitTest() for single line controls.
+- Fix bug with wxTextCtrl::ChangeValue("") sending an unwanted event.
 - Implement wxDataViewColumn::UnsetAsSortKey().
 - Fix not showing wxInfoBar with GTK+ 3 < 3.22.29.
 - Fix the build with glib < 2.32 (e.g. CentOS 6).
 - Fix field widths in wxStatusBar showing a size grip.
+- Fill column value in wxEVT_DATAVIEW_ITEM_ACTIVATED events.
 
 wxMSW:
 
@@ -157,10 +163,14 @@ wxOSX:
 
 - Fix dispatching pending events (and CallAfter()) in console applications.
 - Implement wxDataViewColumn::UnsetAsSortKey() (Daniel Kulp).
+- supporting native image formst like NSImage and UIImage in wxBitmap
+- native implementation for wxStaticBitmap for correct rendering of template images
+- Fill column value in wxEVT_DATAVIEW_ITEM_ACTIVATED events (Igor Korot).
 
 wxQt:
 
 - Fix menu bar background colour (Naser Buhamad).
+- Add support for bitmaps in menu items (Igor Korot).
 
 
 3.1.1: (released 2018-02-19)

docs/contributing/how-to-add-new-sample.md

@@ -43,12 +43,20 @@ samples/ with demos/ where needed).
    After this, regenerate configure from configure.in
    by running "autoconf" on a Unix system in the corresponding directory.
 
-5. Add a short description of what the sample does and how does it work
+5. Modify `build/cmake/samples/CMakeLists.txt` to include the sample in
+   CMake. Add a new line like this:
+
+       wx_add_sample(foo DEPENDS wxUSE_FOO)
+
+   For a complete list of parameters to the `wx_add_sample()` function see
+   the description in `build/cmake/functions.cmake`.
+
+6. Add a short description of what the sample does and how does it work
    to the "samples overview" section in the wxWidgets manual. That section
    lives in docs/doxygen/mainpages/samples.h; look at the descriptions for
    other samples, if you are not familiar with Doxygen.
 
-6. Add any non-standard sample's files to build/bakefiles/make_dist.mk (the
+7. Add any non-standard sample's files to build/bakefiles/make_dist.mk (the
    makefiles copies all bmp, cpp, h, ico, png, rc, xpm and makefiles by
    default, you only need to update it if the sample uses some other files)
    and run the ./update-manifests.sh script in distrib/scripts (don't forget

docs/contributing/how-to-add-new-wxUSE_XXX.md

@@ -72,6 +72,16 @@ c) configure.in
    If you have a sample/foo which should be only built when `wxUSE_FOO==1`,
    then only add it to the SAMPLES_SUBDIRS if `wxUSE_FOO=yes` in configure.
 
-d) docs/doxygen/mainpages/const_wxusedef.h
+d) build/cmake/options.cmake
+
+   To include the option in CMake, add a new line in the appropriate
+   section of options.cmake.
+
+    wx_option(wxUSE_FOO "enable FOO")
+
+   As an optional third parameter you may specify `OFF` when the option
+   should be disabled by default.
+
+e) docs/doxygen/mainpages/const_wxusedef.h
 
    Add a brief description of the new constant.

docs/contributing/how-to-release.md

@@ -117,11 +117,15 @@ Create https://docs.wxwidgets.org/x.y.z/ (ask Bryan to do it if not done yet).
 
 ## Announcement
 
-Update https://www.wxwidgets.org, usually a news item is enough but something
+Update https://www.wxwidgets.org:
-more can be called for for major releases.
+* Update release information (at least `version` and `released`) in `_data/relases.yml`.
+* Download information can then be updated by running `update_release_info.rb`.
+  This will update the asset information from GitHub.
+* Add a news item. Usually a news item is enough but something
+  more can be called for for major releases
 
 Post `docs/publicity/announce.txt` at least to wx-announce@googlegroups.com and
-to wx-users for the important releases.
+to wx-users.
 
 Submit a link to https://www.reddit.com/r/programming
 

docs/doxygen/Doxyfile

@@ -292,6 +292,13 @@ WARN_LOGFILE           = doxygen.log
 INPUT                  = mainpages \
                          groups \
                          overviews \
+                         ../gtk \
+                         ../ios \
+                         ../motif \
+                         ../msw \
+                         ../osx \
+                         ../qt \
+                         ../x11 \
                          ../../interface
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h *.md

docs/doxygen/mainpages/platdetails.h

@@ -52,8 +52,9 @@ GTK+ 1.2 can still be used, albeit discouraged. For that you can pass
 Support for GTK+ 3 is available starting with wxWidgets 2.9.4, use @c configure
 option @c \--with-gtk=3 to enable it.
 
-For further information, please see the files in @c docs/gtk in the
+@subpage plat_gtk_install "Build and Install Instructions"
-distribution.
+
+@subpage plat_gtk_overview "wxWidgets on the GNOME Desktop"
 
 
 
@@ -62,8 +63,7 @@ distribution.
 wxOSX/Cocoa is the port of wxWidgets for the OS X platform. It requires
 OS X 10.7 or later and fully supports 64 bit builds.
 
-For further information, please see the files in @c docs/osx in the
+@subpage plat_osx_install "Build and Install Instructions"
-distribution.
 
 
 
@@ -80,8 +80,9 @@ In order to configure wxWidgets to compile wxX11 you will need to type:
 
 @verbatim configure --with-x11 --with-universal @endverbatim
 
-For further information, please see the files in @c docs/x11 in the
+@subpage plat_x11_install "Build Instructions"
-distribution. There is also a page on the use of wxWidgets for embedded
+
+There is also a page on the use of wxWidgets for embedded
 applications on the wxWidgets web site.
 
 
@@ -92,8 +93,8 @@ wxMotif is a port of wxWidgets for X11 systems using Motif libraries. Motif
 libraries provide a clean and fast user interface at the expense of the beauty
 and candy of newer interfaces like GTK.
 
-For further information, please see the files in @c docs/motif in the
+@subpage plat_motif_install "Build Instructions"
-distribution.
+
 
 
 
@@ -105,7 +106,9 @@ This port can be compiled with several compilers including Microsoft Studio
 VC++ 2003 or later, Borland 5.5, MinGW32, Cygwin as well as cross-compilation
 with a Linux-hosted MinGW32 tool chain.
 
-For further information, please see the files in docs/msw in the distribution.
+@subpage plat_msw_install "Build and Install Instructions"
+
+@subpage plat_msw_binaries "Using pre-built binaries"
 
 @subsection page_port_wxmsw_resources Resources and Application Icon
 
@@ -167,7 +170,9 @@ wxWindowBase::GetDefaultBorder(), returning wxBORDER_NONE.
 
 wxQt is a port of wxWidgets using Qt libraries. It requires Qt 5 or later.
 
-For further information, please see the files in docs/qt in the distribution.
+@subpage plat_qt_install "Build Instructions"
+
+@subpage plat_qt_architecture "Architecture Overview"
 
 @section page_port_wxiOS wxiOS
 
@@ -175,7 +180,7 @@ wxiOS is a port of wxWidgets using Cocoa touch libraries for iOS. It is very
 basic in it current form, but is included for further improvements and very
 simple applications. It requires iOS 9 or later and fully supports 64 bit builds.
 
-For further information, please see the files in docs/ios in the distribution.
+@subpage plat_ios_install "Build Instructions"
 
 @section page_port_nativedocs Native Toolkit Documentation
 

docs/doxygen/overviews/html.h

@@ -505,6 +505,7 @@ DL
 DT
 EM
 FONT            COLOR=[color]
+                BGCOLOR=[color]
                 SIZE=[fontsize]
                 FACE=[comma-separated list of facenames]
 HR              ALIGN=[alignment]

docs/gtk/install.md

@@ -1,6 +1,8 @@
-wxWidgets for GTK+ installation
+wxWidgets for GTK+ installation        {#plat_gtk_install}
 -------------------------------
 
+[TOC]
+
 IMPORTANT NOTE:
 
   If you experience problems installing, please re-read these
@@ -13,7 +15,11 @@ IMPORTANT NOTE:
   using (including the beta) and what compiler on what system. One
   example: wxGTK 3.0.0, GCC 4.8.1, Fedora 19
 
-* The simplest case
+Installation                           {#gtk_install}
+============
+
+
+The simplest case                      {#gtk_simple}
 -------------------
 
 If you compile wxWidgets on Linux for the first time and don't like to read
@@ -26,6 +32,7 @@ install instructions just do (in the base dir):
     > su <type root password>
     > make install
     > ldconfig
+
 [if you get "ldconfig: command not found", try using "/sbin/ldconfig"]
 
 If you don't do the 'make install' part, you can still use the libraries from
@@ -40,7 +47,7 @@ If you want to remove wxWidgets on Unix you can do this:
 Note that by default, GTK+ 2.x is used. GTK+ 3 can be specified
 with --with-gtk=3.
 
-* The expert case
+The expert case                        {#gtk_expert}
 -----------------
 
 If you want to do some more serious cross-platform programming with wxWidgets,
@@ -74,7 +81,7 @@ cd ..
 Note that you can install all those libraries concurrently, you just need to
 pass the appropriate flags when using them.
 
-* The simplest errors
+The simplest errors                    {#gtk_errors_simple}
 ---------------------
 
 For any configure errors: please look at config.log file which was generated
@@ -101,18 +108,18 @@ GCC 2.95 or later.
 
 You get immediate segfault when starting any sample or application: This is
 either due to having compiled the library with different flags or options than
-your program - typically you might have the __WXDEBUG__ option set for the
+your program - typically you might have the `__WXDEBUG__` option set for the
 library but not for your program - or due to using a compiler with optimisation
 bugs.
 
-* The simplest program
+The simplest program                   {#gtk_simple_app}
 ----------------------
 
 Now create your super-application myfoo.cpp and compile anywhere with
 
     g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 
-* GUI libraries
+GUI libraries                          {#gtk_libs_gui}
 ---------------
 
 wxWidgets/GTK+ requires the GTK+ library to be installed on your system. It has
@@ -127,7 +134,7 @@ You can get the newest version of the GTK+ from the GTK+ homepage at:
 We also mirror GTK+ at my ftp site. You'll find information about downloading
 at my homepage.
 
-* Additional libraries
+Additional libraries                   {#gtk_libs_misc}
 ----------------------
 
 wxWidgets/Gtk requires a thread library and X libraries known to work with
@@ -145,7 +152,7 @@ make install
     ldconfig
     exit
 
-* Building wxGTK on Cygwin
+Building wxGTK on Cygwin               {#gtk_cygwin}
 --------------------------
 
 The normal build instructions should work fine on Cygwin. The one difference
@@ -159,10 +166,11 @@ will see linking errors. If this happens then you can work around the
 problem by setting LDFLAGS=-Wl,--export-all-symbols. Please also let us know
 about it on the wx-dev mailing list.
 
-* Create your configuration
+Create your configuration              {#gtk_config}
 ---------------------------
 
 Usage:
+
     ./configure options
 
 If you want to use system's C and C++ compiler,
@@ -182,7 +190,7 @@ have multiple configurations (for example, debug and release or GTK
 and Motif) simultaneously.
 
 
-* General options
+General options                        {#gtk_options}
 -----------------
 
 Given below are the commands to change the default behaviour,
@@ -259,7 +267,7 @@ The following options handle the kind of library you want to build.
                             option instead of --enable-debug_info/flag ones
                             separately.
 
-* Feature Options
+Feature Options                        {#gtk_feature_options}
 -----------------
 
 When producing an executable that is linked statically with wxGTK
@@ -316,7 +324,7 @@ Please see the output of "./configure --help" for comprehensive list
 of all configurable options.
 
 
-* Compiling
+Compiling                              {#gtk_compling}
 -----------
 
 The following must be done in the base directory (e.g. ~/wxGTK
@@ -352,10 +360,10 @@ make clean
 
 in the various directories will do the work for you.
 
-* Creating a new Project
+Creating a new Project                 {#gtk_new_project}
 --------------------------
 
-1) The first way uses the installed libraries and header files
+1. The first way uses the installed libraries and header files
     automatically using wx-config
 
         g++ myfoo.cpp `wx-config --cxxflags --libs` -o myfoo
@@ -380,15 +388,8 @@ specify required libraries when running wx-config. For example,
     with libraries required by core GUI classes and wxHTML classes. See
     the manual for more information on the libraries.
 
-2) The other way creates a project within the source code
+2. The other way creates a project within the source code
 directories of wxWidgets. For this endeavour, you'll need
 GNU autoconf version 2.14 and add an entry to your Makefile.in
 to the bottom of the configure.in script and run autoconf
 and configure before you can type make.
-
-----------------------
-
-In the hope that it will be useful,
-
-        Robert Roebling
-

docs/gtk/overview.md

@@ -1,4 +1,4 @@
-# wxWidgets on the GNOME Desktop
+# wxWidgets on the GNOME Desktop       {#plat_gtk_overview}
 
 wxWidgets is a C++ cross-platform GUI library, whose distintive feature is the
 use of native calls and native widgets on the respective platform, i.e. an

docs/ios/install.md

@@ -0,0 +1,27 @@
+Building wxWidgets for iOS           {#plat_ios_install}
+----------------------------
+
+wxiOS is far from a full supported port, but can be used
+as base for simple applications and future improvements.
+
+It requires Xcode with iOS SDK 9.0 or later. Xcode is available
+for free in the OS X app store.
+
+To build wxiOS you should use Xcode to open the minimal samples
+Xcode project file located at:
+
+    samples/minimal/minimal_iphone.xcodeproj
+
+That project files includes wxiphone.xcodeproj so you just need
+to hit run in order to see the minimal sample running in the
+simulator.
+
+The library can also be build via configure/make:
+
+    mkdir build_ios
+    cd build_ios
+    ../configure --with-osx_iphone --enable-monolithic \
+        --with-macosx-version-min=8.0 --disable-shared \
+        --enable-macosx_arch=i386 \
+        --with-macosx-sdk=$(xcrun --sdk iphonesimulator --show-sdk-path)
+    make

docs/ios/readme.txt

@@ -4,35 +4,6 @@
 wxiOS is far from a full supported port, but can be used
 as base for simple applications and future improvements.
 
-It requires Xcode with iOS SDK 9.0 or later. Xcode is available
-for free in the OS X app store.
-
-More info about the wxWidgets project (including all the
-other ports and version of wxWidgets) can be found at the
-main wxWidgets homepage at:
-
-    https://www.wxwidgets.org/
-
-To build wxiOS you should use Xcode to open the minimal samples
-Xcode project file located at:
-
-    samples/minimal/minimal_iphone.xcodeproj
-
-That project files includes wxiphone.xcodeproj so you just need
-to hit run in order to see the minimal sample running in the
-simulator.
-
-The library can also be build via configure/make:
-
-    mkdir build_ios
-    cd build_ios
-    ../configure --with-osx_iphone --enable-monolithic \
-        --with-macosx-version-min=8.0 --disable-shared \
-        --enable-macosx_arch=i386 \
-        --with-macosx-sdk=$(xcrun --sdk iphonesimulator --show-sdk-path)
-    make
-
-
 Please send problems concerning installation, feature requests,
 bug reports or comments to the wxWidgets users list. These can
 be found at https://www.wxwidgets.org/support/mailing-lists/

docs/motif/install.md

@@ -1,6 +1,8 @@
-wxWidgets for Motif installation
+wxWidgets for Motif installation       {#plat_motif_install}
 --------------------------------
 
+[TOC]
+
 IMPORTANT NOTE:
 
   If you experience problems installing, please re-read these
@@ -40,10 +42,10 @@ First steps
   config.log file).
 
 
-COMPILING USING CONFIGURE
+Compiling using configure              {#motif_configure}
 =========================
 
-* The simplest case
+The simplest case                      {#motif_simple}
 -------------------
 
 If you compile wxWidgets on Linux for the first time and don't like to read
@@ -71,7 +73,7 @@ If you want to remove wxWidgets on Unix you can do this:
     > ldconfig
     > exit
 
-* The expert case
+The expert case                        {#motif_expert}
 -----------------
 
 If you want to do some more serious cross-platform programming with wxWidgets,
@@ -105,7 +107,7 @@ cd ..
 Note that since wxWidgets-2.6.0 you can install all those libraries
 concurrently, you just need to pass the appropriate flags when using them.
 
-* The simplest errors
+The simplest errors                    {#motif_error_simple}
 ---------------------
 
 You get errors during compilation: The reason is that you probably have a
@@ -115,18 +117,18 @@ GCC 2.95 or later.
 
 You get immediate segfault when starting any sample or application: This is
 either due to having compiled the library with different flags or options than
-your program - typically you might have the __WXDEBUG__ option set for the
+your program - typically you might have the `__WXDEBUG__` option set for the
 library but not for your program - or due to using a compiler with optimisation
 bugs.
 
-* The simplest program
+The simplest program                   {#motif_simple_app}
 ----------------------
 
 Now create your super-application myfoo.app and compile anywhere with
 
     g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 
-* General
+General                                {#motif_general}
 ---------
 
 The Unix variants of wxWidgets use GNU configure. If you have problems with
@@ -142,7 +144,7 @@ YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF MOTIF, WXMOTIF, WHAT
 DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect,
 but I tried...
 
-* GUI libraries
+GUI libraries                          {#motif_libs_gui}
 ---------------
 
 wxWidgets/Motif requires the Motif library to be installed on your system. As
@@ -153,7 +155,7 @@ You can get the newest version of the Lesstif from the lesstif homepage at:
 
 http://lesstif.sourceforge.net/
 
-* Additional libraries
+Additional libraries                   {#motif_libs_misc}
 ----------------------
 
 wxWidgets/Motif requires a thread library and X libraries known to work with
@@ -171,7 +173,7 @@ make install
     ldconfig
     exit
 
-* Building wxMotif on Cygwin
+Building wxMotif on Cygwin             {#motif_cygwin}
 ----------------------------
 
 The normal build instructions should work fine on Cygwin. The one difference
@@ -185,10 +187,11 @@ will see linking errors. If this happens then you can work around the
 problem by setting LDFLAGS=-Wl,--export-all-symbols. Please also let us know
 about it on the wx-dev mailing list.
 
-* Create your configuration
+Create your configuration              {#motif_config}
 ---------------------------
 
 Usage:
+
 	./configure [options]
 
 If you want to use system's C and C++ compiler,
@@ -216,7 +219,7 @@ Configure will complain if the system variable OSTYPE has
 not been defined. And Make in some circumstances as well...
 
 
-* General options
+General options                        {#motif_options}
 -------------------
 
 Given below are the commands to change the default behaviour,
@@ -289,7 +292,7 @@ The following options handle the kind of library you want to build.
 				must be compiled with the same debug
 				options.
 
-* Feature Options
+Feature Options                        {#motif_feature_options}
 -----------------
 
 Many of the configure options have been thoroughly tested
@@ -338,7 +341,7 @@ Please see the output of "./configure --help" for comprehensive list
 of all configurable options.
 
 
-* Compiling
+Compiling                              {#motif_compile}
 -----------
 
 The following must be done in the base directory (e.g. ~/wxMotif
@@ -374,10 +377,10 @@ object-files:
 
 in the various directories will do the work for you.
 
-* Creating a new Project
+Creating a new Project                 {#motif_new_project}
 ------------------------
 
-1) The first way uses the installed libraries and header files
+1. The first way uses the installed libraries and header files
 automatically using wx-config
 
         g++ myfoo.cpp `wx-config --libs` `wx-config --cxxflags` -o myfoo
@@ -402,13 +405,13 @@ specify required libraries when running wx-config. For example,
     with libraries required by core GUI classes and wxHTML classes. See
     the manual for more information on the libraries.
 
-2) The other way creates a project within the source code
+2. The other way creates a project within the source code
 directories of wxWidgets. For this endeavour, you'll need
 GNU autoconf version 2.14 and add an entry to your Makefile.in
 to the bottom of the configure.in script and run autoconf
 and configure before you can type make.
 
-* Further notes by Julian Smart
+Further notes by Julian Smart          {#motif_notes}
 ---------------------------------
 
 - You may find the following script useful for compiling wxMotif,
@@ -416,7 +419,6 @@ and configure before you can type make.
   permissions). Make this script executable with the command
   chmod a+x makewxmotif.
 
-  -------:x-----Cut here-----:x-----
         # makewxmotif
         # Sets permissions (in case we extracted wxMotif from zip files)
         # and makes wxMotif.
@@ -429,12 +431,11 @@ and configure before you can type make.
         chmod a+x configure config.sub config.guess
         ./configure --with-shared --with-motif --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets --without-odbc
         make
-  -------:x-----Cut here-----:x-----
 
   This script will build wxMotif using shared libraries. If you want to build
   a static wxWidgets library, use --disable-shared.
 
-Troubleshooting
+Troubleshooting                        {#motif_troubleshoot}
 ---------------
 
 - Solaris compilation with gcc: if the compiler has problems with the variable
@@ -458,20 +459,10 @@ Troubleshooting
   If you find any incorrect instances, though, such as a
   missing 'const' in an overridden function, please let us know.
 
-Other Notes
+Other Notes                            {#motif_misc}
 -----------
 
 - Using configure will create a release build of the library by
   default: it's recommended to use --enable-debug configure switch
   while developing your application. To compile in non-debug mode, use
   --disable-debug configure switch.
-
-Bug reports
------------
-
-Please send bug reports with a description of your environment,
-compiler and the error message(s) to the developers mailing list at:
-
-    https://www.wxwidgets.org/support/mailing-lists/
-
-Julian Smart, Robert Roebling and Vadim Zeitlin, November 1999.

docs/msw/binaries.md

@@ -0,0 +1,90 @@
+How to use wxMSW binaries              {#plat_msw_binaries}
+=========================
+
+[TOC]
+
+Supported Compilers
+-------------------
+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).
+* 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.
+
+
+Getting the files
+-----------------
+
+First, you need to get the correct files. You will always need the
+`wxWidgets-3.1.1-headers.7z` one but the rest depends on your compiler version
+and architecture: as different versions of MSVC compiler are not binary
+compatible, you should select the files with the correct
+`vc80`, `vc90`, `vc100`, `vc110`, `vc120`, `vc140` or `vc141`
+suffix depending on whether you use
+Visual Studio 2005, 2008, 2010, 2012, 2013, 2015 or 2017 respectively.
+You also need to decide whether you use the `x64` files for 64-bit development
+or the ones without this suffix for the still more common 32-bit builds. After
+determining the combination of suffixes you need, you should download the
+"Dev" and the "ReleaseDLL" files in addition to the "Headers" one above,
+e.g. for 32-bit MSVS 2017 development you need
+`wxMSW-3.1.1_vc141_Dev.7z` and `wxMSW-3.1.1_vc141_ReleaseDLL.7z`.
+
+All binaries are available at:
+
+https://github.com/wxWidgets/wxWidgets/releases/v3.1.1
+
+Once you have the files you need, unzip all of them into the same directory, for
+example `c:\wx\3.1.1`. You should have only include and lib subdirectories under
+it, nothing else. To avoid hard-coding this path into your projects, define
+`wxwin` environment variable containing it: although it's a little known fact,
+all versions of MSVC support environment variable expansion in the C++ projects
+(but not, unfortunately, in the solution files).
+
+Using Binaries with Visual Studio
+---------------------------------
+
+Next step is to set up your project to use these files. You need to do the
+following:
+
+*   In the compiler options, i.e. "C/C++" properties:
+    *   Add `$(wxwin)/include/msvc;$(wxwin)/include` to the "Additional Include
+        Directories". Notice that the order is important here, putting the
+        MSVC-specific directory first ensures that you use `wx/setup.h`
+        automatically linking in wxWidgets libraries.
+    *   Add `WXUSINGDLL` and `wxMSVC_VERSION_AUTO` to the list of defined
+        symbols in "Preprocessor Definitions". The first should be
+        self-explanatory (we only provide DLLs, not static libraries) while the
+        second one is necessary to use the libraries from e.g. `lib\vc100_dll`
+        directory and not the default `lib\vc_dll`.
+    *   Also check that `_UNICODE` and `UNICODE` symbols are defined in the same
+        "Preprocessor Definitions" section. This should already be the case for
+        the newly created projects but it might be necessary to add them if
+        you're upgrading an existing one.
+    *   Check that you use "Multi-threaded \[Debug\] DLL" in the "Run-time
+        library" option under "Code Generation" to ensure that your build uses
+        the same CRT version as our binaries.
+*   In the linker options you only need to add `$(wxwin)\lib\vc141_dll` (with
+    the compiler-version-dependent suffix, of course) to "Additional Library
+    Directories" under "Linker\\General" in the options. Thanks to the use of
+    MSVC-specific `setup.h` you don't need to list wxWidgets libraries manually,
+    i.e. you do **not** need to put anything in the list of "Additional
+    Dependencies".
+
+Now you should be able to build your project successfully, both in "Debug" and
+"Release" configurations. With MSVS 10 or newer it can also be done from the
+command line using `msbuild.exe`. Of course, to run the generated executable
+you will need to either add the directory containing wxWidgets DLLs to your PATH
+or copy the DLL files to a directory already on it. Finally, if you want to
+distribute the binaries created using these options, you will need to install
+Microsoft Visual C++ run-time DLLs. Again, MSVC 10 or newer has an advantage
+here as you can simply copy `msvcp100.dll` and `msvcr100.dll` as any other DLL,
+while you need to install specially for the previous compiler versions that
+use WinSxS ("side-by-side") for them.

docs/msw/gtk.md

@@ -1,4 +1,4 @@
-Building wxGTK port with Win32 GDK backend
+Building wxGTK port with Win32 GDK backend {#plat_msw_gtk}
 ------------------------------------------
 
 GTK+ widget toolkit has multiple GDK backends and one of them is Win32.
@@ -11,7 +11,7 @@ These notes don't consider building wxGTK with X11 backend under Windows.
 Building steps:
 
 1. wxGTK/Win32 build is similar to wxMSW one and you should have configured
-and be able to build wxWidgets as described in docs/msw/install.txt
+and be able to build wxWidgets as described in @ref plat_msw_install
 
 2. wxGTK/Win32 is disabled by default in wxWidgets, you need to enable it
 in bakefiles manually. Apply following patch manually or using Cygwin:
@@ -19,6 +19,7 @@ in bakefiles manually. Apply following patch manually or using Cygwin:
         patch -p0 < docs/msw/gtkfix.patch
 
 Regenerate required make/project files:
+
     cd build\bakefiles
     bakefile_gen
 
@@ -31,6 +32,7 @@ in the C:\gtk directory.
 4. Building
 
 4.1 If you are using Visual C++ project files you need to setup GTK+ 2 include directories
+
     C:\gtk\lib\include\gtk-2.0
     C:\gtk\lib\include\glib-2.0
     C:\gtk\lib\include\cairo

docs/msw/install.md

@@ -1,37 +1,26 @@
-                   Installing wxWidgets for Windows
+Installing wxWidgets for Windows       {#plat_msw_install}
 --------------------------------
 
 This is wxWidgets for Microsoft Windows (XP, Vista, 7, 8, 10, etc)
 including both 32 bit and 64 bit versions.
 
+[TOC]
 
-Table of Contents:
+Installation                           {#msw_install}
- - Installation
- - Building wxWidgets
- - Configuring the Build
- - Building Applications Using wxWidgets
-
-
-Installation
 ============
 
-If you are using one of the supported compilers, you can download the
+If you are using one of the supported compilers, you can use
-pre-built in binaries from
+[pre-built binaries](@ref plat_msw_binaries).
-
-    https://github.com/wxWidgets/wxWidgets/releases/v3.1.1
 
 In this case, just uncompress the binaries archive under any directory
-and skip to "Building Applications Using wxWidgets" part.
+and skip to [Building Applications Using wxWidgets](#msw_build_apps) part.
 
 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
+If you use CMake, please see @ref overview_cmake for
-
+building wxWidgets using it.
-    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
@@ -47,7 +36,7 @@ this environment variable is used in the examples below.
 
 NB: If you checked your sources from version control repository and
 didn't obtain them from a release file, you also need to copy
-    include/wx/msw/setup0.h to include/wx/msw/setup.h and to remember
+`include/wx/msw/setup0.h` to `include/wx/msw/setup.h` and to remember
 to update the latter whenever the former changes, otherwise you
 will get compilation errors if any new symbols are added to
 setup0.h file in the repository.
@@ -61,7 +50,7 @@ NB: If you checked your sources from version control repository and
 
 
 
-Building wxWidgets
+Building wxWidgets                     {#msw_build}
 ==================
 
 The following sections explain how to compile wxWidgets with each supported
@@ -70,7 +59,7 @@ building your application using wxWidgets.
 
 All makefiles and project are located in build\msw directory.
 
-Microsoft Visual C++ Compilation
+Microsoft Visual C++ Compilation       {#msw_build_msvs}
 ----------------------------------------------------------------
 
 * From command line using the provided makefiles:
@@ -79,7 +68,7 @@ Microsoft Visual C++ Compilation
    must have been installed to the "Start" menu or the "Start" screen
    by MSVS installation.
 
-1. Change directory to %WXWIN%\build\msw and type
+1. Change directory to \%WXWIN\%\build\msw and type
 
         > nmake /f makefile.vc
 
@@ -99,7 +88,7 @@ Microsoft Visual C++ Compilation
    See "Configuring the Build" for more information about the
    additional parameters that can be specified on the command line.
 
-2. To verify your build, change the directory to %WXWIN%\samples\minimal and
+2. To verify your build, change the directory to \%WXWIN\%\samples\minimal and
    run the same nmake command (with the same parameters there), this
    should create a working minimal wxWidgets sample.
 
@@ -120,7 +109,7 @@ are not always built in the correct order, and this may result in link
 errors. Simply do the build again, up to 3 times, to fix this.
 
 
-Special notes for Visual Studio 2010+:
+### Special notes for Visual Studio 2010+
 
 For Visual Studio 2010+ solutions it is possible to customize the build by
 creating a wx_local.props file in the build\msw directory which is used, if it
@@ -147,27 +136,30 @@ updated with it. For example the version information in wx_setup.props could
 change and the information in your wx_local.props would be outdated. It is
 your responsibility to monitor for such situations.
 
-Improve debugging for Visual Studio 2012+:
+### Improve debugging for Visual Studio 2012+
 
 Debug visualizers for Visual Studio 2012+ are provided which makes inspecting
 various wxWidgets classes easier to view while debugging. To use them:
 
-1. Open the folder %WXWIN%\misc\msvc
+1. Open the folder \%WXWIN\%\misc\msvc
-2. Open the folder %USERPROFILE%\My Documents\Visual Studio 2012\Visualizers\
+2. Open the folder \%USERPROFILE\%\My Documents\Visual Studio 2012\Visualizers\
    (or the corresponding location for newer versions, e.g. ...2013\Visualizers)
 3. Copy wxWidgets.natvis and autoexp.inc
 4. For Visual Studio 2013+ additionally copy wxWidgets.2013.natvis
 
 
-Cygwin/MinGW Compilation
+Cygwin/MinGW Compilation               {#msw_build_cygwin}
 ----------------------------------------------------------------
 
 wxWidgets supports Cygwin, MinGW, MinGW-w64 and TDM-GCC tool chains under
 Windows. They can be downloaded from:
 
 http://www.cygwin.com/
+
 http://www.mingw.org/
+
 http://mingw-w64.sourceforge.net/
+
 http://tdm-gcc.tdragon.net/
 
 respectively. Please retrieve and install the latest version of your preferred
@@ -189,7 +181,7 @@ All of these tool chains can be used either with Unix-like configure+make build
 process (preferred) or with the provided makefile.gcc makefiles without using
 configure:
 
-* Using configure
+### Using configure
 
 This method works in exactly the same way as under Unix systems,
 including OS X, and requires a Unix-like environment to work, i.e.
@@ -231,7 +223,7 @@ either MSYS or Cygwin.
    so this step can usually be omitted.
 
 
-* Using plain makefiles:
+### Using plain makefiles:
 
 NOTE: The makefile.gcc makefiles are for compilation under MinGW using
       Windows command interpreter (command.com/cmd.exe), they won't work
@@ -240,7 +232,7 @@ NOTE: The makefile.gcc makefiles are for compilation under MinGW using
 
 0. Open DOS command line window (cmd.exe, *not* Bash sh.exe).
 
-1. Change directory to %WXWIN%\build\msw and type
+1. Change directory to \%WXWIN\%\build\msw and type
 
         > mingw32-make -f makefile.gcc
 
@@ -263,7 +255,7 @@ NOTE: The makefile.gcc makefiles are for compilation under MinGW using
 
 
 
-Borland C++ Compilation
+Borland C++ Compilation                {#msw_build_borland}
 ----------------------------------------------------------------
 
 WARNING: Borland instructions are out of date, please send us your
@@ -278,7 +270,7 @@ debugger is very good. To avoid linker errors you will need to add
 -DSHARED=1 to the makefile line for the library
 
 The version 5.6 included in Borland C++ Builder 2006 works as well after the
-following small change: please remove the test for __WINDOWS__ from line 88
+following small change: please remove the test for `__WINDOWS__` from line 88
 of the file BCCDIR\include\stl\_threads.h.
 
 Compiling using the makefiles:
@@ -302,7 +294,7 @@ debug mode, edit makefile.bcc and change /aa to /Tpe in link commands.
 Using the Debugger and IDE in BDS or Turbo Explorer
 ---------------------------------------------------
 
-Doubleclick / open %WXWIN%\samples\minimal\borland.bdsproj. The current version
+Doubleclick / open \%WXWIN\%\samples\minimal\borland.bdsproj. The current version
 is to be used with a dynamic build of wxWidgets-made by running
 make -f Makefile.bcc -DBUILD=debug -DSHARED=1
 in wxWidgets\build\msw. You also need the wxWidgets\lib\bcc_dll
@@ -333,7 +325,7 @@ more details)
 
 
 
-Configuring the Build
+Configuring the Build                  {#msw_build_config}
 ================================================================
 
 NOTE: If you use configure to build the library with Cygwin/MinGW, the
@@ -344,7 +336,7 @@ Library configuration
 ----------------------------------------------------------------
 
 While it is never necessary to do it, you may want to change some of
-the options in the %WXWIN%\include\wx\msw\setup.h file before building
+the options in the \%WXWIN\%\\include\\wx\\msw\\setup.h file before building
 wxWidgets. This file is heavily commented, please read it and enable or disable
 the features you would like to compile wxWidgets with[out].
 
@@ -381,17 +373,20 @@ depending on the compiler used.
 
 The full list of the build settings follows:
 
-BUILD=release
+* BUILD=release
+
   Builds release version of the library. It differs from default 'debug' in
   lack of appended 'd' in name of library and uses the release CRT libraries
   instead of debug ones. Notice that even release builds do include debug
   information by default, see DEBUG_FLAG for more information about it.
 
-SHARED=1
+* SHARED=1
+
   Build shared libraries (DLLs). By default, DLLs are not built
   (SHARED=0).
 
-UNICODE=0
+* UNICODE=0
+
   To completely disable Unicode support (default is UNICODE=1). It should not
   be necessary to do this.
 
@@ -399,54 +394,62 @@ UNICODE=0
   Unicode build) and the directory where the library and setup.h are stored
   (ditto).
 
-WXUNIV=1
+* WXUNIV=1
+
   Build wxUniversal instead of native wxMSW
 
-MONOLITHIC=1
+* MONOLITHIC=1
+
   Starting with version 2.5.1, wxWidgets has the ability to be built as
   several smaller libraries instead of single big one as used to be the case
   in 2.4 and older versions. This is called "multilib build" and is the
   default behaviour of makefiles. You can still build single library
   ("monolithic build") by setting MONOLITHIC variable to 1.
 
-USE_GUI=0
+* USE_GUI=0
+
   Disable building GUI parts of the library, build only wxBase components used
   by console applications. Note that if you leave USE_GUI=1 then both wxBase
   and GUI libraries are built.
 
-USE_$(LIBRARY)=0
+* USE_$(LIBRARY)=0
+
   Do not build the corresponding library (all libraries are built by
   default). Library which can be disabled in this way are: AUI, HTML,
   MEDIA, GL (the option name is USE_OPENGL for this one), PROPGRID,
   QA, RIBBON, RICHTEXT, STC, WEBVIEW, XRC.
 
-RUNTIME_LIBS=static
+* RUNTIME_LIBS=static
+
   Links static version of C and C++ runtime libraries into the executable, so
   that the program does not depend on DLLs provided with the compiler (e.g.
   Visual C++'s msvcrt.dll or Borland's cc3250mt.dll).
   Caution: Do not use static runtime libraries when building DLL (SHARED=1)!
 
-DEBUG_FLAG=0
+* DEBUG_FLAG=0
-DEBUG_FLAG=1
+* DEBUG_FLAG=1
-DEBUG_FLAG=2
+* DEBUG_FLAG=2
+
   Specifies the level of debug support in wxWidgets. Notice that
   this is independent from both BUILD and DEBUG_INFO options. By default
   always set to 1 meaning that debug support is enabled: asserts are compiled
   into the code (they are inactive by default in release builds of the
   application but can be enabled), wxLogDebug() and wxLogTrace() are available
-  and __WXDEBUG__ is defined. Setting it to 0 completely disables all
+  and `__WXDEBUG__` is defined. Setting it to 0 completely disables all
   debugging code in wxWidgets while setting it to 2 enables even the time
   consuming assertions and checks which are deemed to be unsuitable for
   production environment.
 
-DEBUG_INFO=0
+* DEBUG_INFO=0
-DEBUG_INFO=1
+* DEBUG_INFO=1
+
   This option affects whether debugging information is generated. If
   omitted or set to 'default' its value is determined the value of
   the BUILD option.
 
-DEBUG_RUNTIME_LIBS=0
+* DEBUG_RUNTIME_LIBS=0
-DEBUG_RUNTIME_LIBS=1
+* DEBUG_RUNTIME_LIBS=1
+
   (VC++ only.) If set to 1, msvcrtd.dll is used, if to 0, msvcrt.dll
   is used. By default msvcrtd.dll is used only if the executable
   contains debug info and msvcrt.dll if it doesn't. It is sometimes
@@ -455,11 +458,13 @@ DEBUG_RUNTIME_LIBS=1
   usable .pdb files with debug information) and this setting makes it
   possible.
 
-TARGET_CPU=X64|ARM64|IA64
+* TARGET_CPU=X64|ARM64|IA64
+
   (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86
   build is performed.
 
-VENDOR=<your company name>
+* VENDOR=\<your company name\>
+
   Set this to a short string identifying your company if you are planning to
   distribute wxWidgets DLLs with your application. Default value is 'custom'.
   This string is included as part of DLL name. wxWidgets DLLs contain compiler
@@ -468,72 +473,74 @@ VENDOR=<your company name>
   default settings. If you set VENDOR=mycorp, the name will change to
   wxmsw311u_core_vc_mycorp.dll.
 
-CFG=<configuration name>
+* CFG=\<configuration name\>
+
   Sets configuration name so that you can have multiple wxWidgets builds with
   different setup.h settings coexisting in same tree. The value of
   this option is appended to the build directories names. This is
   useful for building the library in some non-default configuration,
-  e.g. you could change wxUSE_STL to 1 in %WXWIN%\include\wx\msw\setup.h and
+  e.g. you could change wxUSE_STL to 1 in \%WXWIN\%\include\wx\msw\setup.h and
   then build with "CFG=-stl". Alternatively, you could build with e.g.
   "RUNTIME_LIBS=static CFG=-mt" when using MSVC.
 
-COMPILER_PREFIX=<string>
+* COMPILER_PREFIX=\<string\>
+
   If you build with multiple versions of the same compiler, you can put
   their outputs into directories like "vc6_lib", "vc8_lib" etc. instead of
   "vc_lib" by setting this variable to e.g. "vc6". This is merely a
   convenience variable, you can achieve the same effect (but different
   directory names) with the CFG option.
 
-CFLAGS
+* CFLAGS
-CXXFLAGS
+* CXXFLAGS
-CPPFLAGS
+* CPPFLAGS
-LDFLAGS
+* LDFLAGS
+
   Additional flags to be used with C compiler, C++ compiler, C
   preprocessor (used for both C and C++ compilation) and linker,
   respectively.
 
 
 
-Building Applications Using wxWidgets
+Building Applications Using wxWidgets  {#msw_build_apps}
 =====================================
 
 If you want to use CMake for building your project, please see
-
+@ref overview_cmake.
-    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). And we will use <wx-lib-dir> as a shortcut for the subdirectory of
+$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
+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
+* 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
+  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.
+  - `__WXMSW__` to ensure you use the correct wxWidgets port.
   - _UNICODE unless you want to use deprecated ANSI build of wxWidgets.
   - NDEBUG if you want to build in release mode, i.e. disable asserts.
   - 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 <wx-lib-dir> directory described above to the libraries path.
+* 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
@@ -554,3 +561,18 @@ 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.
+
+If you are not using Visual Studio 2010 or newer please see
+@subpage plat_msw_winxp "Windows XP Support" to enable visual styles in your
+application.
+
+Advanced Library Configurations        {#msw_advanced}
+===============================
+Build instructions to less common library configuartions using different UI
+backends are avaiable here.
+
+@subpage plat_msw_msys2 "Building with Win32 MSys2 backend"
+
+@subpage plat_msw_msys2_gtk "Building with Win32 MSys2 GDK backend"
+
+@subpage plat_msw_gtk "Building wxGTK port with Win32 GDK backend"

docs/msw/msys2-gtk.md

@@ -0,0 +1,124 @@
+Building wxGTK port with Win32 MSys2 GDK backend {#plat_msw_msys2_gtk}
+------------------------------------------------
+
+GTK+ widget toolkit has multiple GDK backends and one of them is Win32.
+It is a wrapper around Windows API.
+
+These notes don't consider building wxGTK with X11 backend under Windows.
+
+The MSys2 website is http://www.msys2.org/
+
+These building steps are NOT the normal way to build MSys2 MinGW packages.
+But, they are a way the wxWidgets developers can test that wxWidgets
+can build the wxGTK/Win32 libraries under MSys2 MinGW.
+
+For the MSys2 way please see
+  https://github.com/Alexpux/MINGW-packages and
+  https://github.com/msys2/msys2/wiki/Creating-packages
+
+Building steps:
+
+**Warning**: At the time these directions were written the GTK version 3
+         was NOT able to create wxGTK/Win32 libraries that were usable.
+
+1. Install the mingw32 packages needed to build wxGTK/Win32 using the
+   configure/make build method.
+   From the MSys2 prompt or MSys2 MinGW prompt:
+
+   The 32 bit Mingw packages are prefixed with "mingw-w64-i686-";
+   Change the prefix to "mingw-w64-x86_64-" if you wish to do 64 bit.
+
+        pacman -S --needed --noconfirm make
+        pacman -S --needed --noconfirm mingw-w64-i686-libjpeg-turbo
+        pacman -S --needed --noconfirm mingw-w64-i686-libpng
+        pacman -S --needed --noconfirm mingw-w64-i686-libtiff
+        pacman -S --needed --noconfirm mingw-w64-i686-gcc
+        pacman -S --needed --noconfirm mingw-w64-i686-pkg-config
+        ## gtk2 can take a long time to update/find fonts
+        pacman -S --needed --noconfirm mingw-w64-i686-gtk2
+
+
+    Packages that are needed but are normally installed already.
+
+        pacman -S --needed --noconfirm mingw-w64-i686-gcc-libs
+        pacman -S --needed --noconfirm mingw-w64-i686-expat
+        pacman -S --needed --noconfirm mingw-w64-i686-xz
+        pacman -S --needed --noconfirm mingw-w64-i686-zlib
+        pacman -S --needed --noconfirm mingw-w64-i686-gdk-pixbuf2
+
+
+2. Build the wxGTK/Win32 static library
+    1. Open MSys2 MinGW Prompt
+       (These steps were tested on MinGW32; but, should work under MinGW64)
+    2. Use the cd command to change directory to the wxWidgets top folder.
+
+    3. Create the "build-gtk2-static" folder to build the static libraries
+
+            mkdir -p build-gtk2-static
+
+    4. Configure wxWidgets
+       Option "--disable-precomp-headers" is NOT needed.
+       It is being used to test for compile issues.
+
+       Remove configure option "--disable-wxdib" to set wxUSE_WXDIB to 1.
+       The directions docs/msw/gtk.txt results in wxUSE_WXDIB set to 1.
+
+            cd build-gtk2-static && \
+            ../configure --with-gtk=2 \
+                --disable-wxdib \
+                --disable-shared \
+                --disable-precomp-headers \
+            && cd ..
+
+    5. clean the wxGTK static libraries
+
+            cd build-gtk2-static && make clean && cd ..
+
+    6. make the wxGTK static libraries
+
+            cd build-gtk2-static && make && cd ..
+
+
+3.  Build and run the minimal static sample
+    1. Clean the minimal sample
+
+            cd build-gtk2-static/samples/minimal && make clean && cd ../../..
+
+    2. Build the minimal sample
+
+            cd build-gtk2-static/samples/minimal && make && cd ../../..
+
+    3. Run the minimal sample
+
+            ./build-gtk2-static/samples/minimal/minimal.exe
+
+
+4. Build most of the static samples
+    1. Clean most of the static samples
+
+            cd build-gtk2-static/samples && make clean && cd ../..
+
+    2. Build most of the static samples
+
+            cd build-gtk2-static/samples && make && cd ../..
+
+
+5.  Run the drawing static sample
+
+        cd samples/drawing && ../../build-gtk2-static/samples/drawing/drawing.exe && cd ../..
+
+6.  Run the splash static sample
+
+        cd samples/splash && ../../build-gtk2-static/samples/splash/splash.exe && cd ../..
+
+7.  Run the widgets static sample
+
+        cd samples/widgets && ../../build-gtk2-static/samples/widgets/widgets.exe && cd ../..
+
+8.  Run the toolbar static sample
+
+        cd samples/toolbar && ../../build-gtk2-static/samples/toolbar/toolbar.exe && cd ../..
+
+9.  Run the image static sample
+
+        cd samples/image && ../../build-gtk2-static/samples/image/image.exe && cd ../..

docs/msw/msys2-gtk.txt

@@ -1,111 +0,0 @@
-Building wxGTK port with Win32 MSys2 GDK backend
-------------------------------------------------
-
-GTK+ widget toolkit has multiple GDK backends and one of them is Win32.
-It is a wrapper around Windows API.
-
-These notes don't consider building wxGTK with X11 backend under Windows.
-
-The MSys2 website is http://www.msys2.org/
-
-These building steps are NOT the normal way to build MSys2 MinGW packages.
-But, they are a way the wxWidgets developers can test that wxWidgets
-can build the wxGTK/Win32 libraries under MSys2 MinGW.
-
-For the MSys2 way please see 
-  https://github.com/Alexpux/MINGW-packages and
-  https://github.com/msys2/msys2/wiki/Creating-packages
-
-Building steps:
-
-#Note: The "#" is used in front of a comment to help the people who cut
-#      and paste these directions.
-#Warning: At the time these directions were written the GTK version 3
-#         was NOT able to create wxGTK/Win32 libraries that were usable.
-
-#1. Install the mingw32 packages needed to build wxGTK/Win32 using the 
-#   configure/make build method. 
-#   From the MSys2 prompt or MSys2 MinGW prompt:
-
-#   The 32 bit Mingw packages are prefixed with "mingw-w64-i686-";
-#   Change the prefix to "mingw-w64-x86_64-" if you wish to do 64 bit.
-
-pacman -S --needed --noconfirm make
-pacman -S --needed --noconfirm mingw-w64-i686-libjpeg-turbo
-pacman -S --needed --noconfirm mingw-w64-i686-libpng
-pacman -S --needed --noconfirm mingw-w64-i686-libtiff
-pacman -S --needed --noconfirm mingw-w64-i686-gcc
-pacman -S --needed --noconfirm mingw-w64-i686-pkg-config
-## gtk2 can take a long time to update/find fonts
-pacman -S --needed --noconfirm mingw-w64-i686-gtk2
-
-
-# Packages that are needed but are normally installed already.
-pacman -S --needed --noconfirm mingw-w64-i686-gcc-libs
-pacman -S --needed --noconfirm mingw-w64-i686-expat
-pacman -S --needed --noconfirm mingw-w64-i686-xz
-pacman -S --needed --noconfirm mingw-w64-i686-zlib
-pacman -S --needed --noconfirm mingw-w64-i686-gdk-pixbuf2
-
-
-#2. Build the wxGTK/Win32 static library
-#2a.Open MSys2 MinGW Prompt
-#   (These steps were tested on MinGW32; but, should work under MinGW64)
-#2b.Use the cd command to change directory to the wxWidgets top folder.
-
-
-#2c.Create the "build-gtk2-static" folder to build the static libraries
-mkdir -p build-gtk2-static
-
-#2d.Configure wxWidgets
-#   Option "--disable-precomp-headers" is NOT needed.
-#   It is being used to test for compile issues.
-#
-#   Remove configure option "--disable-wxdib" to set wxUSE_WXDIB to 1.
-#   The directions docs/msw/gtk.txt results in wxUSE_WXDIB set to 1.
-cd build-gtk2-static && \
-  ../configure --with-gtk=2 \
-    --disable-wxdib \
-    --disable-shared \
-    --disable-precomp-headers \
-  && cd ..
-
-#2e.clean the wxGTK static libraries
-cd build-gtk2-static && make clean && cd ..
-
-#2f.make the wxGTK static libraries
-cd build-gtk2-static && make && cd ..
-
-
-#3  Build and run the minimal static sample
-#3a.Clean the minimal sample
-cd build-gtk2-static/samples/minimal && make clean && cd ../../..
-
-#3b.Build the minimal sample
-cd build-gtk2-static/samples/minimal && make && cd ../../..
-
-#3c.Run the minimal sample
-./build-gtk2-static/samples/minimal/minimal.exe
-
-
-#4  Build most of the static samples
-#4a.Clean most of the static samples
-cd build-gtk2-static/samples && make clean && cd ../..
-#4b.Build most of the static samples
-cd build-gtk2-static/samples && make && cd ../..
-
-
-#5  Run the drawing static sample
-cd samples/drawing && ../../build-gtk2-static/samples/drawing/drawing.exe && cd ../..
-
-#6  Run the splash static sample
-cd samples/splash && ../../build-gtk2-static/samples/splash/splash.exe && cd ../..
-
-#7  Run the widgets static sample
-cd samples/widgets && ../../build-gtk2-static/samples/widgets/widgets.exe && cd ../..
-
-#8  Run the toolbar static sample
-cd samples/toolbar && ../../build-gtk2-static/samples/toolbar/toolbar.exe && cd ../..
-
-#9  Run the image static sample
-cd samples/image && ../../build-gtk2-static/samples/image/image.exe && cd ../..

docs/msw/msys2-msw.md

@@ -0,0 +1,101 @@
+Building wxMSW port with Win32 MSys2 backend {#plat_msw_msys2}
+------------------------------------------------
+
+The MSys2 website is http://www.msys2.org/
+
+These building steps are NOT the normal way to build MSys2 MinGW packages.
+But, they are a way the wxWidgets developers can test that wxWidgets
+can build the wxMSW libraries under MSys2 MinGW.
+
+For the MSys2 way please see https://github.com/Alexpux/MINGW-packages
+
+Building steps:
+
+1. Install the mingw32 packages needed to build wxMSW using the
+   configure/make build method.
+   From the MSys2 prompt or MSys2 MinGW prompt:
+
+   The 32 bit Mingw packages are prefixed with "mingw-w64-i686-";
+   Change the prefix to "mingw-w64-x86_64-" if you wish to do 64 bit.
+
+        pacman -S --needed --noconfirm make
+        pacman -S --needed --noconfirm mingw-w64-i686-libjpeg-turbo
+        pacman -S --needed --noconfirm mingw-w64-i686-libpng
+        pacman -S --needed --noconfirm mingw-w64-i686-libtiff
+        pacman -S --needed --noconfirm mingw-w64-i686-gcc
+
+    Packages that are needed but are normally installed already.
+
+        pacman -S --needed --noconfirm mingw-w64-i686-gcc-libs
+        pacman -S --needed --noconfirm mingw-w64-i686-expat
+        pacman -S --needed --noconfirm mingw-w64-i686-xz
+        pacman -S --needed --noconfirm mingw-w64-i686-zlib
+
+
+2. Build the wxMSW static library
+    1. Open MSys2 MinGW Prompt
+   (These steps were tested on MinGW32; but, should work under MinGW64)
+    2. Use the cd command to change directory to the wxWidgets top folder.
+
+    3. Create the "build-msw-static" folder to build the static libraries
+
+            mkdir -p build-msw-static
+
+    4. Configure wxWidgets
+
+        Option "--disable-precomp-headers" is NOT needed.
+        I am doing it to check for compile issues;
+        And, I think my old 32 bit Windows machine
+        works best with it disabled.
+
+            cd build-msw-static && \
+            ../configure --with-msw \
+                --disable-shared \
+                --disable-precomp-headers \
+            && cd ..
+
+    5. make the wxMSW static libraries
+
+            cd build-msw-static && make && cd ..
+
+3. Build and run the minimal static sample
+
+    1. Clean the minimal sample
+
+            cd build-msw-static/samples/minimal && make clean && cd ../../..
+
+    2. Build the minimal sample
+
+            cd build-msw-static/samples/minimal && make && cd ../../..
+
+    3. Run the minimal sample
+
+            ./build-msw-static/samples/minimal/minimal.exe
+
+4. Clean the static samples
+
+        cd build-msw-static/samples && make clean && cd ../..
+
+5.  Build and run the typetest static sample to verify MIME database works
+
+        cd build-msw-static/samples/typetest && make && cd ../../..
+        ./build-msw-static/samples/typetest/typetest.exe
+
+6.  Build and run the drawing static sample
+
+        cd build-msw-static/samples/drawing && make && cd ../../..
+        cd samples/drawing && ../../build-msw-static/samples/drawing/drawing.exe && cd ../..
+
+7.  Build and run the splash static sample
+
+        cd build-msw-static/samples/splash && make && cd ../../..
+        cd samples/splash && ../../build-msw-static/samples/splash/splash.exe && cd ../..
+
+8.  Build and run the widgets static sample
+
+        cd build-msw-static/samples/widgets && make && cd ../../..
+        cd samples/widgets && ../../build-msw-static/samples/widgets/widgets.exe && cd ../..
+
+9.  Build all the rest of the static samples
+
+        cd build-msw-static/samples && make && cd ../..

docs/msw/msys2-msw.txt

@@ -1,92 +0,0 @@
-Building wxMSW port with Win32 MSys2 backend
-------------------------------------------------
-
-The MSys2 website is http://www.msys2.org/
-
-These building steps are NOT the normal way to build MSys2 MinGW packages.
-But, they are a way the wxWidgets developers can test that wxWidgets
-can build the wxMSW libraries under MSys2 MinGW.
-
-For the MSys2 way please see https://github.com/Alexpux/MINGW-packages
-
-Building steps:
-
-#Note: The "#" is used in front of a comment to help the people who cut
-#      and paste these directions.
-
-#1. Install the mingw32 packages needed to build wxMSW using the 
-#   configure/make build method. 
-#   From the MSys2 prompt or MSys2 MinGW prompt:
-
-#   The 32 bit Mingw packages are prefixed with "mingw-w64-i686-";
-#   Change the prefix to "mingw-w64-x86_64-" if you wish to do 64 bit.
-
-pacman -S --needed --noconfirm make
-pacman -S --needed --noconfirm mingw-w64-i686-libjpeg-turbo
-pacman -S --needed --noconfirm mingw-w64-i686-libpng
-pacman -S --needed --noconfirm mingw-w64-i686-libtiff
-pacman -S --needed --noconfirm mingw-w64-i686-gcc
-
-# Packages that are needed but are normally installed already.
-pacman -S --needed --noconfirm mingw-w64-i686-gcc-libs
-pacman -S --needed --noconfirm mingw-w64-i686-expat
-pacman -S --needed --noconfirm mingw-w64-i686-xz
-pacman -S --needed --noconfirm mingw-w64-i686-zlib
-
-
-#2. Build the wxMSW static library
-#2a.Open MSys2 MinGW Prompt
-#   (These steps were tested on MinGW32; but, should work under MinGW64)
-#2b.Use the cd command to change directory to the wxWidgets top folder.
-
-
-#2c.Create the "build-msw-static" folder to build the static libraries
-mkdir -p build-msw-static
-
-#2d.Configure wxWidgets
-#   Option "--disable-precomp-headers" is NOT needed.
-#   I am doing it to check for compile issues;
-#   And, I think my old 32 bit Windows machine
-#   works best with it disabled.
-cd build-msw-static && \
-  ../configure --with-msw \
-    --disable-shared \
-    --disable-precomp-headers \
-  && cd ..
-
-#2e.make the wxMSW static libraries
-cd build-msw-static && make && cd ..
-
-
-#3  Build and run the minimal static sample
-#3a.Clean the minimal sample
-cd build-msw-static/samples/minimal && make clean && cd ../../..
-
-#3b.Build the minimal sample
-cd build-msw-static/samples/minimal && make && cd ../../..
-
-#3c.Run the minimal sample
-./build-msw-static/samples/minimal/minimal.exe
-
-
-#4 Clean the static samples
-cd build-msw-static/samples && make clean && cd ../..
-
-#5  Build and run the typetest static sample to verify MIME database works
-cd build-msw-static/samples/typetest && make && cd ../../..
-./build-msw-static/samples/typetest/typetest.exe
-
-#6  Build and run the drawing static sample
-cd build-msw-static/samples/drawing && make && cd ../../..
-cd samples/drawing && ../../build-msw-static/samples/drawing/drawing.exe && cd ../..
-
-#7  Build and run the splash static sample
-cd build-msw-static/samples/splash && make && cd ../../..
-cd samples/splash && ../../build-msw-static/samples/splash/splash.exe && cd ../..
-
-#8  Build and run the widgets static sample
-cd build-msw-static/samples/widgets && make && cd ../../..
-cd samples/widgets && ../../build-msw-static/samples/widgets/widgets.exe && cd ../..
-
-#9  Build all the rest of the static samples
-cd build-msw-static/samples && make && cd ../..

docs/msw/readme.txt

@@ -1,7 +1,7 @@
 This is wxWidgets for Windows (wxMSW)
 -------------------------------------
 
-For information on installing wxWidgets, please see install.txt.
+For information on installing wxWidgets, please see install.md.
 
 For further information, please see docs/html/index.htm and the
 wxWidgets reference manual.

docs/msw/winxp.md

@@ -1,4 +1,4 @@
-Microsoft Windows XP Support from wxWidgets
+Microsoft Windows XP Support from wxWidgets {#plat_msw_winxp}
 -------------------------------------------
 
 Windows XP introduces the themes (called "visual styles" in the Microsoft
@@ -30,7 +30,6 @@ for more details.
 Here is the example manifest which you can put into controls.exe.manifest
 file to test theme support using the controls sample:
 
---- cut here ---
     <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
     <assemblyIdentity
@@ -53,4 +52,3 @@ file to test theme support using the controls sample:
         </dependentAssembly>
     </dependency>
     </assembly>
---- cut here ---

docs/osx/install.md

@@ -1,6 +1,8 @@
-wxWidgets for OS X installation
+wxWidgets for OS X installation        {#plat_osx_install}
 -----------------------------------
 
+[TOC]
+
 wxWidgets can be compiled using Apple's Cocoa library.
 
 Most OS X developers should start by downloading and installing Xcode
@@ -14,45 +16,42 @@ Next use Terminal (under Applications, Utilities, Terminal) to access a command
 prompt.  Use cd to change directories to your wxWidgets directory and execute
 the following sets of commands from the wxWidgets directory.
 
----------
-
     mkdir build-cocoa-debug
     cd build-cocoa-debug
     ../configure --enable-debug
     make
-# Build the samples and demos
+
+Build the samples and demos
+
     cd samples; make;cd ..
     cd demos;   make;cd ..
 
----------
-
 After the compilation completes, use Finder to run the samples and demos
-  Go to build-cocoa-debug/samples to experiment with the Cocoa samples.
+* Go to build-cocoa-debug/samples to experiment with the Cocoa samples.
-  Go to build-cocoa-debug/demos to experiment with the Cocoa demos.
+* Go to build-cocoa-debug/demos to experiment with the Cocoa demos.
-Double-click on the executables which have an icon showing three small squares.
+* Double-click on the executables which have an icon showing three small squares.
-The source code for the samples is in wxWidgets/samples
+* The source code for the samples is in wxWidgets/samples
-The source code for the demos is in wxWidgets/demos
+* The source code for the demos is in wxWidgets/demos
-
----------
 
 More information about building on OS X is available in the wxWiki.
 Here are two useful links
-  https://wiki.wxwidgets.org/Guides_%26_Tutorials
+  * https://wiki.wxwidgets.org/Guides_%26_Tutorials
-  https://wiki.wxwidgets.org/Development:_wxMac
+  * https://wiki.wxwidgets.org/Development:_wxMac
 
----------
 
-More advanced topics are covered below.
+Advanced topics                        {#osx_advanced}
+===============
 
----------
+Installing library                     {#osx_install}
+------------------
 
 If you want to install the library into the system directories you'll need
 to do this as root.  The accepted way of running commands as root is to
 use the built-in sudo mechanism.  First of all, you must be using an
 account marked as a "Computer Administrator".  Then
 
-6) sudo make install
+    sudo make install
-7) type <YOUR OWN PASSWORD>
+    type \<YOUR OWN PASSWORD\>
 
 Note that while using this method is okay for development, it is not
 recommended that you require endusers to install wxWidgets into their
@@ -61,13 +60,13 @@ is to configure wxWidgets with --disable-shared.  Another way to avoid
 it is to make a framework for wxWidgets.  Making frameworks is beyond
 the scope of this document.
 
-Note:
+**Note:**
 It is rarely desirable to install non-Apple software into system directories.
 By configuring the library with --disable-shared and using the full path
 to wx-config with the --in-place option you can avoid installing the library.
 
 
-Apple Developer Tools: Xcode
+Apple Developer Tools: Xcode           {#osx_xcode}
 ----------------------------
 
 You can use the project in build/osx/wxcocoa.xcodeproj to build the Cocoa
@@ -82,7 +81,7 @@ the libraries using commands like this:
     $ cd utils/wxrc
     $ g++ -o wxrc wxrc.cpp `wx-config --cxxflags --libs base,xml`
 
-Creating universal binaries
+Creating universal binaries            {#osx_universal_bin}
 ---------------------------
 
 The Xcode projects for the wxWidgets library and minimal project are set up

docs/osx/readme.txt

@@ -4,7 +4,7 @@ More Information is available from the wxWidgets project home page at
 
 https://www.wxwidgets.org
 
-For more information, please see install.txt and the manuals.
+For more information, please see install.md and the manuals.
 
 Please send problems concerning installation, feature requests,
 bug reports or comments to the wxWidgets users list. Information

docs/qt/architecture.md

@@ -1,4 +1,4 @@
-# wxQt Architecture
+# wxQt Architecture                    {#plat_qt_architecture}
 
 ## Internals
 

docs/qt/install.md

@@ -1,6 +1,8 @@
-wxWidgets for Qt installation
+wxWidgets for Qt installation          {#plat_qt_install}
 -----------------------------
 
+[TOC]
+
 IMPORTANT NOTE:
 
   If you experience problems installing, please re-read these
@@ -13,7 +15,10 @@ IMPORTANT NOTE:
   using (including the beta) and what compiler on what system. One
   example: wxQt 3.1.0, GCC 4.8.1, Ubuntu 14.04
 
-* The simplest case
+Installation                           {#qt_install}
+============
+
+The simplest case                      {#qt_simple}
 -------------------
 
 If you compile wxWidgets on Linux for the first time and don't like to read
@@ -26,6 +31,7 @@ install instructions just do (in the base dir):
     > su <type root password>
     > make install
     > ldconfig
+
 [if you get "ldconfig: command not found", try using "/sbin/ldconfig"]
 
 If you don't do the 'make install' part, you can still use the libraries from
@@ -37,7 +43,7 @@ If you want to remove wxWidgets on Unix you can do this:
     > make uninstall
     > ldconfig
 
-* The simplest errors
+The simplest errors                    {#qt_error_simple}
 ---------------------
 
 For any configure errors: please look at config.log file which was generated
@@ -52,20 +58,20 @@ qtconfig/pkg-config. Also check that your LD_LIBRARY_PATH or equivalent
 variable contains the path to Qt libraries if they were installed in a
 non-default location.
 
-* The simplest program
+The simplest program                   {#qt_simple_app}
 ----------------------
 
 Now create your super-application myfoo.cpp and compile anywhere with
 
     g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 
-* GUI libraries
+GUI libraries                          {#qt_libs_ui}
 ---------------
 
 wxWidgets/Qt requires the Qt library to be installed on your system. It has
 to be a stable version, preferably Qt 5.2.1 or later.
 
-* Building wxQT on Ubuntu
+Building wxQT on Ubuntu                {#qt_build_ubuntu}
 -------------------------
 
 Install latest Qt5 packages (qt5-default). To build unit tests, libcppunit-dev
@@ -91,7 +97,7 @@ cd tests
     make
     ./test_gui
 
-* Building wxQT, using qt-unified-XXX-online installer
+Building wxQT, using qt-unified-XXX-online installer {#qt_build}
 ------------------------------------------------------
 
 Download qt-unified-XXX-online installer from the qt website.
@@ -100,14 +106,16 @@ 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:
+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):
+for Windows (ran from Git Bash, or any other Unix-like shell):
-# (the syntax for the drive in the path is required by ar and ld)
+(the syntax for the drive in the path is required by ar and ld)
+
     ../configure --with-qt --enable-debug QT5_CUSTOM_DIR=c:/Qt/5.11.0/mingw53_32
 
-* Building wxGT on Android
+Building wxGT on Android               {#qt_android}
 --------------------------
 
 Download Android Native Development Kit (NDK), tandalone Android Software
@@ -146,10 +154,11 @@ make
 You can now compile and link your app against this build, and finally
 package it for Android using standard APK tools.
 
-* Create your configuration
+Create your configuration              {#qt_config}
 ---------------------------
 
 Usage:
+
     ./configure options
 
 If you want to use system's C and C++ compiler,
@@ -168,7 +177,7 @@ subdirectory of your wxWidgets installation) as this allows you to
 have multiple configurations (for example, debug and release or GTK
 and Motif) simultaneously.
 
-* Feature Options
+Feature Options                        {#qt_feature_options}
 -----------------
 
 When producing an executable that is linked statically with wxQt
@@ -182,10 +191,3 @@ of all configurable options.
 Apart from disabling certain features you can very often "strip"
 the program of its debugging information resulting in a significant
 reduction in size.
-
-----------------------
-
-In the hope that it will be useful,
-
-    The wxWidgets Team
-

docs/x11/install.md

@@ -1,6 +1,8 @@
-wxWidgets for X11 installation
+wxWidgets for X11 installation         {#plat_x11_install}
 ------------------------------
 
+[TOC]
+
 IMPORTANT NOTE:
 
   If you experience problems installing, please re-read these
@@ -13,7 +15,7 @@ IMPORTANT NOTE:
   using (including the beta) and what compiler on what system. One
   example: wxX11 2.8.0, gcc 2.95.4, Redhat 6.2
 
-First steps
+First steps                            {#x11_first_steps}
 -----------
 
 - Download wxX11-x.y.z.tgz, where x.y.z is the version number.
@@ -34,10 +36,10 @@ First steps
   information about your platform and the (relevant part of) contents of
   config.log file).
 
-COMPILING USING CONFIGURE
+Compiling using configure              {#x11_configure}
 =========================
 
-* The simplest case
+The simplest case                      {#x11_simple}
 -------------------
 
 If you compile wxWidgets on Linux for the first time and don't like to read
@@ -65,7 +67,7 @@ If you want to remove wxWidgets on Unix you can do this:
     > ldconfig
     > exit
 
-* The expert case
+The expert case                        {#x11_expert}
 -----------------
 
 If you want to do some more serious cross-platform programming with wxWidgets,
@@ -98,7 +100,7 @@ cd buildgtkd
     make
     cd ..
 
-* The simplest errors
+The simplest errors                    {#x11_errors}
 ---------------------
 
 You get errors during compilation: The reason is that you probably have a
@@ -108,18 +110,18 @@ GCC 2.95 or later.
 
 You get immediate segfault when starting any sample or application: This is
 either due to having compiled the library with different flags or options than
-your program - typically you might have the __WXDEBUG__ option set for the
+your program - typically you might have the `__WXDEBUG__` option set for the
 library but not for your program - or due to using a compiler with optimisation
 bugs.
 
-* The simplest program
+The simplest program                   {#x11_simple_app}
 ----------------------
 
 Now create your super-application myfoo.cpp and compile anywhere with
 
     g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 
-* General
+General                                {#x11_general}
 ---------
 
 The Unix variants of wxWidgets use GNU configure. If you have problems with
@@ -134,12 +136,12 @@ report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF
 YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF X, WHAT DISTRIBUTION
 YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
 
-* GUI libraries
+GUI libraries                          {#x11_libs_gui}
 ---------------
 
 wxWidgets/X11 requires the X11 library to be installed on your system.
 
-* Additional libraries
+Additional libraries                   {#x11_libs_misc}
 ----------------------
 
 wxWidgets/X11 requires a thread library and X libraries known to work with
@@ -157,7 +159,7 @@ make install
     ldconfig
     exit
 
-* Building wxX11 on Cygwin
+Building wxX11 on Cygwin               {#x11_cygwin}
 --------------------------
 
 The normal build instructions should work fine on Cygwin. The one difference
@@ -171,10 +173,11 @@ will see linking errors. If this happens then you can work around the
 problem by setting LDFLAGS=-Wl,--export-all-symbols. Please also let us know
 about it on the wx-dev mailing list.
 
-* Create your configuration
+Create your configuration              {#x11_config}
 ---------------------------
 
 Usage:
+
 	./configure [options]
 
 If you want to use system's C and C++ compiler,
@@ -202,7 +205,7 @@ Configure will complain if the system variable OSTYPE has
 not been defined. And Make in some circumstances as well...
 
 
-* General options
+General options                        {#x11_options}
 -----------------
 
 Given below are the commands to change the default behaviour,
@@ -268,7 +271,7 @@ The following options handle the kind of library you want to build.
 				must be compiled with the same debug
 				options.
 
-* Feature Options
+Feature Options                        {#x11_feature_options}
 -----------------
 
 Many of the configure options have been thoroughly tested
@@ -320,7 +323,7 @@ Please see the output of "./configure --help" for comprehensive list
 of all configurable options.
 
 
-* Compiling
+Compiling                              {#x11_compiling}
 -----------
 
 The following must be done in the base directory (e.g. ~/wxX11
@@ -356,10 +359,10 @@ object-files:
 
 in the various directories will do the work for you.
 
-* Creating a new Project
+Creating a new Project                 {#x11_new_app}
 ------------------------
 
-1) The first way uses the installed libraries and header files
+1. The first way uses the installed libraries and header files
 automatically using wx-config
 
         g++ myfoo.cpp `wx-config --libs` `wx-config --cxxflags` -o myfoo
@@ -387,13 +390,13 @@ specify required libraries when running wx-config. For example,
     with libraries required by core GUI classes and wxHTML classes. See
     the manual for more information on the libraries.
 
-2) The other way creates a project within the source code
+2. The other way creates a project within the source code
 directories of wxWidgets. For this endeavour, you'll need
 GNU autoconf version 2.14 and add an entry to your Makefile.in
 to the bottom of the configure.in script and run autoconf
 and configure before you can type make.
 
-* Further notes by Julian Smart
+Further notes by Julian Smart          {#x11_notes}
 -------------------------------
 
 - You may find the following script useful for compiling wxX11,
@@ -401,7 +404,6 @@ and configure before you can type make.
   permissions). Make this script executable with the command
   chmod a+x makewxx11.
 
-  -------:x-----Cut here-----:x-----
         # makewxx11
         # Sets permissions (in case we extracted wxX11 from zip files)
         # and makes wxX11.
@@ -414,12 +416,11 @@ and configure before you can type make.
         chmod a+x configure config.sub config.guess
         ./configure --with-x11 --with-shared --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets --without-odbc
         make
-  -------:x-----Cut here-----:x-----
 
   This script will build wxX11 using shared libraries. If you want to build
   a static wxWidgets library, use --disable-shared.
 
-Troubleshooting
+Troubleshooting                        {#x11_troubleshooting}
 ---------------
 
 - Solaris compilation with gcc: if the compiler has problems with the variable
@@ -437,7 +438,7 @@ Troubleshooting
   If you find any incorrect instances, though, such as a
   missing 'const' in an overridden function, please let us know.
 
-Other Notes
+Other Notes                            {#x11_misc_notes}
 -----------
 
 - Debugging mode is switched on by default in the makefiles, but using
@@ -448,11 +449,3 @@ Other Notes
   configure system, change --with-debug_flag to --without-debug_flag
   and --with-debug_info to --without-debug_info in the makewxx11
   script).
-
-Bug reports
------------
-
-Please send bug reports with a description of your environment,
-compiler and the error message(s) to the developers mailing list at:
-
-    https://www.wxwidgets.org/support/mailing-lists/

include/wx/chkconf.h

@@ -2345,6 +2345,15 @@
 #           define wxUSE_STC 0
 #       endif
 #   endif
+
+#   if !wxUSE_SCROLLBAR
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxStyledTextCtrl requires wxUSE_SCROLLBAR"
+#       else
+#           undef wxUSE_STC
+#           define wxUSE_STC 0
+#       endif
+#   endif
 #endif /* wxUSE_STC */
 
 #if wxUSE_RICHTEXT

include/wx/collpane.h

@@ -43,6 +43,23 @@ public:
 
     virtual wxString GetLabel() const wxOVERRIDE = 0;
     virtual void SetLabel(const wxString& label) wxOVERRIDE = 0;
+
+    virtual bool
+    InformFirstDirection(int direction,
+                         int size,
+                         int availableOtherDir) wxOVERRIDE
+    {
+        wxWindow* const p = GetPane();
+        if ( !p )
+            return false;
+
+        if ( !p->InformFirstDirection(direction, size, availableOtherDir) )
+            return false;
+
+        InvalidateBestSize();
+
+        return true;
+    }
 };
 
 

include/wx/colour.h

@@ -119,6 +119,9 @@ public:
     virtual ChannelType Alpha() const
         { return wxALPHA_OPAQUE ; }
     
+    virtual bool IsSolid() const
+        { return true; }
+
     // implemented in colourcmn.cpp
     virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const;
 

include/wx/dcsvg.h

@@ -86,10 +86,12 @@ public:
     virtual wxCoord GetCharHeight() const wxOVERRIDE;
     virtual wxCoord GetCharWidth() const wxOVERRIDE;
 
+#if wxUSE_PALETTE
     virtual void SetPalette(const wxPalette&  WXUNUSED(palette)) wxOVERRIDE
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented"));
     }
+#endif
 
     virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) wxOVERRIDE
     {

include/wx/defs.h

@@ -2607,12 +2607,14 @@ typedef void*       WXDisplay;
 
 typedef const void * CFTypeRef;
 
-/* typedef const struct __CFString * CFStringRef; */
+DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFData )
-
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFString )
 typedef struct __CFString * CFMutableStringRef;
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFDictionary )
 
+DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFArray )
+typedef struct __CFArray * CFMutableArrayRef;
+
 DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopSource )
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFont )
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFontDescriptor )
@@ -2645,7 +2647,7 @@ DECLARE_WXMAC_OPAQUE_REF( MenuRef )
 typedef IconRef WXHICON ;
 typedef HIShapeRef WXHRGN;
 
-#endif
+#endif // __WXMAC__
 
 #if defined(__WXMAC__)
 
@@ -2712,6 +2714,13 @@ typedef struct objc_object *WX_##klass
 
 #endif /*  (defined(__GNUC__) && defined(__APPLE__)) */
 
+DECLARE_WXCOCOA_OBJC_CLASS(NSArray);
+DECLARE_WXCOCOA_OBJC_CLASS(NSData);
+DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray);
+DECLARE_WXCOCOA_OBJC_CLASS(NSString);
+
+#if wxOSX_USE_COCOA
+
 DECLARE_WXCOCOA_OBJC_CLASS(NSApplication);
 DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep);
 DECLARE_WXCOCOA_OBJC_CLASS(NSBox);
@@ -2729,7 +2738,6 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenu);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuExtra);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
-DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray);
 DECLARE_WXCOCOA_OBJC_CLASS(NSNotification);
 DECLARE_WXCOCOA_OBJC_CLASS(NSObject);
 DECLARE_WXCOCOA_OBJC_CLASS(NSPanel);
@@ -2754,13 +2762,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSMagnificationGestureRecognizer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSRotationGestureRecognizer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSPressGestureRecognizer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSTouch);
-#endif /* __WXMAC__ &__DARWIN__ */
+DECLARE_WXCOCOA_OBJC_CLASS(NSPasteboard);
-
-#ifdef __WXMAC__
-
-DECLARE_WXCOCOA_OBJC_CLASS(NSString);
-
-#if wxOSX_USE_COCOA
 
 typedef WX_NSWindow WXWindow;
 typedef WX_NSView WXWidget;
@@ -2768,6 +2770,7 @@ typedef WX_NSImage WXImage;
 typedef WX_NSMenu WXHMENU;
 typedef WX_NSOpenGLPixelFormat WXGLPixelFormat;
 typedef WX_NSOpenGLContext WXGLContext;
+typedef WX_NSPasteboard OSXPasteboard;
 
 #elif wxOSX_USE_IPHONE
 
@@ -2780,6 +2783,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
 DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
 DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
 DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
+DECLARE_WXCOCOA_OBJC_CLASS(UIPasteboard);
 
 typedef WX_UIWindow WXWindow;
 typedef WX_UIView WXWidget;
@@ -2787,6 +2791,7 @@ typedef WX_UIImage WXImage;
 typedef WX_EAGLContext WXGLContext;
 typedef WX_NSString WXGLPixelFormat;
 typedef WX_UIWebView OSXWebViewPtr;
+typedef WX_UIPasteboard OSXPasteboard;
 
 #endif
 

include/wx/display.h

@@ -10,6 +10,9 @@
 #ifndef _WX_DISPLAY_H_BASE_
 #define _WX_DISPLAY_H_BASE_
 
+#include "wx/defs.h"
+#include "wx/gdicmn.h"      // wxSize
+
 // NB: no #if wxUSE_DISPLAY here, the display geometry part of this class (but
 //     not the video mode stuff) is always available but if wxUSE_DISPLAY == 0
 //     it becomes just a trivial wrapper around the old wxDisplayXXX() functions
@@ -48,7 +51,6 @@ public:
 
     // dtor is not virtual as this is a concrete class not meant to be derived
     // from
-    ~wxDisplay();
 
 
     // return the number of available displays, valid parameters to
@@ -73,6 +75,12 @@ public:
     // get the client area of the display, i.e. without taskbars and such
     wxRect GetClientArea() const;
 
+    // get the depth, i.e. number of bits per pixel (0 if unknown)
+    int GetDepth() const;
+
+    // get the resolution of this monitor in pixels per inch
+    wxSize GetPPI() const;
+
     // name may be empty
     wxString GetName() const;
 

include/wx/gdicmn.h

@@ -1080,6 +1080,9 @@ extern WXDLLIMPEXP_DATA_CORE(const wxPoint) wxDefaultPosition;
 extern void WXDLLIMPEXP_CORE wxInitializeStockLists();
 extern void WXDLLIMPEXP_CORE wxDeleteStockLists();
 
+// Note: all the display-related functions here exist for compatibility only,
+// please use wxDisplay class in the new code
+
 // is the display colour (or monochrome)?
 extern bool WXDLLIMPEXP_CORE wxColourDisplay();
 

include/wx/generic/dcpsg.h

@@ -79,7 +79,9 @@ public:
     virtual void ComputeScaleAndOrigin() wxOVERRIDE;
 
     void SetBackgroundMode(int WXUNUSED(mode)) wxOVERRIDE { }
+#if wxUSE_PALETTE
     void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { }
+#endif
 
     void SetPrintData(const wxPrintData& data);
     wxPrintData& GetPrintData() { return m_printData; }

include/wx/generic/imaglist.h

@@ -10,10 +10,11 @@
 #ifndef _WX_IMAGLISTG_H_
 #define _WX_IMAGLISTG_H_
 
+#include "wx/bitmap.h"
 #include "wx/gdicmn.h"
+#include "wx/vector.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxIcon;
 class WXDLLIMPEXP_FWD_CORE wxColour;
 
@@ -21,23 +22,23 @@ class WXDLLIMPEXP_FWD_CORE wxColour;
 class WXDLLIMPEXP_CORE wxGenericImageList: public wxObject
 {
 public:
-    wxGenericImageList() { m_width = m_height = 0; }
+    wxGenericImageList() { }
     wxGenericImageList( int width, int height, bool mask = true, int initialCount = 1 );
     virtual ~wxGenericImageList();
     bool Create( int width, int height, bool mask = true, int initialCount = 1 );
-    bool Create();
 
     virtual int GetImageCount() const;
     virtual bool GetSize( int index, int &width, int &height ) const;
-    virtual wxSize GetSize() const { return wxSize(m_width, m_height); }
+    virtual wxSize GetSize() const { return m_size; }
 
     int Add( const wxBitmap& bitmap );
     int Add( const wxBitmap& bitmap, const wxBitmap& mask );
     int Add( const wxBitmap& bitmap, const wxColour& maskColour );
     wxBitmap GetBitmap(int index) const;
     wxIcon GetIcon(int index) const;
-    bool Replace( int index, const wxBitmap &bitmap );
+    bool Replace( int index,
-    bool Replace( int index, const wxBitmap &bitmap, const wxBitmap& mask );
+                  const wxBitmap& bitmap,
+                  const wxBitmap& mask = wxNullBitmap );
     bool Remove( int index );
     bool RemoveAll();
 
@@ -45,13 +46,21 @@ public:
               int flags = wxIMAGELIST_DRAW_NORMAL,
               bool solidBackground = false);
 
-    // Internal use only
+#if WXWIN_COMPATIBILITY_3_0
-    const wxBitmap *GetBitmapPtr(int index) const;
+    wxDEPRECATED_MSG("Don't use this overload: it's not portable and does nothing")
-private:
+    bool Create() { return true; }
-    wxObjectList  m_images;
 
-    int     m_width;
+    wxDEPRECATED_MSG("Use GetBitmap() instead")
-    int     m_height;
+    const wxBitmap *GetBitmapPtr(int index) const { return DoGetPtr(index); }
+#endif // WXWIN_COMPATIBILITY_3_0
+
+private:
+    const wxBitmap *DoGetPtr(int index) const;
+
+    wxVector<wxBitmap> m_images;
+
+    // Size of a single bitmap in the list.
+    wxSize m_size;
 
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericImageList);
 };

include/wx/generic/wizard.h

@@ -132,6 +132,10 @@ protected:
                 *m_btnNext;     // the "Next>" or "Finish" button
     wxStaticBitmap *m_statbmp;  // the control for the bitmap
 
+    // cached labels so their translations stay consistent
+    wxString    m_nextLabel,
+                m_finishLabel;
+
     // Border around page area sizer requested using SetBorder()
     int m_border;
 

include/wx/gtk/dataview.h

@@ -185,6 +185,12 @@ public:
     // failed.
     wxDataViewItem GTKPathToItem(struct _GtkTreePath *path) const;
 
+    // Return wxDataViewColumn matching the given GtkTreeViewColumn.
+    //
+    // If the input argument is NULL, return NULL too. Otherwise we must find
+    // the matching column and assert if we didn't.
+    wxDataViewColumn* GTKColumnToWX(GtkTreeViewColumn *gtk_col) const;
+
     virtual void OnInternalIdle() wxOVERRIDE;
 
     int GTKGetUniformRowHeight() const { return m_uniformRowHeight; }
@@ -222,12 +228,6 @@ private:
     virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE;
     virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE;
 
-    // Return wxDataViewColumn matching the given GtkTreeViewColumn.
-    //
-    // If the input argument is NULL, return NULL too. Otherwise we must find
-    // the matching column and assert if we didn't.
-    wxDataViewColumn* FromGTKColumn(GtkTreeViewColumn *gtk_col) const;
-
     friend class wxDataViewCtrlDCImpl;
     friend class wxDataViewColumn;
     friend class wxDataViewCtrlInternal;

include/wx/gtk/print.h

@@ -245,7 +245,9 @@ public:
     wxSize GetPPI() const wxOVERRIDE;
     virtual int GetDepth() const wxOVERRIDE { return 24; }
     void SetBackgroundMode(int mode) wxOVERRIDE;
+#if wxUSE_PALETTE
     void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { }
+#endif
     void SetResolution(int ppi);
 
     // overridden for wxPrinterDC Impl

include/wx/gtk/private/stylecontext.h

@@ -15,7 +15,7 @@
 class wxGtkStyleContext
 {
 public:
-    wxGtkStyleContext();
+    explicit wxGtkStyleContext(double scale = 1);
     ~wxGtkStyleContext();
     wxGtkStyleContext& Add(GType type, const char* objectName, ...) G_GNUC_NULL_TERMINATED;
     wxGtkStyleContext& Add(const char* objectName);
@@ -38,6 +38,7 @@ public:
 private:
     GtkStyleContext* m_context;
     GtkWidgetPath* const m_path;
+    const int m_scale;
 
     wxDECLARE_NO_COPY_CLASS(wxGtkStyleContext);
 };

include/wx/gtk/textentry.h

@@ -84,7 +84,7 @@ protected:
     // Override the base class method to use GtkEntry IM context.
     virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
 
-    static unsigned int GTKGetEntryTextLength(GtkEntry* entry);
+    static int GTKGetEntryTextLength(GtkEntry* entry);
 
 private:
     // implement this to return the associated GtkEntry or another widget

include/wx/hyperlink.h

@@ -76,6 +76,9 @@ protected:
     void CheckParams(const wxString& label, const wxString& url, long style);
 
 public:
+    // Send wxHyperlinkEvent and open our link in the default browser if it
+    // wasn't handled.
+    //
     // not part of the public API but needs to be public as used by
     // GTK+ callbacks:
     void SendEvent();

include/wx/imaglist.h

@@ -41,16 +41,11 @@ enum
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#if defined(__WXMSW__)
-    #define wxHAS_NATIVE_IMAGELIST
-#endif
-
-#if !defined(wxHAS_NATIVE_IMAGELIST)
-    #include "wx/generic/imaglist.h"
-#elif defined(__WXMSW__)
     #include "wx/msw/imaglist.h"
-#elif defined(__WXMAC__)
+    #define wxHAS_NATIVE_IMAGELIST
-    #include "wx/osx/imaglist.h"
+#else
+    #include "wx/generic/imaglist.h"
 #endif
 
 #endif // _WX_IMAGLIST_H_BASE_

include/wx/msw/enhmeta.h

@@ -11,6 +11,10 @@
 #ifndef _WX_MSW_ENHMETA_H_
 #define _WX_MSW_ENHMETA_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_ENH_METAFILE
+
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
@@ -192,4 +196,6 @@ protected:
 
 #endif // wxUSE_DATAOBJ
 
+#endif // wxUSE_ENH_METAFILE
+
 #endif // _WX_MSW_ENHMETA_H_

include/wx/msw/popupwin.h

@@ -18,25 +18,28 @@
 class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
 {
 public:
-    wxPopupWindow() { }
+    wxPopupWindow() { m_owner = NULL; }
 
     wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
         { (void)Create(parent, flags); }
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
-    virtual void SetFocus() wxOVERRIDE;
     virtual bool Show(bool show = true) wxOVERRIDE;
 
     // return the style to be used for the popup windows
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const wxOVERRIDE;
 
-    // get the HWND to be used as parent of this window with CreateWindow()
-    virtual WXHWND MSWGetParent() const wxOVERRIDE;
 
-protected:
+    // Implementation only from now on.
+
+    // Return the top level window parent of this popup or null.
+    wxWindow* MSWGetOwner() const { return m_owner; }
+
+private:
+    wxWindow* m_owner;
+
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
 };
 
 #endif // _WX_MSW_POPUPWIN_H_
-

include/wx/osx/choice.h

@@ -91,7 +91,6 @@ protected:
 
     wxArrayString m_strings;
     wxChoiceDataArray m_datas ;
-    wxMenu*    m_popUpMenu ;
 
 private:
     // This should be called when the number of items in the control changes.

include/wx/osx/cocoa/chkconf.h

@@ -40,6 +40,13 @@
  */
 #define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1
 
+/*
+ * turn off old style icon format if not asked for
+ */
+#ifndef wxOSX_USE_ICONREF
+    #define wxOSX_USE_ICONREF 0
+#endif
+
 /*
  * turning off capabilities that don't work under cocoa yet
  */

include/wx/osx/cocoa/private.h

@@ -41,7 +41,6 @@ WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image, double
 WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromIconRef( WXHICON iconref );
 WX_NSImage WXDLLIMPEXP_CORE wxOSXGetIconForType(OSType type );
 void WXDLLIMPEXP_CORE wxOSXSetImageSize(WX_NSImage image, CGFloat width, CGFloat height);
-double WXDLLIMPEXP_CORE wxOSXGetImageScaleFactor(WXImage image);
 wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size);
 WXWindow WXDLLIMPEXP_CORE wxOSXGetMainWindow();
 WXWindow WXDLLIMPEXP_CORE wxOSXGetKeyWindow();

include/wx/osx/core/cfarray.h

@@ -53,6 +53,8 @@ public:
         return wxCFRefFromGet((E)CFArrayGetValueAtIndex(this->m_ptr, idx));
     }
 
+    operator WX_NSArray() { return (WX_NSArray) this->get(); }
+
     wxCFRef<E> operator[](size_type idx) { return at(idx); }
     wxCFRef<E> front() { return at(0); }
     wxCFRef<E> back() { return at(size() - 1); }

include/wx/osx/core/cfdictionary.h

@@ -90,6 +90,11 @@ public:
     {
         return CFDictionaryCreateCopy(kCFAllocatorDefault, this->m_ptr);
     }
+
+    CFMutableDictionaryRef CreateMutableCopy() const
+    {
+        return CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, this->m_ptr);
+    }
 };
 
 class wxCFMutableDictionaryRef : public wxCFDictionaryRefCommon<CFMutableDictionaryRef>

include/wx/osx/core/colour.h

@@ -34,6 +34,8 @@ public:
     virtual ChannelType Blue() const wxOVERRIDE;
     virtual ChannelType Alpha() const wxOVERRIDE;
 
+    virtual bool IsSolid() const wxOVERRIDE;
+
     wxColour& operator=(const wxColour& col);
 
     // comparison
@@ -91,6 +93,9 @@ public:
     virtual CGFloat Blue() const = 0;
     virtual CGFloat Alpha() const = 0;
  
+    virtual bool IsSolid() const
+        { return true; }
+
     virtual CGColorRef GetCGColor() const = 0;
     
     virtual wxColourRefData* Clone() const = 0;

include/wx/osx/core/private.h

@@ -119,6 +119,7 @@ CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromImage( WXImage nsimage, double
 CGImageRef WXDLLIMPEXP_CORE wxOSXGetCGImageFromImage( WXImage nsimage, CGRect* r, CGContextRef cg);
 CGContextRef WXDLLIMPEXP_CORE wxOSXCreateBitmapContextFromImage( WXImage nsimage, bool *isTemplate = NULL);
 WXImage WXDLLIMPEXP_CORE wxOSXGetImageFromCGImage( CGImageRef image, double scale = 1.0, bool isTemplate = false);
+double WXDLLIMPEXP_CORE wxOSXGetImageScaleFactor(WXImage image);
 
 
 class wxWindowMac;
@@ -557,6 +558,15 @@ public :
                                     long extraStyle);
 #endif
 
+    static wxWidgetImplType*    CreateStaticBitmap( wxWindowMac* wxpeer,
+                                                   wxWindowMac* parent,
+                                                   wxWindowID id,
+                                                   const wxBitmap& bitmap,
+                                                   const wxPoint& pos,
+                                                   const wxSize& size,
+                                                   long style,
+                                                   long extraStyle);
+
     // converts from Toplevel-Content relative to local
     static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
 protected :
@@ -716,7 +726,7 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxTextWidgetImpl);
 };
 
-// common interface for all implementations
+// common interface for all combobox implementations
 class WXDLLIMPEXP_CORE wxComboWidgetImpl
 
 {
@@ -743,6 +753,41 @@ public :
     virtual int FindString(const wxString& WXUNUSED(text)) const { return -1; }
 };
 
+//
+// common interface for choice
+//
+
+class WXDLLIMPEXP_CORE wxChoiceWidgetImpl
+
+{
+public :
+    wxChoiceWidgetImpl() {}
+
+    virtual ~wxChoiceWidgetImpl() {}
+
+    virtual int GetSelectedItem() const { return -1; }
+
+    virtual void SetSelectedItem(int WXUNUSED(item)) {}
+
+    virtual size_t GetNumberOfItems() const = 0;
+
+    virtual void InsertItem(size_t pos, int itemid, const wxString& text) = 0;
+
+    virtual void RemoveItem(size_t pos) = 0;
+
+    virtual void Clear()
+    {
+        size_t count = GetNumberOfItems();
+        for ( size_t i = 0 ; i < count ; i++ )
+        {
+            RemoveItem( 0 );
+        }
+    }
+
+    virtual void SetItem(int pos, const wxString& item) = 0;
+};
+
+
 //
 // common interface for buttons
 //

include/wx/osx/icon.h

@@ -1,106 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/icon.h
-// Purpose:     wxIcon class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ICON_H_
-#define _WX_ICON_H_
-
-#include "wx/bitmap.h"
-
-// Icon
-class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject
-{
-public:
-    wxIcon();
-
-    wxIcon(const char* const* data);
-    wxIcon(const char bits[], int width , int height );
-    wxIcon(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
-           int desiredWidth = -1, int desiredHeight = -1);
-    wxIcon(const wxIconLocation& loc)
-    {
-      LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
-    }
-
-    wxIcon(WXHICON icon, const wxSize& size);
-
-    virtual ~wxIcon();
-
-    bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
-                  int desiredWidth = -1, int desiredHeight = -1);
-
-
-    // create from bitmap (which should have a mask unless it's monochrome):
-    // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
-    // ctors, assignment operators...), but it's ok to have such function
-    void CopyFromBitmap(const wxBitmap& bmp);
-
-    int GetWidth() const;
-    int GetHeight() const;
-    int GetDepth() const;
-#if WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
-    void SetWidth(int width);
-    wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
-    void SetHeight(int height);
-    wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
-    void SetDepth(int depth);
-#endif
-
-    wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
-
-#if wxOSX_USE_ICONREF
-    WXHICON GetHICON() const;
-#endif
-    
-#if wxOSX_USE_COCOA
-    WX_NSImage GetNSImage() const ;
-#endif
-    
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    wxDECLARE_DYNAMIC_CLASS(wxIcon);
-
-    bool LoadIconFromSystemResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
-    bool LoadIconFromBundleResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
-    bool LoadIconFromFile(const wxString& filename, int desiredWidth, int desiredHeight);
-    bool LoadIconAsBitmap(const wxString& filename, wxBitmapType flags = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1);
-};
-
-class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler
-{
-public:
-    wxICONResourceHandler()
-    {
-        SetName(wxT("ICON resource"));
-        SetExtension(wxEmptyString);
-        SetType(wxBITMAP_TYPE_ICON_RESOURCE);
-    }
-
-    virtual bool LoadFile(wxBitmap *bitmap,
-                          const wxString& name,
-                          wxBitmapType flags,
-                          int desiredWidth = -1,
-                          int desiredHeight = -1);
-
-    // unhide the base class virtual
-    virtual bool LoadFile(wxBitmap *bitmap,
-            const wxString& name,
-            wxBitmapType flags)
-        { return LoadFile(bitmap, name, flags, -1, -1); }
-
-private:
-    wxDECLARE_DYNAMIC_CLASS(wxICONResourceHandler);
-};
-
-#endif
-    // _WX_ICON_H_

include/wx/osx/imaglist.h

@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/imaglist.h
-// Purpose:
-// Author:      Robert Roebling, Stefan Csomor
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_IMAGLIST_H_
-#define _WX_IMAGLIST_H_
-
-#include "wx/defs.h"
-#include "wx/list.h"
-#include "wx/icon.h"
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxColour;
-
-class WXDLLIMPEXP_CORE wxImageList: public wxObject
-{
-public:
-    wxImageList() { m_width = m_height = 0; }
-    wxImageList( int width, int height, bool mask = true, int initialCount = 1 );
-    virtual ~wxImageList();
-    bool Create( int width, int height, bool mask = true, int initialCount = 1 );
-    bool Create();
-
-    virtual int GetImageCount() const;
-    virtual bool GetSize( int index, int &width, int &height ) const;
-    virtual wxSize GetSize() const { return wxSize(m_width, m_height); }
-
-    int Add( const wxIcon& bitmap );
-    int Add( const wxBitmap& bitmap );
-    int Add( const wxBitmap& bitmap, const wxBitmap& mask );
-    int Add( const wxBitmap& bitmap, const wxColour& maskColour );
-    wxBitmap GetBitmap(int index) const;
-    wxIcon GetIcon(int index) const;
-    bool Replace( int index, const wxIcon &bitmap );
-    bool Replace( int index, const wxBitmap &bitmap );
-    bool Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask );
-    bool Remove( int index );
-    bool RemoveAll();
-
-    virtual bool Draw(int index, wxDC& dc, int x, int y,
-                      int flags = wxIMAGELIST_DRAW_NORMAL,
-                      bool solidBackground = false);
-
-private:
-    wxList  m_images;
-
-    int     m_width;
-    int     m_height;
-
-    wxDECLARE_DYNAMIC_CLASS(wxImageList);
-};
-
-#endif  // _WX_IMAGLIST_H_
-

include/wx/osx/iphone/chkconf.h

@@ -377,6 +377,11 @@
     #define wxUSE_SECRETSTORE 0
 #endif
 
+// IconRef datatype does not exist on iOS
+
+#undef wxOSX_USE_ICONREF
+#define wxOSX_USE_ICONREF 0
+
 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */
 

include/wx/osx/setup_inc.h

@@ -60,3 +60,10 @@
 // make sure we have the proper dispatcher for the console event loop
 #define wxUSE_SELECT_DISPATCHER 1
 #define wxUSE_EPOLL_DISPATCHER 0
+
+// set to 1 if you have older code that still needs icon refs
+#define wxOSX_USE_ICONREF 0
+
+// set to 0 if you have code that has problems with the new bitmap implementation
+#define wxOSX_BITMAP_NATIVE_ACCESS 1
+

include/wx/osx/statbmp.h

@@ -1,2 +1,64 @@
-#define wxGenericStaticBitmap wxStaticBitmap
+#ifndef _WX_STATBMP_H_
-#include "wx/generic/statbmpg.h"
+#define _WX_STATBMP_H_
+
+#include "wx/statbmp.h"
+
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
+{
+public:
+    wxStaticBitmap() {}
+    wxStaticBitmap(wxWindow *parent,
+                          wxWindowID id,
+                          const wxBitmap& bitmap,
+                          const wxPoint& pos = wxDefaultPosition,
+                          const wxSize& size = wxDefaultSize,
+                          long style = 0,
+                          const wxString& name = wxStaticBitmapNameStr)
+    {
+        Create(parent, id, bitmap, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxBitmap& bitmap,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBitmapNameStr);
+
+    virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
+
+    virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; }
+
+    virtual void SetIcon(const wxIcon& icon) wxOVERRIDE
+    {
+        wxBitmap bmp;
+        bmp.CopyFromIcon(icon);
+        SetBitmap(bmp);
+    }
+
+#if defined(__WXGTK20__) || defined(__WXMAC__)
+    // icons and bitmaps are really the same thing in wxGTK and wxMac
+    wxIcon GetIcon() const wxOVERRIDE  { return (const wxIcon &)m_bitmap; }
+#endif
+
+    virtual void SetScaleMode(ScaleMode scaleMode) wxOVERRIDE;
+
+    virtual ScaleMode GetScaleMode() const wxOVERRIDE { return m_scaleMode; }
+
+private:
+    wxSize GetBitmapSize()
+    {
+        return m_bitmap.IsOk() ? m_bitmap.GetScaledSize()
+        : wxSize(16, 16); // this is completely arbitrary
+    }
+
+    void OnPaint(wxPaintEvent& event);
+
+    wxBitmap m_bitmap;
+    ScaleMode m_scaleMode;
+
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
+};
+
+#endif

include/wx/osx/window.h

@@ -91,6 +91,7 @@ public:
     virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE;
 
     virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
+    virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE;
     
     virtual int GetCharHeight() const wxOVERRIDE;
     virtual int GetCharWidth() const wxOVERRIDE;