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

2019-06-13 09:26:23 +02:00
parent f065daddb1 f99153dbd1
commit 4bf9492114
614 changed files with 9256 additions and 6333 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ else()
 endif()

 set(wxVERSION ${wxMAJOR_VERSION}.${wxMINOR_VERSION}.${wxRELEASE_NUMBER})
-set(wxCOPYRIGHT "1992-2018 wxWidgets")
+set(wxCOPYRIGHT "1992-2019 wxWidgets")

 include(build/cmake/main.cmake)

--- a/Makefile.in
+++ b/Makefile.in
@@ -68,6 +68,7 @@ HOST_SUFFIX = @HOST_SUFFIX@
 DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
 DYLIB_RPATH_POSTLINK = @DYLIB_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
+wxCFLAGS_C99 = @wxCFLAGS_C99@

 ### Variables: ###

@@ -211,7 +212,7 @@ WXTIFF_OBJECTS =  \
 	wxtiff_tif_zip.o \
 	wxtiff_tif_zstd.o
 WXEXPAT_CFLAGS = -DNDEBUG -I./src/expat/expat -DHAVE_EXPAT_CONFIG_H \
-	$(____SHARED) $(CPPFLAGS) $(CFLAGS)
+	$(____SHARED) $(wxCFLAGS_C99) $(CPPFLAGS) $(CFLAGS)
 WXEXPAT_OBJECTS =  \
 	wxexpat_xmlparse.o \
 	wxexpat_xmlrole.o \
@@ -2026,11 +2027,22 @@ STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \
 	-DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(CXXWARNINGS) \
 	$(CPPFLAGS) $(CXXFLAGS)
+STCDLL_OBJCXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_REGEX_p) $(__INC_EXPAT_p) \
+	-I$(top_srcdir)/src/stc/scintilla/include \
+	-I$(top_srcdir)/src/stc/scintilla/lexlib \
+	-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \
+	-DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(CPPFLAGS) \
+	$(OBJCXXFLAGS)
 STCDLL_OBJECTS =  \
 	$(__stcdll___win32rc) \
 	stcdll_stc.o \
 	stcdll_PlatWX.o \
-	stcdll_ScintillaWX.o
+	stcdll_ScintillaWX.o \
+	$(__STC_PLATFORM_SRC_OBJECTS_2)
 STCDLL_ODEP =  $(_____pch_wxprec_stcdll_wx_wxprec_h_gch___depname)
 STCLIB_CXXFLAGS = $(__stclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -2040,10 +2052,20 @@ STCLIB_CXXFLAGS = $(__stclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/src/stc/scintilla/lexlib \
 	-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \
 	-DLINK_LEXERS $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+STCLIB_OBJCXXFLAGS = $(__stclib_PCH_INC) -D__WX$(TOOLKIT)__ \
+	$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+	$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+	$(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+	$(__INC_REGEX_p) $(__INC_EXPAT_p) \
+	-I$(top_srcdir)/src/stc/scintilla/include \
+	-I$(top_srcdir)/src/stc/scintilla/lexlib \
+	-I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DNO_CXX11_REGEX \
+	-DLINK_LEXERS $(CPPFLAGS) $(OBJCXXFLAGS)
 STCLIB_OBJECTS =  \
 	stclib_stc.o \
 	stclib_PlatWX.o \
-	stclib_ScintillaWX.o
+	stclib_ScintillaWX.o \
+	$(__STC_PLATFORM_SRC_OBJECTS_3)
 STCLIB_ODEP =  $(_____pch_wxprec_stclib_wx_wxprec_h_gch___depname)
 GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -3319,7 +3341,6 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR =  \
 	wx/osx/frame.h \
 	wx/osx/gauge.h \
 	wx/osx/listbox.h \
-	wx/osx/listctrl.h \
 	wx/osx/mdi.h \
 	wx/osx/menu.h \
 	wx/osx/menuitem.h \
@@ -3429,7 +3450,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR =  \
 	wx/osx/frame.h \
 	wx/osx/gauge.h \
 	wx/osx/listbox.h \
-	wx/osx/listctrl.h \
 	wx/osx/mdi.h \
 	wx/osx/menu.h \
 	wx/osx/menuitem.h \
@@ -6111,8 +6131,13 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monodll_tabartgtk.o
@COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS = \
@COND_TOOLKIT_MSW@	monodll_tabartmsw.o monodll_barartmsw.o
-@COND_USE_STC_1@__MONOLIB_STC_SRC_OBJECTS = monodll_stc.o \
-@COND_USE_STC_1@	monodll_PlatWX.o monodll_ScintillaWX.o
+COND_USE_STC_1___MONOLIB_STC_SRC_OBJECTS =  \
+	monodll_stc.o \
+	monodll_PlatWX.o \
+	monodll_ScintillaWX.o \
+	$(__STC_PLATFORM_SRC_OBJECTS)
+@COND_USE_STC_1@__MONOLIB_STC_SRC_OBJECTS = $(COND_USE_STC_1___MONOLIB_STC_SRC_OBJECTS)
+@COND_TOOLKIT_OSX_COCOA@__STC_PLATFORM_SRC_OBJECTS = monodll_PlatWXcocoa.o
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_SRC_OBJECTS \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monodll_sound_sdl.o
@COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
@@ -8090,8 +8115,14 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monolib_tabartgtk.o
@COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS_1 = \
@COND_TOOLKIT_MSW@	monolib_tabartmsw.o monolib_barartmsw.o
-@COND_USE_STC_1@__MONOLIB_STC_SRC_OBJECTS_1 = monolib_stc.o \
-@COND_USE_STC_1@	monolib_PlatWX.o monolib_ScintillaWX.o
+COND_USE_STC_1___MONOLIB_STC_SRC_OBJECTS_1 =  \
+	monolib_stc.o \
+	monolib_PlatWX.o \
+	monolib_ScintillaWX.o \
+	$(__STC_PLATFORM_SRC_OBJECTS_1)
+@COND_USE_STC_1@__MONOLIB_STC_SRC_OBJECTS_1 = $(COND_USE_STC_1___MONOLIB_STC_SRC_OBJECTS_1)
+@COND_TOOLKIT_OSX_COCOA@__STC_PLATFORM_SRC_OBJECTS_1 \
+@COND_TOOLKIT_OSX_COCOA@	= monolib_PlatWXcocoa.o
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_SRC_OBJECTS_1 \
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@	= monolib_sound_sdl.o
 COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
@@ -12954,6 +12985,7 @@ COND_USE_SOVERSOLARIS_1___stcdll___so_symlinks_uninst_cmd = rm -f \
 	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
@COND_USE_SOVERSOLARIS_1@__stcdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___stcdll___so_symlinks_uninst_cmd)
@COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
+@COND_TOOLKIT_OSX_COCOA@__STC_PLATFORM_SRC_OBJECTS_2 = stcdll_PlatWXcocoa.o
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname = \
 	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@__stclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname)
@@ -12966,6 +12998,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname = \
@COND_ICC_PCH_1@	./.pch/wxprec_stclib/wx/wxprec.h.gch
@COND_USE_PCH_1@_____pch_wxprec_stclib_wx_wxprec_h_gch___depname \
@COND_USE_PCH_1@	= ./.pch/wxprec_stclib/wx/wxprec.h.gch
+@COND_TOOLKIT_OSX_COCOA@__STC_PLATFORM_SRC_OBJECTS_3 = stclib_PlatWXcocoa.o
@COND_SHARED_1@____wxstc_namedll_DEP = $(__stcdll___depname)
@COND_SHARED_0@____wxstc_namelib_DEP = $(__stclib___depname)
 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
@@ -17415,6 +17448,9 @@ monodll_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONODLL_ODEP)
 monodll_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp

+monodll_PlatWXcocoa.o: $(srcdir)/src/stc/PlatWXcocoa.mm $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/stc/PlatWXcocoa.mm
+
 monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp

@@ -22674,6 +22710,9 @@ monolib_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONOLIB_ODEP)
 monolib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp

+monolib_PlatWXcocoa.o: $(srcdir)/src/stc/PlatWXcocoa.mm $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/stc/PlatWXcocoa.mm
+
 monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xml/xml.cpp

@@ -36612,6 +36651,9 @@ stcdll_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(STCDLL_ODEP)
 stcdll_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCDLL_ODEP)
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp

+stcdll_PlatWXcocoa.o: $(srcdir)/src/stc/PlatWXcocoa.mm $(STCDLL_ODEP)
+	$(CXXC) -c -o $@ $(STCDLL_OBJCXXFLAGS) $(srcdir)/src/stc/PlatWXcocoa.mm
+
 stclib_stc.o: $(srcdir)/src/stc/stc.cpp $(STCLIB_ODEP)
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/stc.cpp

@@ -36621,6 +36663,9 @@ stclib_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(STCLIB_ODEP)
 stclib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCLIB_ODEP)
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp

+stclib_PlatWXcocoa.o: $(srcdir)/src/stc/PlatWXcocoa.mm $(STCLIB_ODEP)
+	$(CXXC) -c -o $@ $(STCLIB_OBJCXXFLAGS) $(srcdir)/src/stc/PlatWXcocoa.mm
+
 gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)  --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_GL

--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -278,7 +278,7 @@ dnl ### begin block 20_COND_MONOLITHIC_0_USE_RICHTEXT_1[wx.bkl] ###
        COND_MONOLITHIC_0_USE_RICHTEXT_1=""
    fi
    AC_SUBST(COND_MONOLITHIC_0_USE_RICHTEXT_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[../../tests/test.bkl,wx.bkl] ###
    COND_MONOLITHIC_0_USE_STC_1="#"
    if test "x$MONOLITHIC" = "x0" -a "x$USE_STC" = "x1" ; then
        COND_MONOLITHIC_0_USE_STC_1=""
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -180,7 +180,7 @@
        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('richtext')))</if>
    </set>
    <set var="WXLIB_STC">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
+        <if cond="MONOLITHIC=='0' and USE_STC=='1'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
    </set>

    <set var="WXLIB_WEBVIEW">
--- a/build/bakefiles/expat.bkl
+++ b/build/bakefiles/expat.bkl
@@ -4,6 +4,7 @@

    <if cond="FORMAT=='autoconf'">
        <option name="wxUSE_EXPAT"/>
+        <option name="wxCFLAGS_C99"/>
        <set var="LIB_EXPAT">
            <if cond="wxUSE_EXPAT=='builtin'">
                wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -31,6 +32,7 @@
            HAVE_EXPAT_CONFIG_H
        </define>
        <cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
+        <cflags cond="FORMAT=='autoconf'">$(wxCFLAGS_C99)</cflags>
        <sources>
            src/expat/expat/lib/xmlparse.c
            src/expat/expat/lib/xmlrole.c
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2541,7 +2541,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/osx/frame.h
    wx/osx/gauge.h
    wx/osx/listbox.h
-    wx/osx/listctrl.h
    wx/osx/mdi.h
    wx/osx/menu.h
    wx/osx/menuitem.h
@@ -3459,16 +3458,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxSTC                                   -->
 <!-- ====================================================================== -->

-<set var="STC_SRC" hints="files">
+<set var="STC_CMN_SRC" hints="files">
    src/stc/stc.cpp
    src/stc/PlatWX.cpp
    src/stc/ScintillaWX.cpp
 </set>

-<set var="STC_HDR" hints="files">
+<set var="STC_CMN_HDR" hints="files">
    wx/stc/stc.h
 </set>

+<set var="STC_OSX_COCOA_SRC" hints="files">
+    src/stc/PlatWXcocoa.mm
+</set>
+
+<set var="STC_OSX_COCOA_HDR" hints="files">
+</set>
+
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
@@ -3650,6 +3656,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    <set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
    <set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>

+    <!-- wxSTC files: -->
+    <set var="STC_PLATFORM_SRC" hints="files">
+        <if cond="TOOLKIT=='OSX_COCOA'">$(STC_OSX_COCOA_SRC)</if>
+    </set>
+    <set var="STC_PLATFORM_HDR" hints="files">
+        <if cond="TOOLKIT=='OSX_COCOA'">$(STC_OSX_COCOA_HDR)</if>
+    </set>
+    <set var="STC_SRC">$(STC_CMN_SRC) $(STC_PLATFORM_SRC)</set>
+    <set var="STC_HDR">$(STC_CMN_HDR) $(STC_PLATFORM_HDR)</set>
+

    <set var="GUI_CORE_HEADERS" hints="files">
        <if cond="USE_GUI=='1' and WXUNIV=='0'">$(GUI_HDR)</if>
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -2417,7 +2417,6 @@ set(OSX_SHARED_HDR
    wx/osx/frame.h
    wx/osx/gauge.h
    wx/osx/listbox.h
-    wx/osx/listctrl.h
    wx/osx/mdi.h
    wx/osx/menu.h
    wx/osx/menuitem.h
@@ -3196,13 +3195,20 @@ set(RICHTEXT_HDR
    wx/xrc/xh_richtext.h
 )

-set(STC_SRC
+set(STC_CMN_SRC
    src/stc/stc.cpp
    src/stc/PlatWX.cpp
    src/stc/ScintillaWX.cpp
 )

-set(STC_HDR
+set(STC_CMN_HDR
    wx/stc/stc.h
 )

+set(STC_OSX_COCOA_SRC
+    src/stc/PlatWXcocoa.mm
+)
+
+set(STC_OSX_COCOA_HDR
+)
+
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -466,6 +466,12 @@ function(wx_set_builtin_target_properties target_name)
        )
    endif()

+    target_include_directories(${target_name}
+        BEFORE
+        PUBLIC
+            ${wxSETUP_HEADER_PATH}
+        )
+
    set_target_properties(${target_name} PROPERTIES FOLDER "Third Party Libraries")

    wx_set_common_target_properties(${target_name} DEFAULT_WARNINGS)
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -8,7 +8,14 @@
 # Licence:     wxWindows licence
 #############################################################################

-if(DEFINED wxBUILD_USE_STATIC_RUNTIME AND wxBUILD_USE_STATIC_RUNTIME)
+if(MSVC)
+    # Determine MSVC runtime library flag
+    set(MSVC_LIB_USE "/MD")
+    set(MSVC_LIB_REPLACE "/MT")
+    if(wxBUILD_USE_STATIC_RUNTIME)
+        set(MSVC_LIB_USE "/MT")
+        set(MSVC_LIB_REPLACE "/MD")
+    endif()
    # Set MSVC runtime flags for all configurations
    foreach(cfg "" ${CMAKE_CONFIGURATION_TYPES})
        set(c_flag_var CMAKE_C_FLAGS)
@@ -18,13 +25,13 @@ if(DEFINED wxBUILD_USE_STATIC_RUNTIME AND wxBUILD_USE_STATIC_RUNTIME)
            wx_string_append(c_flag_var "_${cfg_upper}")
            wx_string_append(cxx_flag_var "_${cfg_upper}")
        endif()
-        if(${c_flag_var} MATCHES "/MD")
-            string(REPLACE "/MD" "/MT" ${c_flag_var} "${${c_flag_var}}")
+        if(${c_flag_var} MATCHES ${MSVC_LIB_REPLACE})
+            string(REPLACE ${MSVC_LIB_REPLACE} ${MSVC_LIB_USE} ${c_flag_var} "${${c_flag_var}}")
            set(${c_flag_var} ${${c_flag_var}} CACHE STRING
              "Flags used by the C compiler during ${cfg_upper} builds." FORCE)
        endif()
-        if(${cxx_flag_var} MATCHES "/MD")
-            string(REPLACE "/MD" "/MT" ${cxx_flag_var} "${${cxx_flag_var}}")
+        if(${cxx_flag_var} MATCHES ${MSVC_LIB_REPLACE})
+            string(REPLACE ${MSVC_LIB_REPLACE} ${MSVC_LIB_USE} ${cxx_flag_var} "${${cxx_flag_var}}")
            set(${cxx_flag_var} ${${cxx_flag_var}} CACHE STRING
              "Flags used by the CXX compiler during ${cfg_upper} builds." FORCE)
        endif()
--- a/build/cmake/lib/stc/CMakeLists.txt
+++ b/build/cmake/lib/stc/CMakeLists.txt
@@ -9,7 +9,11 @@

 include(../../source_groups.cmake)

-wx_append_sources(STC_FILES STC)
+wx_append_sources(STC_FILES STC_CMN)
+
+if(WXOSX_COCOA)
+    wx_append_sources(STC_FILES STC_OSX_COCOA)
+endif()

 wx_add_builtin_library(wxscintilla
    src/stc/scintilla/lexers/LexA68k.cxx
--- a/build/cmake/tests/gui/CMakeLists.txt
+++ b/build/cmake/tests/gui/CMakeLists.txt
@@ -63,6 +63,7 @@ set(TEST_GUI_SRC
    controls/slidertest.cpp
    controls/spinctrldbltest.cpp
    controls/spinctrltest.cpp
+    controls/styledtextctrltest.cpp
    controls/textctrltest.cpp
    controls/textentrytest.cpp
    controls/togglebuttontest.cpp
@@ -171,6 +172,9 @@ wx_exe_link_libraries(test_gui core)
 if(wxUSE_RICHTEXT)
    wx_exe_link_libraries(test_gui richtext)
 endif()
+if(wxUSE_STC)
+    wx_exe_link_libraries(test_gui stc)
+endif()
 if(wxUSE_MEDIACTRL)
    wx_exe_link_libraries(test_gui media)
 endif()
--- a/build/files
+++ b/build/files
@@ -2396,7 +2396,6 @@ OSX_SHARED_HDR =
    wx/osx/frame.h
    wx/osx/gauge.h
    wx/osx/listbox.h
-    wx/osx/listctrl.h
    wx/osx/mdi.h
    wx/osx/menu.h
    wx/osx/menuitem.h
@@ -3129,10 +3128,15 @@ RICHTEXT_HDR =

 # wxSTC

-STC_SRC =
+STC_CMN_SRC =
    src/stc/stc.cpp
    src/stc/PlatWX.cpp
    src/stc/ScintillaWX.cpp

-STC_HDR =
+STC_CMN_HDR =
    wx/stc/stc.h
+
+STC_OSX_COCOA_SRC =
+    src/stc/PlatWXcocoa.mm
+STC_OSX_COCOA_HDR =
+
--- a/build/osx/wxcocoa.xcodeproj/project.pbxproj
+++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj
@@ -962,6 +962,9 @@
 		4CB3626391CE34D4B1F71AA0 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; };
 		4CB3626391CE34D4B1F71AA1 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; };
 		4CB3626391CE34D4B1F71AA2 /* jdatasrc.c in Sources */ = {isa = PBXBuildFile; fileRef = DECAF5DD80383A2CA76EB383 /* jdatasrc.c */; };
+		4CECCB6D2224FAD300FF250C /* PlatWXcocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4CECCB6C2224FAD300FF250C /* PlatWXcocoa.mm */; };
+		4CECCB6E2224FADB00FF250C /* PlatWXcocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4CECCB6C2224FAD300FF250C /* PlatWXcocoa.mm */; };
+		4CECCB6F2224FAE300FF250C /* PlatWXcocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4CECCB6C2224FAD300FF250C /* PlatWXcocoa.mm */; };
 		4CF9BA40653C3153805D88AB /* arcfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C513377E9E303F778BA9D7ED /* arcfind.cpp */; };
 		4CF9BA40653C3153805D88AC /* arcfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C513377E9E303F778BA9D7ED /* arcfind.cpp */; };
 		4CF9BA40653C3153805D88AD /* arcfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C513377E9E303F778BA9D7ED /* arcfind.cpp */; };
@@ -4131,6 +4134,7 @@
 		4BA819575B5136B09FA8FEB1 /* pen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pen.cpp; path = ../../src/osx/pen.cpp; sourceTree = "<group>"; };
 		4C4649974D8B3A109D1BF145 /* art_internal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = art_internal.cpp; path = ../../src/ribbon/art_internal.cpp; sourceTree = "<group>"; };
 		4CB467F9898C3952A68D988B /* zutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = zutil.c; path = ../../src/zlib/zutil.c; sourceTree = "<group>"; };
+		4CECCB6C2224FAD300FF250C /* PlatWXcocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatWXcocoa.mm; path = ../../src/stc/PlatWXcocoa.mm; sourceTree = "<group>"; };
 		4EB3B255D20F3AE5A95230F6 /* LexCSS.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSS.cxx; path = ../../src/stc/scintilla/lexers/LexCSS.cxx; sourceTree = "<group>"; };
 		4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CallTip.cxx; path = ../../src/stc/scintilla/src/CallTip.cxx; sourceTree = "<group>"; };
 		4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jpeg_12.c; path = ../../src/tiff/libtiff/tif_jpeg_12.c; sourceTree = "<group>"; };
@@ -6152,6 +6156,7 @@
 				D0B9C41A4D12345AAA764CAD /* stc.cpp */,
 				47FF6D792CA234C395692118 /* PlatWX.cpp */,
 				8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */,
+				4CECCB6C2224FAD300FF250C /* PlatWXcocoa.mm */,
 			);
 			name = stc;
 			sourceTree = "<group>";
@@ -8066,6 +8071,7 @@
 				E3B3E4F75D503DB89B5C622F /* stc.cpp in Sources */,
 				908957F65B7E36F8BF3858DF /* PlatWX.cpp in Sources */,
 				3E6AA08E72A030D39D867D4D /* ScintillaWX.cpp in Sources */,
+				4CECCB6F2224FAE300FF250C /* PlatWXcocoa.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -8916,6 +8922,7 @@
 				D4EC9DB5F8DF319EA0FD26A5 /* LexVB.cxx in Sources */,
 				3C5E1A45A57B3169A4C073DA /* LexVerilog.cxx in Sources */,
 				16021CFD78623B8CBD08FC20 /* LexVHDL.cxx in Sources */,
+				4CECCB6E2224FADB00FF250C /* PlatWXcocoa.mm in Sources */,
 				9CC92BB4B0E233A0A7F8127A /* LexVisualProlog.cxx in Sources */,
 				159E4248CB1333AD841D9F04 /* LexYAML.cxx in Sources */,
 				91364FDD73053139BBAA313C /* Accessor.cxx in Sources */,
@@ -10141,6 +10148,7 @@
 				D4EC9DB5F8DF319EA0FD26A4 /* LexVB.cxx in Sources */,
 				3C5E1A45A57B3169A4C073D9 /* LexVerilog.cxx in Sources */,
 				16021CFD78623B8CBD08FC1F /* LexVHDL.cxx in Sources */,
+				4CECCB6D2224FAD300FF250C /* PlatWXcocoa.mm in Sources */,
 				9CC92BB4B0E233A0A7F81279 /* LexVisualProlog.cxx in Sources */,
 				159E4248CB1333AD841D9F03 /* LexYAML.cxx in Sources */,
 				91364FDD73053139BBAA313B /* Accessor.cxx in Sources */,
--- a/build/update-setup-h
+++ b/build/update-setup-h
@@ -5,7 +5,7 @@
 #             having special comment markers in them will be update using
 #             include/wx/setup_inc.h contents
 # Created:    2005-01-15
-# Copyright:  (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+# Copyright:  (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 # Licence:    wxWindows licence
 ##############################################################################

--- a/build/upmake
+++ b/build/upmake
@@ -1441,7 +1441,7 @@ if (!$only_bkl) {
            qa       => [qw(QA)],
            ribbon   => [qw(RIBBON)],
            richtext => [qw(RICHTEXT)],
-            stc      => [qw(STC)],
+            stc      => [qw(STC_CMN)],
            webview  => [qw(WEBVIEW_CMN WEBVIEW_MSW)],
            xml      => [qw(XML)],
            xrc      => [qw(XRC)],
--- a/build/upmake_script.pl
+++ b/build/upmake_script.pl
@@ -82,7 +82,7 @@ if (!$only_bkl) {
            qa       => [qw(QA)],
            ribbon   => [qw(RIBBON)],
            richtext => [qw(RICHTEXT)],
-            stc      => [qw(STC)],
+            stc      => [qw(STC_CMN)],
            webview  => [qw(WEBVIEW_CMN WEBVIEW_MSW)],
            xml      => [qw(XML)],
            xrc      => [qw(XRC)],
--- a/198
+++ b/198
@@ -976,6 +976,7 @@ DIRECTFB_CFLAGS
 GTK_CONFIG
 GTK_LIBS
 GTK_CFLAGS
+wxCFLAGS_C99
 subdirs
 LIBTIFF_LIBS
 LIBTIFF_CFLAGS
@@ -1025,6 +1026,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1448,6 +1450,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1700,6 +1703,15 @@ do
  | -silent | --silent | --silen | --sile | --sil)
    silent=yes ;;

+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    ac_prev=sbindir ;;
  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1837,7 +1849,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
  eval ac_val=\$$ac_var
  # Remove trailing slashes.
@@ -1990,6 +2002,7 @@ Fine tuning of the installation directories:
  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
  --libdir=DIR            object code libraries [EPREFIX/lib]
  --includedir=DIR        C header files [PREFIX/include]
  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -23785,6 +23798,189 @@ $as_echo "$as_me: WARNING: system expat library not found, will use built-in ins
        fi
    fi
    if test "$wxUSE_EXPAT" = "builtin" ; then
+                        save_CC="$CC"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
+fi
+
+
+        CC="$save_CC"
+
+                        wxCFLAGS_C99=$ac_cv_prog_cc_c99
+
+
                subdirs="$subdirs src/expat/expat"

    fi
--- a/configure.in
+++ b/configure.in
@@ -2721,6 +2721,17 @@ if test "$wxUSE_EXPAT" != "no"; then
        fi
    fi
    if test "$wxUSE_EXPAT" = "builtin" ; then
+        dnl Expat requires C99 compiler, so define wxCFLAGS_C99 variable which
+        dnl is used when compiling it in our makefiles.
+        save_CC="$CC"
+        AC_PROG_CC_C99
+        CC="$save_CC"
+
+        dnl Note that we need just the flags, not the full CC value including
+        dnl the compiler too.
+        wxCFLAGS_C99=$ac_cv_prog_cc_c99
+        AC_SUBST(wxCFLAGS_C99)
+
        dnl Expat needs this:
        AC_CONFIG_SUBDIRS([src/expat/expat])
    fi
--- a/demos/forty/pile.cpp
+++ b/demos/forty/pile.cpp
@@ -155,13 +155,14 @@ Card* Pile::RemoveTopCard()
 //+-------------------------------------------------------------+
 Card* Pile::RemoveTopCard(wxDC& dc, int xOffset, int yOffset)
 {
-    int topX, topY, x, y;
+    int topX, topY;

    GetTopCardPos(topX, topY);
    Card* card = RemoveTopCard();

    if (card)
    {
+        int x, y;
        card->Erase(dc, topX - xOffset, topY - yOffset);
        GetTopCardPos(x, y);
        if (m_topCard < 0)
--- a/demos/life/game.cpp
+++ b/demos/life/game.cpp
@@ -584,7 +584,7 @@ extern int g_tab2[];
 bool Life::NextTic()
 {
    LifeCellBox  *c, *up, *dn, *lf, *rt;
-    wxUint32 t1, t2, t3, t4;
+    wxUint32 t1, t2;
    bool     changed = false;

    m_numcells = 0;
@@ -833,6 +833,7 @@ bool Life::NextTic()
        t1 = 0;
        t2 = 0;

+        wxUint32 t3, t4;
        t3 = c->m_live1;
        c->m_old1 = t3;

--- a/demos/life/game.h
+++ b/demos/life/game.h
@@ -20,27 +20,26 @@ class LifePattern
 {
 public:
    // This ctor is used by the LifeReader class
-    LifePattern(wxString      name,
-                wxString      description,
-                wxString      rules,
-                wxArrayString shape)
+    LifePattern(const wxString& name,
+                const wxString& description,
+                const wxString& rules,
+                const wxArrayString& shape)
+        : m_name(name)
+        , m_description(description)
+        , m_rules(rules)
+        , m_shape(shape)
    {
-        m_name        = name;
-        m_description = description;
-        m_rules       = rules;
-        m_shape       = shape;
    }

    // A more convenient ctor for the built-in samples
-    LifePattern(wxString      name,
-                wxString      description,
+    LifePattern(const wxString& name,
+                const wxString& description,
                int           width,
                int           height,
                const char   *shape)
+        : m_name(name)
+        , m_description(description)
    {
-        m_name        = name;
-        m_description = description;
-        m_rules       = wxEmptyString;
        // TODO: add the positions later, since the formatting command
        // causes a crash due to conversion objects not being available
        // during initialisation.
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -148,7 +148,6 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
    int i = pages[current_page];
    int ch = -1;
    int y = 0;
-    int j;
    wxChar *line_ptr;
    int curr_width = 0;
    bool page_break = false;
@@ -161,10 +160,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
        y = (*max_y - poem_height)/2;
        width = *max_x;
        height = *max_y;
-    }

-    if (DrawIt)
-    {
        dc->SetBrush(*wxLIGHT_GREY_BRUSH);
        dc->SetPen(*wxGREY_PEN);
        dc->DrawRectangle(0, 0, width, height);
@@ -207,6 +203,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)

    while (ch != 0 && !page_break)
    {
+        int j;
        j = 0;
 #if defined(__WXMSW__) || defined(__WXMAC__)
        while (((ch = poem_buffer[i]) != 13) && (ch != 0))
@@ -467,8 +464,6 @@ void MainWindow::PreviousPage(void)
 // Search for a string
 void MainWindow::Search(bool ask)
 {
-    long position;
-
    if (ask || m_searchString.empty())
    {
        wxString s = wxGetTextFromUser( wxT("Enter search string"), wxT("Search"), m_searchString);
@@ -491,6 +486,7 @@ void MainWindow::Search(bool ask)

    if (!m_searchString.empty() && search_ok)
    {
+        long position;
        position = DoSearch();
        if (position > -1)
        {
@@ -856,6 +852,7 @@ long MainWindow::DoSearch(void)
        previous_poem_start = -1;
    }

+    buf[0] = 0;
    if (data_filename)
        wxSprintf(buf, wxT("%s.dat"), data_filename);

@@ -942,6 +939,7 @@ bool Compile(void)
    int ch;
    wxChar buf[100];

+    buf[0] = 0;
    if (data_filename)
        wxSprintf(buf, wxT("%s.dat"), data_filename);

@@ -974,6 +972,7 @@ bool Compile(void)
    } while (ch != EOF);
    fclose(file);

+    buf[0] = 0;
    if (index_filename)
      wxSprintf(buf, wxT("%s.idx"), index_filename);

--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -65,6 +65,11 @@ Changes in behaviour not resulting in compilation errors
 - wxGTK wxNotebook::AddPage() doesn't generate any events any more for the
  first page being added, for consistency with the other ports.

+- wxMSW wxToolBar height now adapts to the height of embedded controls, making
+  the toolbar taller if necessary, rather than making the controls smaller. To
+  return to the previous behaviour, you need to explicitly create controls of
+  smaller size.
+

 Changes in behaviour which may result in build errors
 -----------------------------------------------------
--- a/docs/contributing/how-to-add-class-documentation.md
+++ b/docs/contributing/how-to-add-class-documentation.md
@@ -33,8 +33,9 @@ which are implementation details.
 Running Doxygen
 ---------------

-First, make sure you have a recent version of Doxygen installed in your system
-(currently Doxygen 1.8.8 is used).
+First, make sure you have a recent version of Doxygen (currently Doxygen 1.8.8
+is used) and Graphviz installed in your system (under Windows Graphviz
+location should be in %PATH%).

 On Unix:

@@ -63,7 +64,7 @@ DO:

 - strive to use dedicated Doxygen commands for e.g. notes, lists,
  sections, etc. The "Special commands" page:
-    http://www.stack.nl/~dimitri/doxygen/commands.html
+    http://www.doxygen.org/manual/commands.html
  is your friend!
  It's also very important to make a consistent use of the ALIASES
  defined by wxWidgets' Doxyfile. Open that file for more info.
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -534,7 +534,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

 TAGFILES               =
-GENERATE_TAGFILE       =
+GENERATE_TAGFILE       = $(GENERATE_TAGFILE)
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 EXTERNAL_PAGES         = YES
--- a/docs/doxygen/mainpages/const_wxusedef.h
+++ b/docs/doxygen/mainpages/const_wxusedef.h
@@ -318,7 +318,6 @@ library:
@itemdef{wxUSE_ACCESSIBILITY, Enable accessibility support}
@itemdef{wxUSE_ACTIVEX, Use wxActiveXContainer and related classes.}
@itemdef{wxUSE_COMBOCTRL_POPUP_ANIMATION, See wx/msw/combo.h file.}
-@itemdef{wxUSE_COMCTL32_SAFELY, See src/msw/treectrl.cpp file.}
@itemdef{wxUSE_COMMON_DIALOGS, Enable use of windows common dialogs from header commdlg.h; example PRINTDLG.}
@itemdef{wxUSE_CRASHREPORT, Use wxCrashReport class.}
@itemdef{wxUSE_DATEPICKCTRL_GENERIC, Use generic wxDatePickerCtrl implementation in addition to the native one.}
--- a/docs/doxygen/mainpages/copyright.h
+++ b/docs/doxygen/mainpages/copyright.h
@@ -11,7 +11,7 @@

@section section_copyright wxWidgets Copyrights and Licenses

-Copyright (c) 1992-2018 Julian Smart, Vadim Zeitlin, Stefan Csomor, Robert
+Copyright (c) 1992-2019 Julian Smart, Vadim Zeitlin, Stefan Csomor, Robert
 Roebling, and other members of the wxWidgets team, please see the
 acknowledgements section below.

--- a/docs/doxygen/overviews/eventhandling.h
+++ b/docs/doxygen/overviews/eventhandling.h
@@ -98,10 +98,11 @@ First define one or more <em>event handlers</em>. They
 are just simple methods of the class that take as a parameter a
 reference to an object of a wxEvent-derived class and have no return value (any
 return information is passed via the argument, which is why it is non-const).
-You also need to insert a macro
+You also need to insert a line with the macro indicating that the class uses an
+event table, like this:

@code
-wxDECLARE_EVENT_TABLE()
+wxDECLARE_EVENT_TABLE();
@endcode

 somewhere in the class declaration. It doesn't matter where it appears but
@@ -132,7 +133,7 @@ private:
    // obligation to do that; this one is an event handler too:
    void DoTest(wxCommandEvent& event);

-    wxDECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
@endcode

--- a/docs/doxygen/regen.sh
+++ b/docs/doxygen/regen.sh
@@ -6,7 +6,7 @@
 # readable.
 #
 # Usage:
-#    ./regen.sh [html|chm|xml|latex|all]
+#    ./regen.sh [html|chm|xml|latex|docset|all]
 #
 # Pass "x" to regen only the X output format and "all" to regen them all.
 # If no arguments are passed, HTML is regenerated (just like passing "html").
@@ -17,6 +17,8 @@
 me=$(basename $0)
 path=${0%%/$me}        # path from which the script has been launched
 cd "$path"
+SCRIPTS_DIR="$(pwd)/scripts"
+
 if [[ -z "$WXWIDGETS" ]]; then
    # Notice the use of -P to ensure we get the canonical path even if there
    # are symlinks in the current path. This is important because Doxygen
@@ -80,6 +82,7 @@ case "$1" in
    docset)
        export GENERATE_DOCSET="YES"
        export GENERATE_HTML="YES"
+        export GENERATE_TAGFILE="$path/out/wxWidgets.tag"
        ;;
    latex)
        export GENERATE_LATEX="YES"
@@ -166,7 +169,11 @@ if [[ "$1" = "docset" ]]; then
    ATOMDIR="https://docs.wxwidgets.org/docsets"
    XAR="$BASENAME.xar"
    XARDIR="https://docs.wxwidgets.org/docsets"
-    XCODE_INSTALL=`xcode-select -print-path`
+
+    # See if xcode is installed
+    if [ -x "$(command -v xcode-select)" ]; then
+        XCODE_INSTALL=`xcode-select -print-path`
+    fi

    cd out/html
    DESTINATIONDIR=`pwd`/../docset
@@ -177,19 +184,38 @@ if [[ "$1" = "docset" ]]; then

    make DOCSET_NAME=$DESTINATIONDIR/$DOCSETNAME

-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleVersion 1.3
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleShortVersionString 1.3
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleName "wxWidgets 3.1"
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFeedURL $ATOMDIR/$ATOM
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFallbackURL https://docs.wxwidgets.org
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetDescription "API reference and conceptual documentation for wxWidgets 3.0"
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info NSHumanReadableCopyright "Copyright 1992-2018 wxWidgets team, Portions 1996 Artificial Intelligence Applications Institute"
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info isJavaScriptEnabled true
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info dashIndexFilePath index.html
-    defaults write $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetPlatformFamily wx
+    # Choose which plist modification utility to use
+    if [ -x "$(command -v defaults)" ]; then
+        PLIST_WRITE_CMD="defaults write"
+    else
+        PLIST_WRITE_CMD="python $SCRIPTS_DIR/write_info_tag.py"
+    fi

-    $XCODE_INSTALL/usr/bin/docsetutil package -atom $DESTINATIONDIR/$ATOM -download-url $XARDIR/$XAR -output $DESTINATIONDIR/$XAR $DESTINATIONDIR/$DOCSETNAME
+    # Modify the Info.plist file
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleVersion 1.3
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleShortVersionString 1.3
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info CFBundleName "wxWidgets 3.1"
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFeedURL $ATOMDIR/$ATOM
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetFallbackURL https://docs.wxwidgets.org
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetDescription "API reference and conceptual documentation for wxWidgets 3.0"
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info NSHumanReadableCopyright "Copyright 1992-2019 wxWidgets team, Portions 1996 Artificial Intelligence Applications Institute"
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info isJavaScriptEnabled true
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info dashIndexFilePath index.html
+    $PLIST_WRITE_CMD $DESTINATIONDIR/$DOCSETNAME/Contents/Info DocSetPlatformFamily wx

+    echo "Creating docset database"
+    if ! [ -z "$XCODE_INSTALL" ]; then
+        # Use xcode to create the docset if it is installed
+        $XCODE_INSTALL/usr/bin/docsetutil package -atom $DESTINATIONDIR/$ATOM -download-url $XARDIR/$XAR -output $DESTINATIONDIR/$XAR $DESTINATIONDIR/$DOCSETNAME
+    else
+        # Use doxytag2zealdb to create the database
+        # This requires the python package doxytag2zealdb installed
+        python -m doxytag2zealdb --tag $DESTINATIONDIR/../wxWidgets.tag --db $DESTINATIONDIR/$DOCSETNAME/Contents/Resources/docSet.dsidx --include-parent-scopes --include-function-signatures
+    fi
+
+    # Copy the icon
+    cp $SCRIPTS_DIR/../../../art/wxwin16x16.png $DESTINATIONDIR/$DOCSETNAME/icon.png
+    cp $SCRIPTS_DIR/../../../art/wxwin32x32.png $DESTINATIONDIR/$DOCSETNAME/icon@2x.png
    cd ../..
 fi

--- a/docs/doxygen/scripts/write_info_tag.py
+++ b/docs/doxygen/scripts/write_info_tag.py
@@ -0,0 +1,41 @@
+#
+# write_info_tag.py
+# Write a key/value pair to an Info.plist file created by Doxygen
+# while generating docsets.
+#
+# Author: Ian McInerney (https://github.com/imciner2)
+
+import sys
+import plistlib
+
+# The first argument is the plist filename without the extension
+fname = sys.argv[1] + ".plist"
+
+# The second argument is the key to replace
+key = sys.argv[2]
+
+# The thrid argument is the value of the key
+val = sys.argv[3]
+
+# Handle boolean values
+if val.lower() == "true":
+  val = True
+elif val.lower() == "false":
+  val = False
+
+
+if sys.version_info >= (3, 4, 0):
+  # Use the new API if python 3.4 is used
+  with open( fname, 'rb' ) as plist_file:
+    pl = plistlib.load( plist_file )
+
+  pl[key] = val
+
+  with open( fname, 'wb' ) as plist_file:
+    pl = plistlib.dump( pl, plist_file )
+
+else:
+  # Use the old API otherwise (supports python 2.7 as well)
+  pl = plistlib.readPlist( fname )
+  pl[key] = val
+  plistlib.writePlist( pl, fname )
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-12-12
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/aboutdlg.h
+++ b/include/wx/aboutdlg.h
@@ -3,7 +3,7 @@
 // Purpose:     declaration of wxAboutDialog class
 // Author:      Vadim Zeitlin
 // Created:     2006-10-07
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/aui/framemanager.h
+++ b/include/wx/aui/framemanager.h
@@ -368,7 +368,7 @@ public:
        buttonCustom3         = 1 << 28,

        savedHiddenState      = 1 << 30, // used internally
-        actionPane            = 1 << 31  // used internally
+        actionPane            = 1u << 31  // used internally
    };

 public:
--- a/include/wx/clrpicker.h
+++ b/include/wx/clrpicker.h
@@ -159,13 +159,15 @@ private:
 // ----------------------------------------------------------------------------

 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLOURPICKER_CHANGED, wxColourPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLOURPICKER_CURRENT_CHANGED, wxColourPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLOURPICKER_DIALOG_CANCELLED, wxColourPickerEvent );

 class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
 {
 public:
    wxColourPickerEvent() {}
-    wxColourPickerEvent(wxObject *generator, int id, const wxColour &col)
-        : wxCommandEvent(wxEVT_COLOURPICKER_CHANGED, id),
+    wxColourPickerEvent(wxObject *generator, int id, const wxColour &col, wxEventType commandType = wxEVT_COLOURPICKER_CHANGED)
+        : wxCommandEvent(commandType, id),
          m_colour(col)
    {
        SetEventObject(generator);
@@ -196,6 +198,11 @@ typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&);
 #define EVT_COLOURPICKER_CHANGED(id, fn) \
    wx__DECLARE_EVT1(wxEVT_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))

+#define EVT_COLOURPICKER_CURRENT_CHANGED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COLOURPICKER_CURRENT_CHANGED, id, wxColourPickerEventHandler(fn))
+
+#define EVT_COLOURPICKER_DIALOG_CANCELLED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COLOURPICKER_DIALOG_CANCELLED, id, wxColourPickerEventHandler(fn))

 // old wxEVT_COMMAND_* constant
 #define wxEVT_COMMAND_COLOURPICKER_CHANGED   wxEVT_COLOURPICKER_CHANGED
--- a/include/wx/cmdargs.h
+++ b/include/wx/cmdargs.h
@@ -3,7 +3,7 @@
 // Purpose:     declaration of wxCmdLineArgsArray helper class
 // Author:      Vadim Zeitlin
 // Created:     2007-11-12
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -31,6 +31,52 @@
    #define wxColourDialog wxGenericColourDialog
 #endif

+// Under some platforms (currently only wxMSW) wxColourDialog can send events
+// of this type while it is shown.
+//
+// Notice that this class is almost identical to wxColourPickerEvent but it
+// doesn't really sense to reuse the same class for both controls.
+class WXDLLIMPEXP_CORE wxColourDialogEvent : public wxCommandEvent
+{
+public:
+    wxColourDialogEvent()
+    {
+    }
+
+    wxColourDialogEvent(wxEventType evtType,
+                        wxColourDialog* dialog,
+                        const wxColour& colour)
+        : wxCommandEvent(evtType, dialog->GetId()),
+          m_colour(colour)
+    {
+        SetEventObject(dialog);
+    }
+
+    // default copy ctor and dtor are ok
+
+    wxColour GetColour() const { return m_colour; }
+    void SetColour(const wxColour& colour) { m_colour = colour; }
+
+    virtual wxEvent *Clone() const wxOVERRIDE
+    {
+        return new wxColourDialogEvent(*this);
+    }
+
+private:
+    wxColour m_colour;
+
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourDialogEvent);
+};
+
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COLOUR_CHANGED, wxColourDialogEvent);
+
+#define wxColourDialogEventHandler(func) \
+    wxEVENT_HANDLER_CAST(wxColourDialogEventFunction, func)
+
+#define EVT_COLOUR_CHANGED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COLOUR_CHANGED, id, wxColourDialogEventHandler(fn))
+
+
 // get the colour from user and return it
 WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL,
                                              const wxColour& colInit = wxNullColour,
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -154,6 +154,10 @@ public:
    bool Ok() const { return IsOk(); }
 #endif

+    // Return the perceived brightness of the colour, with 0 for black and 1
+    // for white.
+    double GetLuminance() const;
+
    // manipulation
    // ------------

--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -266,6 +266,12 @@ public:
    {
        return m_container.HasTransparentBackground();
    }
+
+    WXDLLIMPEXP_INLINE_CORE
+    virtual void WXDoUpdatePendingFocus(wxWindow* win) wxOVERRIDE
+    {
+        return m_container.SetLastFocus(win);
+    }
 #endif // __WXMSW__

 protected:
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -3,7 +3,7 @@
 *  Purpose:     Various preprocessor helpers
 *  Author:      Vadim Zeitlin
 *  Created:     2006-09-30
- *  Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+ *  Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 *  Licence:     wxWindows licence
 */

--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-09
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/dateevt.h
+++ b/include/wx/dateevt.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-10
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1405,6 +1405,78 @@ private:
    wxDECLARE_NO_COPY_CLASS(wxDCTextColourChanger);
 };

+// ----------------------------------------------------------------------------
+// helper class: you can use it to temporarily change the DC text background colour and
+// restore it automatically when the object goes out of scope
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxDCTextBgColourChanger
+{
+public:
+    wxDCTextBgColourChanger(wxDC& dc) : m_dc(dc) { }
+
+    wxDCTextBgColourChanger(wxDC& dc, const wxColour& col) : m_dc(dc)
+    {
+        Set(col);
+    }
+
+    ~wxDCTextBgColourChanger()
+    {
+        if ( m_colBgOld.IsOk() )
+            m_dc.SetTextBackground(m_colBgOld);
+    }
+
+    void Set(const wxColour& col)
+    {
+        if ( !m_colBgOld.IsOk() )
+            m_colBgOld = m_dc.GetTextBackground();
+        m_dc.SetTextBackground(col);
+    }
+
+private:
+    wxDC& m_dc;
+
+    wxColour m_colBgOld;
+
+    wxDECLARE_NO_COPY_CLASS(wxDCTextBgColourChanger);
+};
+
+// ----------------------------------------------------------------------------
+// helper class: you can use it to temporarily change the DC text background mode and
+// restore it automatically when the object goes out of scope
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxDCTextBgModeChanger
+{
+public:
+    wxDCTextBgModeChanger(wxDC& dc) : m_dc(dc), m_modeOld(wxBRUSHSTYLE_INVALID) { }
+
+    wxDCTextBgModeChanger(wxDC& dc, int mode) : m_dc(dc)
+    {
+        Set(mode);
+    }
+
+    ~wxDCTextBgModeChanger()
+    {
+        if ( m_modeOld != wxBRUSHSTYLE_INVALID )
+            m_dc.SetBackgroundMode(m_modeOld);
+    }
+
+    void Set(int mode)
+    {
+        if ( m_modeOld == wxBRUSHSTYLE_INVALID )
+            m_modeOld = m_dc.GetBackgroundMode();
+        m_dc.SetBackgroundMode(mode);
+    }
+
+private:
+    wxDC& m_dc;
+
+    int m_modeOld;
+
+    wxDECLARE_NO_COPY_CLASS(wxDCTextBgModeChanger);
+};
+
 // ----------------------------------------------------------------------------
 // helper class: you can use it to temporarily change the DC pen and
 // restore it automatically when the object goes out of scope
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -12,6 +12,7 @@
 #define _WX_DCSVG_H_

 #include "wx/string.h"
+#include "wx/filename.h"
 #include "wx/dc.h"

 #if wxUSE_SVG
@@ -40,13 +41,26 @@ public:
 };

 // Predefined standard bitmap handler: creates a file, stores the bitmap in
-// this file and uses the file URI in the generated SVG.
+// this file and uses the file name in the generated SVG.
 class WXDLLIMPEXP_CORE wxSVGBitmapFileHandler : public wxSVGBitmapHandler
 {
 public:
+    wxSVGBitmapFileHandler()
+        : m_path()
+    {
+    }
+
+    explicit wxSVGBitmapFileHandler(const wxFileName& path)
+        : m_path(path)
+    {
+    }
+
    virtual bool ProcessBitmap(const wxBitmap& bitmap,
                               wxCoord x, wxCoord y,
                               wxOutputStream& stream) const wxOVERRIDE;
+
+private:
+    wxFileName m_path; // When set, name will be appended with _image#.png
 };

 // Predefined handler which embeds the bitmap (base64-encoding it) inside the
@@ -62,9 +76,9 @@ public:
 class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
 {
 public:
-    wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,
-                     int width = 320, int height = 240, double dpi = 72.0,
-                     const wxString &title = wxString() );
+    wxSVGFileDCImpl(wxSVGFileDC *owner, const wxString &filename,
+                    int width = 320, int height = 240, double dpi = 72.0,
+                    const wxString &title = wxString());

    virtual ~wxSVGFileDCImpl();

@@ -122,8 +136,8 @@ public:
        m_graphics_changed = true;
    }

-    virtual void SetBackground( const wxBrush &brush ) wxOVERRIDE;
-    virtual void SetBackgroundMode( int mode ) wxOVERRIDE;
+    virtual void SetBackground(const wxBrush &brush) wxOVERRIDE;
+    virtual void SetBackgroundMode(int mode) wxOVERRIDE;
    virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
    virtual void SetFont(const wxFont& font) wxOVERRIDE;
    virtual void SetPen(const wxPen& pen) wxOVERRIDE;
@@ -133,125 +147,124 @@ public:
    void SetBitmapHandler(wxSVGBitmapHandler* handler);

 private:
-   virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const wxOVERRIDE
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented"));
-       return true;
-   }
+    virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const wxOVERRIDE
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented"));
+        return true;
+    }

-   virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *,
-                       wxCoord, wxCoord, wxRasterOperationMode = wxCOPY,
-                       bool = 0, int = -1, int = -1) wxOVERRIDE;
+    virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *,
+                        wxCoord, wxCoord, wxRasterOperationMode = wxCOPY,
+                        bool = 0, int = -1, int = -1) wxOVERRIDE;

-   virtual void DoCrossHair(wxCoord, wxCoord) wxOVERRIDE
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented"));
-   }
+    virtual void DoCrossHair(wxCoord, wxCoord) wxOVERRIDE
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented"));
+    }

-   virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord) wxOVERRIDE;
+    virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord) wxOVERRIDE;

-   virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false) wxOVERRIDE;
+    virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false) wxOVERRIDE;

-   virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;
+    virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;

-   virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;
+    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;

-   virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                  double sa, double ea) wxOVERRIDE;
+    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                   double sa, double ea) wxOVERRIDE;

-   virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord) wxOVERRIDE;
+    virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord) wxOVERRIDE;

-   virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;

-   virtual void DoDrawLines(int n, const wxPoint points[],
-                            wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE;
+    virtual void DoDrawLines(int n, const wxPoint points[],
+                             wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE;

-   virtual void DoDrawPoint(wxCoord, wxCoord) wxOVERRIDE;
+    virtual void DoDrawPoint(wxCoord, wxCoord) wxOVERRIDE;

-   virtual void DoDrawPolygon(int n, const wxPoint points[],
-                              wxCoord xoffset, wxCoord yoffset,
-                              wxPolygonFillMode fillStyle) wxOVERRIDE;
+    virtual void DoDrawPolygon(int n, const wxPoint points[],
+                               wxCoord xoffset, wxCoord yoffset,
+                               wxPolygonFillMode fillStyle) wxOVERRIDE;

-   virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
-                                  wxCoord xoffset, wxCoord yoffset,
-                                  wxPolygonFillMode fillStyle) wxOVERRIDE;
+    virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
+                                   wxCoord xoffset, wxCoord yoffset,
+                                   wxPolygonFillMode fillStyle) wxOVERRIDE;

-   virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;

-   virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
-                                  double angle) wxOVERRIDE;
+    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+                                   double angle) wxOVERRIDE;

-   virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-                                       wxCoord w, wxCoord h,
-                                       double radius = 20) wxOVERRIDE ;
+    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                        wxCoord w, wxCoord h,
+                                        double radius = 20) wxOVERRIDE;

-   virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;

-   virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
-                            const wxColour& WXUNUSED(col),
-                            wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE) wxOVERRIDE
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented"));
-       return false;
-   }
+    virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                             const wxColour& WXUNUSED(col),
+                             wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE) wxOVERRIDE
+    {
+        wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented"));
+        return false;
+    }

-   virtual void DoGetSize(int * x, int *y) const wxOVERRIDE
-   {
-       if ( x )
-           *x = m_width;
-       if ( y )
-           *y = m_height;
-   }
+    virtual void DoGetSize(int * x, int *y) const wxOVERRIDE
+    {
+        if ( x )
+            *x = m_width;
+        if ( y )
+            *y = m_height;
+    }

-   virtual void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h,
-                                wxCoord *descent = NULL,
-                                wxCoord *externalLeading = NULL,
-                                const wxFont *font = NULL) const wxOVERRIDE;
+    virtual void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 const wxFont *font = NULL) const wxOVERRIDE;

-   virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE
-   {
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE
+    {
        DoSetClippingRegion(region.GetBox().x, region.GetBox().y,
                            region.GetBox().width, region.GetBox().height);
-   }
+    }

-   virtual void DoSetClippingRegion(int x,  int y, int width, int height) wxOVERRIDE;
+    virtual void DoSetClippingRegion(int x, int y, int width, int height) wxOVERRIDE;

-   virtual void DoGetSizeMM( int *width, int *height ) const wxOVERRIDE;
+    virtual void DoGetSizeMM(int *width, int *height) const wxOVERRIDE;

-   virtual wxSize GetPPI() const wxOVERRIDE;
+    virtual wxSize GetPPI() const wxOVERRIDE;

-   void Init (const wxString &filename, int width, int height,
+    void Init(const wxString &filename, int width, int height,
              double dpi, const wxString &title);

-   void write( const wxString &s );
+    void write(const wxString &s);

 private:
-   // If m_graphics_changed is true, close the current <g> element and start a
-   // new one for the last pen/brush change.
-   void NewGraphicsIfNeeded();
+    // If m_graphics_changed is true, close the current <g> element and start a
+    // new one for the last pen/brush change.
+    void NewGraphicsIfNeeded();

-   // Open a new graphics group setting up all the attributes according to
-   // their current values in wxDC.
-   void DoStartNewGraphics();
+    // Open a new graphics group setting up all the attributes according to
+    // their current values in wxDC.
+    void DoStartNewGraphics();

-   wxString            m_filename;
-   int                 m_sub_images; // number of png format images we have
-   bool                m_OK;
-   bool                m_graphics_changed;  // set by Set{Brush,Pen}()
-   int                 m_width, m_height;
-   double              m_dpi;
-   wxScopedPtr<wxFileOutputStream> m_outfile;
-   wxScopedPtr<wxSVGBitmapHandler> m_bmp_handler; // class to handle bitmaps
+    wxString            m_filename;
+    bool                m_OK;
+    bool                m_graphics_changed;  // set by Set{Brush,Pen}()
+    int                 m_width, m_height;
+    double              m_dpi;
+    wxScopedPtr<wxFileOutputStream> m_outfile;
+    wxScopedPtr<wxSVGBitmapHandler> m_bmp_handler; // class to handle bitmaps

-   // The clipping nesting level is incremented by every call to
-   // SetClippingRegion() and reset when DestroyClippingRegion() is called.
-   size_t m_clipNestingLevel;
+    // The clipping nesting level is incremented by every call to
+    // SetClippingRegion() and reset when DestroyClippingRegion() is called.
+    size_t m_clipNestingLevel;

-   // Unique ID for every clipping graphics group: this is simply always
-   // incremented in each SetClippingRegion() call.
-   size_t m_clipUniqueId;
+    // Unique ID for every clipping graphics group: this is simply always
+    // incremented in each SetClippingRegion() call.
+    size_t m_clipUniqueId;

-   wxDECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl);
+    wxDECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl);
 };


--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -282,7 +282,10 @@ extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
    // the need for the ugly global flag.
    #define wxASSERT_MSG_AT(cond, msg, file, line, func)                      \
        wxSTATEMENT_MACRO_BEGIN                                               \
-            if ( wxTheAssertHandler && !(cond) &&                             \
+            if ( cond )                                                       \
+            {                                                                 \
+            }                                                                 \
+            else if ( wxTheAssertHandler &&                                   \
                    (wxOnAssert(file, line, func, #cond, msg),                \
                     wxTrapInAssert) )                                        \
            {                                                                 \
--- a/include/wx/debugrpt.h
+++ b/include/wx/debugrpt.h
@@ -3,7 +3,7 @@
 // Purpose:     declaration of wxDebugReport class
 // Author:      Vadim Zeitlin
 // Created:     2005-01-17
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -114,6 +114,9 @@ public:
    virtual wxString GetCurrentlySelectedFilename() const
        { return m_currentlySelectedFilename; }

+    virtual int GetCurrentlySelectedFilterIndex () const
+        { return m_currentlySelectedFilterIndex; }
+
    // this function is called with wxFileDialog as parameter and should
    // create the window containing the extra controls we want to show in it
    typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*);
@@ -153,6 +156,12 @@ protected:
    // GetCurrentlySelectedFilename().
    wxString      m_currentlySelectedFilename;

+    // Currently selected, but not yet necessarily accepted by the user, file
+    // type (a.k.a. filter) index. This should be updated whenever the
+    // selection in the control changes by the platform-specific code to
+    // provide a useful implementation of GetCurrentlySelectedFilterIndex().
+    int           m_currentlySelectedFilterIndex;
+
    wxWindow*     m_extraControl;

    // returns true if control is created (if it already exists returns false)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -64,11 +64,10 @@ protected:

    // the file name currently being searched for, i.e. the argument of the
    // last FindFirst() call or empty string if FindFirst() hasn't been called
-    // yet or FindNext() didn't find anything
+    // yet
    wxString m_findArgument;

-    // iterator into m_Hash used by FindFirst/Next(), possibly m_Hash.end() or
-    // even invalid (can only be used when m_findArgument is not empty)
+    // iterator into m_Hash used by FindFirst/Next(), possibly m_Hash.end()
    wxMemoryFSHash::const_iterator m_findIter;
 };

--- a/include/wx/generic/aboutdlgg.h
+++ b/include/wx/generic/aboutdlgg.h
@@ -3,7 +3,7 @@
 // Purpose:     generic wxAboutBox() implementation
 // Author:      Vadim Zeitlin
 // Created:     2006-10-07
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/generic/clrpickerg.h
+++ b/include/wx/generic/clrpickerg.h
@@ -15,6 +15,8 @@
 #include "wx/bmpbuttn.h"
 #include "wx/colourdata.h"

+class wxColourDialogEvent;
+
 //-----------------------------------------------------------------------------
 // wxGenericColourButton: a button which brings up a wxColourDialog
 //-----------------------------------------------------------------------------
@@ -75,6 +77,8 @@ protected:
    static wxColourData ms_data;

 private:
+    void OnColourChanged(wxColourDialogEvent& event);
+
    wxDECLARE_DYNAMIC_CLASS(wxGenericColourButton);
 };

--- a/include/wx/generic/ctrlsub.h
+++ b/include/wx/generic/ctrlsub.h
@@ -3,7 +3,7 @@
 // Purpose:     common functionality of wxItemContainer-derived controls
 // Author:      Vadim Zeitlin
 // Created:     2007-07-25
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -213,17 +213,6 @@ protected:

    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;

-    // return the text for the given column of the given item
-    virtual wxString OnGetItemText(long item, long column) const;
-
-    // return the icon for the given item. In report view, OnGetItemImage will
-    // only be called for the first column. See OnGetItemColumnImage for
-    // details.
-    virtual int OnGetItemImage(long item) const;
-
-    // return the icon for the given item and column.
-    virtual int OnGetItemColumnImage(long item, long column) const;
-
    // it calls our OnGetXXX() functions
    friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow;

--- a/include/wx/generic/mask.h
+++ b/include/wx/generic/mask.h
@@ -3,7 +3,7 @@
 // Purpose:     generic implementation of wxMask
 // Author:      Vadim Zeitlin
 // Created:     2006-09-28
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/generic/notifmsg.h
+++ b/include/wx/generic/notifmsg.h
@@ -3,7 +3,7 @@
 // Purpose:     generic implementation of wxGenericNotificationMessage
 // Author:      Vadim Zeitlin
 // Created:     2007-11-24
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/generic/private/textmeasure.h
+++ b/include/wx/generic/private/textmeasure.h
@@ -27,11 +27,11 @@ protected:
                               wxCoord *width,
                               wxCoord *height,
                               wxCoord *descent = NULL,
-                               wxCoord *externalLeading = NULL);
+                               wxCoord *externalLeading = NULL) wxOVERRIDE;

    virtual bool DoGetPartialTextExtents(const wxString& text,
                                         wxArrayInt& widths,
-                                         double scaleX);
+                                         double scaleX) wxOVERRIDE;

    wxDECLARE_NO_COPY_CLASS(wxTextMeasure);
 };
--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -53,6 +53,11 @@ public:
    // fill data with data on the clipboard (if available)
    virtual bool GetData( wxDataObject& data ) wxOVERRIDE;

+    // flushes the clipboard; that means that the data which is currently on
+    // clipboard will stay available even after the application exits (possibly
+    // eating memory), otherwise the clipboard will be emptied on exit
+    virtual bool Flush() wxOVERRIDE;
+
    // clears wxTheClipboard and the system's clipboard if possible
    virtual void Clear() wxOVERRIDE;

--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -19,6 +19,7 @@

 class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11
 {
+    typedef wxGLCanvasX11 BaseType;
 public:
    wxGLCanvas(wxWindow *parent,
               const wxGLAttributes& dispAttrs,
@@ -109,12 +110,7 @@ public:
 #endif // WXWIN_COMPATIBILITY_2_8

    // implementation from now on
-    void OnInternalIdle() wxOVERRIDE;
-
-    bool              m_exposed;
-#ifdef __WXGTK3__
-    cairo_t* m_cairoPaintContext;
-#endif
+    virtual void GTKHandleRealized() wxOVERRIDE;

 #if WXWIN_COMPATIBILITY_2_8
    wxGLContext      *m_sharedContext;
--- a/include/wx/gtk/minifram.h
+++ b/include/wx/gtk/minifram.h
@@ -52,9 +52,6 @@ protected:

 // implementation
 public:
-    bool   m_isDragging;
-    int    m_oldX,m_oldY;
-    int    m_diffX,m_diffY;
    wxBitmap  m_closeButton;
    int m_miniEdge;
    int m_miniTitle;
--- a/include/wx/gtk/private/mnemonics.h
+++ b/include/wx/gtk/private/mnemonics.h
@@ -3,7 +3,7 @@
 // Purpose:     helper functions for dealing with GTK+ mnemonics
 // Author:      Vadim Zeitlin
 // Created:     2007-11-12
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/private/object.h
+++ b/include/wx/gtk/private/object.h
@@ -3,7 +3,7 @@
 // Purpose:     wxGtkObject class declaration
 // Author:      Vadim Zeitlin
 // Created:     2008-08-27
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/private/string.h
+++ b/include/wx/gtk/private/string.h
@@ -3,7 +3,7 @@
 // Purpose:     wxGtkString class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-10-19
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -153,6 +153,8 @@ protected:
    virtual void DoFreeze() wxOVERRIDE;
    virtual void DoThaw() wxOVERRIDE;

+    virtual void DoEnable(bool enable) wxOVERRIDE;
+
    // Widgets that use the style->base colour for the BG colour should
    // override this and return true.
    virtual bool UseGTKStyleBase() const wxOVERRIDE { return true; }
@@ -177,8 +179,6 @@ protected:
 private:
    void Init();

-    virtual void DoEnable(bool enable) wxOVERRIDE;
-
    // overridden wxTextEntry virtual methods
    virtual GtkEditable *GetEditable() const wxOVERRIDE;
    virtual GtkEntry *GetEntry() const wxOVERRIDE;
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -3,7 +3,7 @@
 // Purpose:     wxGTK-specific wxTextEntry implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-09-24
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk1/private/mnemonics.h
+++ b/include/wx/gtk1/private/mnemonics.h
@@ -3,7 +3,7 @@
 // Purpose:     helper functions for dealing with GTK+ mnemonics
 // Author:      Vadim Zeitlin
 // Created:     2007-11-12
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -393,9 +393,6 @@ public:
    virtual int GetColumnWidth(int col) const = 0;
    virtual bool SetColumnWidth(int col, int width) = 0;

-    // return the attribute for the item (may return NULL if none)
-    virtual wxItemAttr *OnGetItemAttr(long item) const;
-
    // Other miscellaneous accessors.
    // ------------------------------

@@ -427,6 +424,29 @@ protected:
    // Overridden methods of the base class.
    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;

+    // these functions are only used for virtual list view controls, i.e. the
+    // ones with wxLC_VIRTUAL style
+
+    // return the attribute for the item (may return NULL if none)
+    virtual wxItemAttr* OnGetItemAttr(long item) const;
+
+    // return the text for the given column of the given item
+    virtual wxString OnGetItemText(long item, long column) const;
+
+    // return whether the given item is checked
+    virtual bool OnGetItemIsChecked(long item) const;
+
+    // return the icon for the given item. In report view, OnGetItemImage will
+    // only be called for the first column. See OnGetItemColumnImage for
+    // details.
+    virtual int OnGetItemImage(long item) const;
+
+    // return the icon for the given item and column.
+    virtual int OnGetItemColumnImage(long item, long column) const;
+
+    // return the attribute for the given item and column (may return NULL if none)
+    virtual wxItemAttr* OnGetItemColumnAttr(long item, long column) const;
+
 private:
    // user defined color to draw row lines, may be invalid
    wxItemAttr m_alternateRowColour;
--- a/include/wx/motif/ctrlsub.h
+++ b/include/wx/motif/ctrlsub.h
@@ -3,7 +3,7 @@
 // Purpose:     common functionality of wxItemContainer-derived controls
 // Author:      Vadim Zeitlin
 // Created:     2007-07-25
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/motif/textentry.h
+++ b/include/wx/motif/textentry.h
@@ -3,7 +3,7 @@
 // Purpose:     wxMotif-specific wxTextEntry implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-11-05
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -65,6 +65,8 @@ public:
    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE;

 protected:
+    virtual wxSize MSWGetFullItemSize(int w, int h) const wxOVERRIDE;
+
    // pressing space or clicking the check box toggles the item
    void OnKeyDown(wxKeyEvent& event);
    void OnLeftClick(wxMouseEvent& event);
--- a/include/wx/msw/colordlg.h
+++ b/include/wx/msw/colordlg.h
@@ -44,6 +44,9 @@ public:
    // called from the hook procedure on WM_INITDIALOG reception
    virtual void MSWOnInitDone(WXHWND hDlg);

+    // called from the hook procedure
+    void MSWCheckIfCurrentChanged(WXCOLORREF currentCol);
+
 protected:
    // common part of all ctors
    void Init();
@@ -57,6 +60,9 @@ protected:
    wxColourData        m_colourData;
    wxString            m_title;

+    // Currently selected colour, used while the dialog is being shown.
+    WXCOLORREF m_currentCol;
+
    // indicates that the dialog should be centered in this direction if non 0
    // (set by DoCentre(), used by MSWOnInitDone())
    int m_centreDir;
--- a/include/wx/msw/ctrlsub.h
+++ b/include/wx/msw/ctrlsub.h
@@ -3,7 +3,7 @@
 // Purpose:     common functionality of wxItemContainer-derived controls
 // Author:      Vadim Zeitlin
 // Created:     2007-07-25
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/datectrl.h
+++ b/include/wx/msw/datectrl.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-09
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/datetimectrl.h
+++ b/include/wx/msw/datetimectrl.h
@@ -3,7 +3,7 @@
 // Purpose:     wxDateTimePickerCtrl for Windows.
 // Author:      Vadim Zeitlin
 // Created:     2011-09-22 (extracted from wx/msw/datectrl.h).
-// Copyright:   (c) 2005-2011 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005-2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/debughlp.h
+++ b/include/wx/msw/debughlp.h
@@ -3,7 +3,7 @@
 // Purpose:     wraps dbghelp.h standard file
 // Author:      Vadim Zeitlin, Suzumizaki-kimitaka
 // Created:     2005-01-08 (extracted from msw/crashrpt.cpp)
-// Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-07-31
-// Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/evtloopconsole.h
+++ b/include/wx/msw/evtloopconsole.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-07-31
-// Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/filedlg.h
+++ b/include/wx/msw/filedlg.h
@@ -44,6 +44,9 @@ public:
    // called from the hook procedure on CDN_SELCHANGE.
    void MSWOnSelChange(WXHWND hDlg);

+    // called from the hook procedure on CDN_TYPECHANGE.
+    void MSWOnTypeChange(WXHWND hDlg, int nFilterIndex);
+
 protected:

    virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -174,6 +174,13 @@ protected:
    // this can't be called DoHitTest() because wxWindow already has this method
    virtual int DoHitTestList(const wxPoint& point) const;

+    // This is a hook for wxCheckListBox, which uses it to add the checkbox
+    // width to the item width and to make it at least as tall as the checkbox.
+    virtual wxSize MSWGetFullItemSize(int w, int h) const
+    {
+        return wxSize(w, h);
+    }
+
    // free memory (common part of Clear() and dtor)
    void Free();

--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -421,26 +421,6 @@ protected:
    // true if we have any items with custom attributes
    bool m_hasAnyAttr;

-    // these functions are only used for virtual list view controls, i.e. the
-    // ones with wxLC_VIRTUAL style
-
-    // return the text for the given column of the given item
-    virtual wxString OnGetItemText(long item, long column) const;
-
-    // return the icon for the given item. In report view, OnGetItemImage will
-    // only be called for the first column. See OnGetItemColumnImage for
-    // details.
-    virtual int OnGetItemImage(long item) const;
-
-    // return the icon for the given item and column.
-    virtual int OnGetItemColumnImage(long item, long column) const;
-
-    // return the attribute for the given item and column (may return NULL if none)
-    virtual wxItemAttr *OnGetItemColumnAttr(long item, long WXUNUSED(column)) const
-    {
-        return OnGetItemAttr(item);
-    }
-
 private:
    // process NM_CUSTOMDRAW notification message
    WXLPARAM OnCustomDraw(WXLPARAM lParam);
--- a/include/wx/msw/mfc.h
+++ b/include/wx/msw/mfc.h
@@ -66,7 +66,7 @@ public:
        if ( !BaseApp::InitInstance() )
            return FALSE;

-        if ( !wxEntryStart(m_hInstance) )
+        if ( !wxEntryStart(BaseApp::m_hInstance) )
            return FALSE;

        if ( !wxTheApp || !wxTheApp->CallOnInit() )
@@ -80,8 +80,8 @@ public:

    int ExitInstance() wxOVERRIDE
    {
-        delete m_pMainWnd;
-        m_pMainWnd = NULL;
+        delete BaseApp::m_pMainWnd;
+        BaseApp::m_pMainWnd = NULL;

        if ( wxTheApp )
            wxTheApp->OnExit();
@@ -137,7 +137,7 @@ protected:

        // We need to initialize the main window to let the program continue
        // running.
-        m_pMainWnd = new wxMFCWnd(w);
+        BaseApp::m_pMainWnd = new wxMFCWnd(w);

        // We also need to reset m_pMainWnd when this window will be destroyed
        // to prevent MFC from using an invalid HWND, which is probably not
@@ -157,8 +157,8 @@ private:
    {
        event.Skip();

-        delete m_pMainWnd;
-        m_pMainWnd = NULL;
+        delete BaseApp::m_pMainWnd;
+        BaseApp::m_pMainWnd = NULL;
    }
 };

--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -22,8 +22,7 @@
 // use debug CRT functions for memory leak detections in VC++ 5.0+ in debug
 // builds
 #undef wxUSE_VC_CRTDBG
-#if defined(_DEBUG) && defined(__VISUALC__) \
-    && !defined(UNDER_CE)
+#if defined(_DEBUG) && defined(__VISUALC__)
    // it doesn't combine well with wxWin own memory debugging methods
    #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__)
        #define wxUSE_VC_CRTDBG
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -374,6 +374,37 @@ inline RECT wxGetClientRect(HWND hwnd)
 // small helper classes
 // ---------------------------------------------------------------------------

+// This class can only be used with wxMSW wxWindow, as it doesn't have
+// {Set,Get}HWND() methods in the other ports, but this file is currently
+// included for wxQt/MSW too. It's not clear whether it should be, really, but
+// for now allow it to compile in this port too.
+#ifdef __WXMSW__
+
+// Temporarily assign the given HWND to the window in ctor and unset it back to
+// the original value (usually 0) in dtor.
+class TempHWNDSetter
+{
+public:
+    TempHWNDSetter(wxWindow* win, WXHWND hWnd)
+        : m_win(win), m_hWndOrig(m_win->GetHWND())
+    {
+        m_win->SetHWND(hWnd);
+    }
+
+    ~TempHWNDSetter()
+    {
+        m_win->SetHWND(m_hWndOrig);
+    }
+
+private:
+    wxWindow* const m_win;
+    WXHWND const m_hWndOrig;
+
+    wxDECLARE_NO_COPY_CLASS(TempHWNDSetter);
+};
+
+#endif // __WXMSW__
+
 // create an instance of this class and use it as the HDC for screen, will
 // automatically release the DC going out of scope
 class ScreenHDC
--- a/include/wx/msw/private/sockmsw.h
+++ b/include/wx/msw/private/sockmsw.h
@@ -34,6 +34,8 @@
    #define wxIoctlSocketArg_t u_long
 #endif

+#define wxCloseSocket closesocket
+
 // ----------------------------------------------------------------------------
 // MSW-specific socket implementation
 // ----------------------------------------------------------------------------
--- a/include/wx/msw/seh.h
+++ b/include/wx/msw/seh.h
@@ -3,7 +3,7 @@
 // Purpose:     declarations for SEH (structured exceptions handling) support
 // Author:      Vadim Zeitlin
 // Created:     2006-04-26
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/setup_inc.h
+++ b/include/wx/msw/setup_inc.h
@@ -3,7 +3,7 @@
 // Purpose:     MSW-specific setup.h options
 // Author:      Vadim Zeitlin
 // Created:     2007-07-21 (extracted from wx/msw/setup0.h)
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/stackwalk.h
+++ b/include/wx/msw/stackwalk.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-08
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/stdpaths.h
+++ b/include/wx/msw/stdpaths.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/subwin.h
+++ b/include/wx/msw/subwin.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-12-11
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/textentry.h
+++ b/include/wx/msw/textentry.h
@@ -3,7 +3,7 @@
 // Purpose:     wxMSW-specific wxTextEntry implementation
 // Author:      Vadim Zeitlin
 // Created:     2007-09-26
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/timectrl.h
+++ b/include/wx/msw/timectrl.h
@@ -3,7 +3,7 @@
 // Purpose:     wxTimePickerCtrl for Windows.
 // Author:      Vadim Zeitlin
 // Created:     2011-09-22
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/toolbar.h
+++ b/include/wx/msw/toolbar.h
@@ -174,6 +174,20 @@ private:
    WXHBRUSH MSWGetToolbarBgBrush();
 #endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK

+    // Return true if we're showing the labels for the embedded controls: we
+    // only do it if text is enabled and, somewhat less expectedly, if icons
+    // are enabled too because showing both the control and its label when only
+    // text is shown for the other buttons is too inconsistent to be useful.
+    bool AreControlLabelsShown() const
+    {
+        return HasFlag(wxTB_TEXT) && !HasFlag(wxTB_NOICONS);
+    }
+
+    // Return the size required to accommodate the given tool which must be of
+    // "control" type.
+    wxSize MSWGetFittingtSizeForControl(class wxToolBarTool* tool) const;
+
+
    wxDECLARE_EVENT_TABLE();
    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
    wxDECLARE_NO_COPY_CLASS(wxToolBar);
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -100,9 +100,12 @@ public:
    // event handlers
    void OnActivate(wxActivateEvent& event);

-    // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
-    wxWindow *GetLastFocus() const { return m_winLastFocused; }
+    // called from wxWidgets code itself only when the pending focus, i.e. the
+    // element which should get focus when this TLW is activated again, changes
+    virtual void WXDoUpdatePendingFocus(wxWindow* win) wxOVERRIDE
+    {
+        m_winLastFocused = win;
+    }

    // translate wxWidgets flags to Windows ones
    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const wxOVERRIDE;
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -576,6 +576,14 @@ public:
    // Return true if the button was clicked, false otherwise.
    static bool MSWClickButtonIfPossible(wxButton* btn);

+    // This method is used for handling wxRadioButton-related complications,
+    // see wxRadioButton::SetValue(). It calls WXDoUpdatePendingFocus() for
+    // this window and all its parents up to the enclosing TLW, recursively.
+    void WXSetPendingFocus(wxWindow* win);
+
+    // Should be overridden by all classes storing the "last focused" window.
+    virtual void WXDoUpdatePendingFocus(wxWindow* WXUNUSED(win)) {}
+
 protected:
    // this allows you to implement standard control borders without
    // repeating the code in different classes that are not derived from
--- a/include/wx/msw/wrapgdip.h
+++ b/include/wx/msw/wrapgdip.h
@@ -3,7 +3,7 @@
 // Purpose:     wrapper around <gdiplus.h> header
 // Author:      Vadim Zeitlin
 // Created:     2007-03-15
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/msw/wrapshl.h
+++ b/include/wx/msw/wrapshl.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/nativewin.h
+++ b/include/wx/nativewin.h
@@ -3,7 +3,7 @@
 // Purpose:     classes allowing to wrap a native window handle
 // Author:      Vadim Zeitlin
 // Created:     2008-03-05
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/notifmsg.h
+++ b/include/wx/notifmsg.h
@@ -3,7 +3,7 @@
 // Purpose:     class allowing to show notification messages to the user
 // Author:      Vadim Zeitlin
 // Created:     2007-11-19
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -128,13 +128,13 @@ public:

    virtual ~wxBitmap() {}

-    wxImage ConvertToImage() const;
+    wxImage ConvertToImage() const wxOVERRIDE;

    // get the given part of bitmap
-    wxBitmap GetSubBitmap( const wxRect& rect ) const;
+    wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE;

-    virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
-    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
+    virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE;
+    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE
        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }

    virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
@@ -146,11 +146,11 @@ public:
    bool Create(int width, int height, const wxDC& dc);

    // Create a bitmap with a scale factor, width and height are multiplied with that factor
-    bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale);
+    bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale) wxOVERRIDE;

    // virtual bool Create( WXHICON icon) ;
-    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
-    virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
+    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE;
+    virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const wxOVERRIDE;

    const wxBitmapRefData *GetBitmapData() const
        { return (const wxBitmapRefData *)m_refData; }
@@ -159,28 +159,28 @@ public:
        { return (wxBitmapRefData *)m_refData; }

    // copies the contents and mask of the given (colour) icon to the bitmap
-    virtual bool CopyFromIcon(const wxIcon& icon);
+    virtual bool CopyFromIcon(const wxIcon& icon) wxOVERRIDE;

-    int GetWidth() const;
-    int GetHeight() const;
-    int GetDepth() const;
+    int GetWidth() const wxOVERRIDE;
+    int GetHeight() const wxOVERRIDE;
+    int GetDepth() const wxOVERRIDE;

 #if WXWIN_COMPATIBILITY_3_0
    wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
-    void SetWidth(int width);
+    void SetWidth(int width) wxOVERRIDE;
    wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
-    void SetHeight(int height);
+    void SetHeight(int height) wxOVERRIDE;
    wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
-    void SetDepth(int depth);
+    void SetDepth(int depth) wxOVERRIDE;
 #endif

 #if wxUSE_PALETTE
-    wxPalette* GetPalette() const;
-    void SetPalette(const wxPalette& palette);
+    wxPalette* GetPalette() const wxOVERRIDE;
+    void SetPalette(const wxPalette& palette) wxOVERRIDE;
 #endif // wxUSE_PALETTE

-    wxMask *GetMask() const;
-    void SetMask(wxMask *mask) ;
+    wxMask *GetMask() const wxOVERRIDE;
+    void SetMask(wxMask *mask) wxOVERRIDE;

    static void InitStandardHandlers();

@@ -233,14 +233,14 @@ public:
    void EndRawAccess();
 #endif

-    double GetScaleFactor() const;
+    double GetScaleFactor() const wxOVERRIDE;

    void SetSelectedInto(wxDC *dc);
    wxDC *GetSelectedInto() const;

 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
 };

 #endif // _WX_BITMAP_H_
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -39,7 +39,7 @@ public:

 protected:

-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;

    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 };
--- a/include/wx/osx/brush.h
+++ b/include/wx/osx/brush.h
@@ -26,17 +26,17 @@ public:
    wxBrush(const wxBitmap& stipple);
    virtual ~wxBrush();

-    virtual void SetColour(const wxColour& col) ;
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
-    virtual void SetStyle(wxBrushStyle style)  ;
-    virtual void SetStipple(const wxBitmap& stipple)  ;
+    virtual void SetColour(const wxColour& col) wxOVERRIDE;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
+    virtual void SetStyle(wxBrushStyle style)  wxOVERRIDE;
+    virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE;

    bool operator==(const wxBrush& brush) const;
    bool operator!=(const wxBrush& brush) const { return !(*this == brush); }

-    wxColour GetColour() const;
-    wxBrushStyle GetStyle() const ;
-    wxBitmap *GetStipple() const ;
+    wxColour GetColour() const wxOVERRIDE;
+    wxBrushStyle GetStyle() const wxOVERRIDE;
+    wxBitmap *GetStipple() const wxOVERRIDE;


    wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
@@ -46,8 +46,8 @@ public:
    void SetStyle(int style) { SetStyle((wxBrushStyle)style); }

 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;

 private:
    wxDECLARE_DYNAMIC_CLASS(wxBrush);
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -40,13 +40,13 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxButtonNameStr);

-    virtual void SetLabel(const wxString& label);
-    virtual wxWindow *SetDefault();
-    virtual void Command(wxCommandEvent& event);
+    virtual void SetLabel(const wxString& label) wxOVERRIDE;
+    virtual wxWindow *SetDefault() wxOVERRIDE;
+    virtual void Command(wxCommandEvent& event) wxOVERRIDE;

    // osx specific event handling common for all osx-ports

-    virtual bool        OSXHandleClicked( double timestampsec );
+    virtual bool OSXHandleClicked(double timestampsec) wxOVERRIDE;

 #if wxOSX_USE_COCOA
    void OSXUpdateAfterLabelChange(const wxString& label);
--- a/include/wx/osx/carbon/private/print.h
+++ b/include/wx/osx/carbon/private/print.h
@@ -23,13 +23,13 @@ public:
                            wxOSXPrintData();
    virtual                 ~wxOSXPrintData();

-    virtual bool            TransferTo( wxPrintData &data );
-    virtual bool            TransferFrom( const wxPrintData &data );
+    virtual bool            TransferTo( wxPrintData &data ) wxOVERRIDE;
+    virtual bool            TransferFrom( const wxPrintData &data ) wxOVERRIDE;

-    virtual bool            IsOk() const ;
+    virtual bool            IsOk() const wxOVERRIDE;

-    virtual void            TransferFrom( const wxPageSetupDialogData * );
-    virtual void            TransferTo( wxPageSetupDialogData * );
+    virtual void            TransferFrom( const wxPageSetupDialogData * ) wxOVERRIDE;
+    virtual void            TransferTo( wxPageSetupDialogData * ) wxOVERRIDE;

    virtual void            TransferFrom( const wxPrintDialogData * );
    virtual void            TransferTo( wxPrintDialogData * );
@@ -69,8 +69,8 @@ public:

    WX_NSPrintInfo          GetNSPrintInfo() { return m_macPrintInfo; }
 protected:
-    virtual void            UpdateFromPMState();
-    virtual void            UpdateToPMState();
+    virtual void            UpdateFromPMState() wxOVERRIDE;
+    virtual void            UpdateToPMState() wxOVERRIDE;

    WX_NSPrintInfo          m_macPrintInfo;
 private:
--- a/Show More
+++ b/Show More